diff options
author | Richard Levitte <levitte@openssl.org> | 2015-03-26 21:44:59 +0100 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2015-03-31 20:16:01 +0200 |
commit | a80e33b991e29988309964439fa8dba30af7ea5c (patch) | |
tree | cd48fffdbd5be833907101af04f677f2ad8cee11 /ssl | |
parent | dee502be89e78e2979e3bd1d7724cf79daa6ef61 (diff) |
Remove EXHEADER, TEST, APPS, links:, install: and uninstall: where relevant
With no more symlinks, there's no need for those variables, or the links
target. This also goes for all install: and uninstall: targets that do
nothing but copy $(EXHEADER) files, since that's now taken care of by the
top Makefile.
Also, removed METHTEST from test/Makefile. It looks like an old test that's
forgotten...
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'ssl')
-rw-r--r-- | ssl/Makefile | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/ssl/Makefile b/ssl/Makefile index 39cba8b77b..4168306fa3 100644 --- a/ssl/Makefile +++ b/ssl/Makefile @@ -15,8 +15,6 @@ KRB5_INCLUDES= CFLAGS= $(INCLUDES) $(CFLAG) GENERAL=Makefile README ssl-lib.com install.com -TEST=ssltest.c heartbeat_test.c -APPS= LIB=$(TOP)/libssl.a SHARED_LIB= libssl$(SHLIB_EXT) @@ -47,10 +45,9 @@ LIBOBJ= \ SRC= $(LIBSRC) -EXHEADER= ssl.h ssl2.h ssl3.h ssl23.h tls1.h dtls1.h kssl.h srtp.h -HEADER= $(EXHEADER) ssl_locl.h kssl_lcl.h record/record_locl.h record/record.h +HEADER= ssl_locl.h kssl_lcl.h record/record_locl.h record/record.h -ALL= $(GENERAL) $(SRC) $(HEADER) +ALL= $(GENERAL) $(SRC) $(HEADER) top: (cd ..; $(MAKE) DIRS=$(DIR) all) @@ -70,21 +67,6 @@ shared: lib files: $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO -links: - @$(PERL) $(TOP)/util/mklink.pl ../include/openssl $(EXHEADER) - @$(PERL) $(TOP)/util/mklink.pl ../test $(TEST) - @$(PERL) $(TOP)/util/mklink.pl ../apps $(APPS) - -install: - @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... - @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ - do \ - (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ - chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ - done; - -uninstall: - tags: ctags $(SRC) |