Make formatting consistent in apps/Makefile.in

[openssl.git] / apps / Makefile.in

diff --git a/apps/Makefile.in b/apps/Makefile.in
index c7153eeb9800755379e17b0cce88b0292bea6345..6e8bdf5882ecf401c35aba85380a411ef490729f 100644 (file)
--- a/apps/Makefile.in
+++ b/apps/Makefile.in
@@ -11,10 +11,12 @@ MAKEFILE=   Makefile
 PERL=          perl
 RM=            rm -f
 
-PEX_LIBS=
+PLIB_LDFLAG=
 EX_LIBS= 
 EXE_EXT= 
 
+APPS_OBJ=
+
 SHLIB_TARGET=
 
 CFLAGS= $(INCLUDES) $(CFLAG)
@@ -28,6 +30,7 @@ LIBSSL=-L.. -lssl
 
 SCRIPTS=CA.pl tsget
 EXE= openssl$(EXE_EXT)
+CONFS=openssl.cnf ct_log_list.cnf
 
 COMMANDS= \
        asn1pars.o ca.o ciphers.o cms.o crl.o crl2p7.o dgst.o dhparam.o \
@@ -50,9 +53,9 @@ SRC   = \
        genpkey.c genrsa.c nseq.c ocsp.c passwd.c pkcs12.c pkcs7.c pkcs8.c \
        pkey.c pkeyparam.c pkeyutl.c prime.c rand.c req.c rsa.c rsautl.c \
        s_client.c s_server.c s_time.c sess_id.c smime.c speed.c spkac.c \
-       srp.c ts.c verify.c version.c x509.c
+       srp.c ts.c verify.c version.c x509.c rehash.c
 
-EXE_OBJ        = openssl.o $(OBJ) $(EXTRA_OBJ) $(RAND_OBJ)
+EXE_OBJ        = openssl.o $(OBJ) $(EXTRA_OBJ) $(RAND_OBJ) $(APPS_OBJ)
 EXE_SRC = openssl.c $(SRC) $(EXTRA_SRC) $(RAND_SRC)
 
 HEADER=        apps.h progs.h s_apps.h \
@@ -63,10 +66,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
 
@@ -76,40 +81,48 @@ files:
 install:
        @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
        @set -e; for i in $(EXE); \
-       do  \
-       (echo installing $$i; \
-        cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i.new; \
-        chmod 755 $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i.new; \
-        mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i ); \
-        done;
+       do \
+               echo installing $$i; \
+               cp $$i $(DESTDIR)$(INSTALLTOP)/bin/$$i.new; \
+               chmod 755 $(DESTDIR)$(INSTALLTOP)/bin/$$i.new; \
+               mv -f $(DESTDIR)$(INSTALLTOP)/bin/$$i.new $(DESTDIR)$(INSTALLTOP)/bin/$$i; \
+       done
        @set -e; for i in $(SCRIPTS); \
-       do  \
-       (echo installing $$i; \
-        cp $$i $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$i.new; \
-        chmod 755 $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$i.new; \
-        mv -f $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$i.new $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$i ); \
-        done
-       @cp openssl.cnf $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf.new; \
-       chmod 644 $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf.new; \
-       mv -f  $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf.new $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf
+       do \
+               echo installing $$i; \
+               cp $$i $(DESTDIR)$(OPENSSLDIR)/misc/$$i.new; \
+               chmod 755 $(DESTDIR)$(OPENSSLDIR)/misc/$$i.new; \
+               mv -f $(DESTDIR)$(OPENSSLDIR)/misc/$$i.new $(DESTDIR)$(OPENSSLDIR)/misc/$$i; \
+       done
+       @set -e; for i in $(CONFS); \
+       do \
+               echo installing $$i; \
+               cp $$i $(DESTDIR)$(OPENSSLDIR)/$$i.new; \
+               chmod 644 $(DESTDIR)$(OPENSSLDIR)/$$i.new; \
+               mv -f $(DESTDIR)$(OPENSSLDIR)/$$i.new $(DESTDIR)$(OPENSSLDIR)/$$i; \
+       done
 
 uninstall:
        @set -e; for i in $(EXE); \
-       do  \
-               echo $(RM) $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i; \
-               $(RM) $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i; \
-       done;
+       do \
+               echo $(RM) $(DESTDIR)$(INSTALLTOP)/bin/$$i; \
+               $(RM) $(DESTDIR)$(INSTALLTOP)/bin/$$i; \
+       done
        @set -e; for i in $(SCRIPTS); \
-       do  \
-               echo $(RM) $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$i; \
-               $(RM) $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$i; \
+       do \
+               echo $(RM) $(DESTDIR)$(OPENSSLDIR)/misc/$$i; \
+               $(RM) $(DESTDIR)$(OPENSSLDIR)/misc/$$i; \
+       done
+       @set -e; for i in $(CONFS); \
+       do \
+               echo $(RM) $(DESTDIR)$(OPENSSLDIR)/$$i; \
+               $(RM) $(DESTDIR)$(OPENSSLDIR)/$$i; \
        done
-       $(RM) $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf
 
-generate: openssl-vms.cnf
+generate: openssl-vms.cnf progs.h
 
 depend:
-       @[ -z "$(THIS)" ] || $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(EXE_SRC)
+       $(TOP)/util/domd $(CFLAG) $(INCLUDES) -- $(EXE_SRC)
 
 clean:
        rm -f *.o *.obj *.dll lib tags core .pure .nfs* *.old *.bak fluff $(EXE)
@@ -121,7 +134,7 @@ $(DLIBSSL):
 $(DLIBCRYPTO):
        (cd ..; $(MAKE) build_libcrypto)
 
-$(EXE): progs.h $(EXE_OBJ) $(DLIBCRYPTO) $(DLIBSSL)
+$(EXE): $(EXE_OBJ) $(DLIBCRYPTO) $(DLIBSSL)
        $(RM) $(EXE)
        shlib_target=; if [ -n "$(SHARED_LIBS)" ]; then \
                shlib_target="$(SHLIB_TARGET)"; \
@@ -129,12 +142,17 @@ $(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)" \
+               LDFLAG="$(LDFLAG)" \
+               LIBDEPS="$(PLIB_LDFLAG) $$LIBRARIES $(EX_LIBS)" \
                link_app.$${shlib_target}
 
-progs.h: progs.pl Makefile
+progs.h: progs.pl Makefile.in
        $(RM) progs.h
-       $(PERL) progs.pl $(COMMANDS) >progs.h
-       $(RM) openssl.o
+       $(PERL) progs.pl $(EXE_SRC) > progs.h
+
+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.