diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-02-12 00:34:40 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-02-12 04:42:22 +0100 |
| commit | fb3e2a88eed124b1a74ebed89c20283780ee2bc6 (patch) | |
| tree | 00e3cb0532ca436a3c11c83a750cdfa7013e4558 /apps/Makefile.in | |
| parent | b3ca51559b1a6cd80dc179ee54613f00190d1cb4 (diff) | |
Generate progs.h from a bunch of files instead of internal knowledge
apps/progs.pl counted on the caller to provide the exact command
files. The unified build doesn't have that knowledge, and the easier
and more flexible thing to do is to feed it all the apps/*.c files and
let it figure out the command names by looking inside (looking for
/int ([a-z0-9][a-z0-9_]*)_main\(int argc,/).
Also, add it to the generate command, since it's a versioned file.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'apps/Makefile.in')
| -rw-r--r-- | apps/Makefile.in | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/apps/Makefile.in b/apps/Makefile.in index 966868489d..e3f485d901 100644 --- a/apps/Makefile.in +++ b/apps/Makefile.in @@ -50,7 +50,7 @@ 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_SRC = openssl.c $(SRC) $(EXTRA_SRC) $(RAND_SRC) @@ -108,7 +108,7 @@ uninstall: done $(RM) $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf -generate: openssl-vms.cnf +generate: openssl-vms.cnf progs.h depend: $(TOP)/util/domd $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(EXE_SRC) @@ -123,7 +123,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)"; \ @@ -135,10 +135,9 @@ $(EXE): progs.h $(EXE_OBJ) $(DLIBCRYPTO) $(DLIBSSL) 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 |