diff options
| author | Andy Polyakov <appro@openssl.org> | 2005-04-30 21:39:39 +0000 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2005-04-30 21:39:39 +0000 |
| commit | 4c3a2d64e43901ae954d4e6382ac7995330c6dc0 (patch) | |
| tree | c817053e9ec711aac110aa92f09fa8fc212aa6fb /apps/Makefile | |
| parent | 98a2fd32a098949a6727ef59f51225f82ba5d95c (diff) | |
Fold rules in test/Makefiles [from stable].
Diffstat (limited to 'apps/Makefile')
| -rw-r--r-- | apps/Makefile | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/apps/Makefile b/apps/Makefile index 7785009b19..2a3f25d060 100644 --- a/apps/Makefile +++ b/apps/Makefile @@ -10,8 +10,6 @@ CFLAG= -g -static INSTALL_PREFIX= INSTALLTOP= /usr/local/ssl OPENSSLDIR= /usr/local/ssl -NEWMAKE= make -MAKE= $(NEWMAKE) MAKEDEPPROG= makedepend MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG) MAKEFILE= Makefile @@ -93,7 +91,7 @@ req: sreq.o $(A_OBJ) $(DLIBCRYPTO) shlib_target=; if [ -n "$(SHARED_LIBS)" ]; then \ shlib_target="$(SHLIB_TARGET)"; \ fi; \ - $(NEWMAKE) -f $(TOP)/Makefile.shared \ + $(MAKE) -f $(TOP)/Makefile.shared \ APPNAME=req CC="$(CC)" CFLAGS="$(CFLAGS)" \ LDFLAGS="$(LDFLAG)" SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \ OBJECTS="sreq.o $(A_OBJ) $(RAND_OBJ)" \ @@ -163,7 +161,7 @@ $(EXE): progs.h $(E_OBJ) $(PROGRAM).o $(DLIBCRYPTO) $(DLIBSSL) else \ LIBRARIES="$(LIBSSL) $(LIBKRB5) $(LIBCRYPTO)" ; \ fi; \ - $(NEWMAKE) -f $(TOP)/Makefile.shared \ + $(MAKE) -f $(TOP)/Makefile.shared \ APPNAME=$(EXE) CC="$(CC)" CFLAGS="$(CFLAG)" \ LDFLAGS="$(LDFLAGS)" SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \ OBJECTS="$(PROGRAM).o $(E_OBJ)" \ |