diff options
| author | Andy Polyakov <appro@openssl.org> | 2005-05-15 23:53:34 +0000 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2005-05-15 23:53:34 +0000 |
| commit | 734540f887c6b47349913d3f21c7947c97279448 (patch) | |
| tree | 52ad6539daaa9e11a62324a60369b895bf6dd907 /apps/Makefile | |
| parent | 804515425aa520a186c4d1b919739d1a04d782e5 (diff) | |
Consolidate BUILDENV [idea is to keep all variables in one place].
Diffstat (limited to 'apps/Makefile')
| -rw-r--r-- | apps/Makefile | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/apps/Makefile b/apps/Makefile index 18093818cb..e7eb6d3084 100644 --- a/apps/Makefile +++ b/apps/Makefile @@ -89,11 +89,8 @@ req: sreq.o $(A_OBJ) $(DLIBCRYPTO) shlib_target="$(SHLIB_TARGET)"; \ fi; \ $(MAKE) -f $(TOP)/Makefile.shared \ - APPNAME=req CC="$(CC)" CFLAGS="$(CFLAGS)" \ - LDFLAGS="$(LDFLAG)" SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \ - OBJECTS="sreq.o $(A_OBJ) $(RAND_OBJ)" \ + APPNAME=req OBJECTS="sreq.o $(A_OBJ) $(RAND_OBJ)" \ LIBDEPS="$(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)" \ - LIBRPATH=$(INSTALLTOP)/lib \ link_app.$${shlib_target} sreq.o: req.c @@ -160,11 +157,8 @@ $(EXE): progs.h $(E_OBJ) $(PROGRAM).o $(DLIBCRYPTO) $(DLIBSSL) LIBRARIES="$(LIBSSL) $(LIBKRB5) $(LIBCRYPTO)" ; \ fi; \ $(MAKE) -f $(TOP)/Makefile.shared \ - APPNAME=$(EXE) CC="$(CC)" CFLAGS="$(CFLAG)" \ - LDFLAGS="$(LDFLAGS)" SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \ - OBJECTS="$(PROGRAM).o $(E_OBJ)" \ + APPNAME=$(EXE) OBJECTS="$(PROGRAM).o $(E_OBJ)" \ LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \ - LIBRPATH=$(INSTALLTOP)/lib \ link_app.$${shlib_target} @case "../*.dll" in *\**) ;; *) cp -p ../*.dll .;; esac -(cd ..; \ |