Configure et al: split up the lflags configuration item into two

[oweals/openssl.git] / apps / Makefile.in

diff --git a/apps/Makefile.in b/apps/Makefile.in
index c7153eeb9800755379e17b0cce88b0292bea6345..6be42c1e638c43db07b016ae1e9cf02c77dc9848 100644 (file)
--- a/apps/Makefile.in
+++ b/apps/Makefile.in
@@ -11,7 +11,7 @@ MAKEFILE=     Makefile
 PERL=          perl
 RM=            rm -f
 
-PEX_LIBS=
+LDFLAGS=
 EX_LIBS= 
 EXE_EXT= 
 
@@ -63,10 +63,12 @@ ALL=    $(GENERAL) $(EXE_SRC) $(HEADER)
 top:
        @(cd ..; $(MAKE) DIRS=$(DIR) all)
 
-all:   exe
+all:   exe scripts
 
 exe:   $(EXE)
 
+scripts: $(SCRIPTS)
+
 openssl-vms.cnf: openssl.cnf
        $(PERL) $(TOP)/VMS/VMSify-conf.pl < openssl.cnf > openssl-vms.cnf
 
@@ -129,7 +131,7 @@ $(EXE): progs.h $(EXE_OBJ) $(DLIBCRYPTO) $(DLIBSSL)
        LIBRARIES="$(LIBSSL) $(LIBCRYPTO)" ; \
        $(MAKE) -f $(TOP)/Makefile.shared -e \
                APPNAME=$(EXE) OBJECTS="$(EXE_OBJ)" \
-               LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
+               LIBDEPS="$(LDFLAGS) $$LIBRARIES $(EX_LIBS)" \
                link_app.$${shlib_target}
 
 progs.h: progs.pl Makefile
@@ -137,4 +139,9 @@ progs.h: progs.pl Makefile
        $(PERL) progs.pl $(COMMANDS) >progs.h
        $(RM) openssl.o
 
+CA.pl: CA.pl.in
+       $(PERL) -I$(TOP) -Mconfigdata $(TOP)/util/dofile.pl -oapps/Makefile CA.pl.in > CA.pl.new
+       mv CA.pl.new CA.pl
+
+
 # DO NOT DELETE THIS LINE -- make depend depends on it.