From: Richard Levitte Date: Thu, 26 Mar 2015 20:44:59 +0000 (+0100) Subject: Remove EXHEADER, TEST, APPS, links:, install: and uninstall: where relevant X-Git-Tag: OpenSSL_1_1_0-pre1~1361 X-Git-Url: https://git.openssl.org/?p=openssl.git;a=commitdiff_plain;h=a80e33b991e29988309964439fa8dba30af7ea5c 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 --- diff --git a/Makefile.org b/Makefile.org index 5e510f279d..de08a47c20 100644 --- a/Makefile.org +++ b/Makefile.org @@ -181,7 +181,6 @@ BASENAME= openssl NAME= $(BASENAME)-$(VERSION) TARFILE= $(NAME).tar WTARFILE= $(NAME)-win.tar -EXHEADER= e_os2.h HEADER= e_os.h # Directories created on install if they don't exist. @@ -206,7 +205,7 @@ CLEARENV= TOP= && unset TOP $${LIB+LIB} $${LIBS+LIBS} \ $${INCLUDE+INCLUDE} $${INCLUDES+INCLUDES} \ $${DIR+DIR} $${DIRS+DIRS} $${SRC+SRC} \ $${LIBSRC+LIBSRC} $${LIBOBJ+LIBOBJ} $${ALL+ALL} \ - $${EXHEADER+EXHEADER} $${HEADER+HEADER} \ + $${HEADER+HEADER} \ $${GENERAL+GENERAL} $${CFLAGS+CFLAGS} \ $${ASFLAGS+ASFLAGS} $${AFLAGS+AFLAGS} \ $${LDCMD+LDCMD} $${LDFLAGS+LDFLAGS} $${SCRIPTS+SCRIPTS} \ diff --git a/apps/Makefile b/apps/Makefile index ac2663aefe..25e197fb46 100644 --- a/apps/Makefile +++ b/apps/Makefile @@ -68,12 +68,10 @@ E_SRC= verify.c asn1pars.c req.c dgst.c dh.c enc.c passwd.c gendh.c errstr.c ca. SRC=$(E_SRC) -EXHEADER= HEADER= apps.h progs.h s_apps.h \ - testdsa.h testrsa.h \ - $(EXHEADER) + testdsa.h testrsa.h -ALL= $(GENERAL) $(SRC) $(HEADER) +ALL= $(GENERAL) $(SRC) $(HEADER) top: @(cd ..; $(MAKE) DIRS=$(DIR) all) @@ -135,8 +133,6 @@ tags: tests: -links: - lint: lint -DLINT $(INCLUDES) $(SRC)>fluff diff --git a/crypto/Makefile b/crypto/Makefile index 5eddc5ad6c..ec5af47a37 100644 --- a/crypto/Makefile +++ b/crypto/Makefile @@ -31,7 +31,6 @@ CPUID_OBJ=mem_clr.o LIBS= GENERAL=Makefile README crypto-lib.com install.com -TEST=constant_time_test.c LIB= $(TOP)/libcrypto.a SHARED_LIB= libcrypto$(SHLIB_EXT) @@ -44,12 +43,10 @@ LIBOBJ= cryptlib.o mem.o mem_dbg.o cversion.o ex_data.o cpt_err.o \ SRC= $(LIBSRC) -EXHEADER= crypto.h opensslv.h opensslconf.h ebcdic.h symhacks.h \ - ossl_typ.h HEADER= cryptlib.h buildinf.h md32_common.h o_str.h o_dir.h \ - constant_time_locl.h $(EXHEADER) + constant_time_locl.h -ALL= $(GENERAL) $(SRC) $(HEADER) +ALL= $(GENERAL) $(SRC) $(HEADER) top: @(cd ..; $(MAKE) DIRS=$(DIR) all) @@ -95,12 +92,6 @@ files: $(PERL) $(TOP)/util/files.pl "CPUID_OBJ=$(CPUID_OBJ)" Makefile >> $(TOP)/MINFO @target=files; $(RECURSIVE_MAKE) -links: - @$(PERL) $(TOP)/util/mklink.pl ../include/openssl $(EXHEADER) - @$(PERL) $(TOP)/util/mklink.pl ../test $(TEST) - @$(PERL) $(TOP)/util/mklink.pl ../apps $(APPS) - @target=links; $(RECURSIVE_MAKE) - # lib: $(LIB): are splitted to avoid end-less loop lib: $(LIB) @touch lib @@ -116,17 +107,6 @@ shared: buildinf.h lib subdirs libs: @target=lib; $(RECURSIVE_MAKE) -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; - @target=install; $(RECURSIVE_MAKE) - -uninstall: - lint: @target=lint; $(RECURSIVE_MAKE) diff --git a/crypto/aes/Makefile b/crypto/aes/Makefile index 2defcb195f..5c3b2d38fb 100644 --- a/crypto/aes/Makefile +++ b/crypto/aes/Makefile @@ -18,9 +18,6 @@ ASFLAGS= $(INCLUDES) $(ASFLAG) AFLAGS= $(ASFLAGS) GENERAL=Makefile -#TEST=aestest.c -TEST= -APPS= LIB=$(TOP)/libcrypto.a LIBSRC=aes_core.c aes_misc.c aes_ecb.c aes_cbc.c aes_cfb.c aes_ofb.c \ @@ -30,8 +27,7 @@ LIBOBJ=aes_misc.o aes_ecb.o aes_cfb.o aes_ofb.o aes_ige.o aes_wrap.o \ SRC= $(LIBSRC) -EXHEADER= aes.h -HEADER= aes_locl.h $(EXHEADER) +HEADER= aes_locl.h ALL= $(GENERAL) $(SRC) $(HEADER) @@ -104,19 +100,6 @@ bsaes-armv7.o: bsaes-armv7.S files: $(PERL) $(TOP)/util/files.pl "AES_ENC=$(AES_ENC)" 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; - tags: ctags $(SRC) diff --git a/crypto/asn1/Makefile b/crypto/asn1/Makefile index 2a15f16450..ff5e3ba679 100644 --- a/crypto/asn1/Makefile +++ b/crypto/asn1/Makefile @@ -13,8 +13,6 @@ AR= ar r CFLAGS= $(INCLUDES) $(CFLAG) GENERAL=Makefile README -TEST= -APPS= LIB=$(TOP)/libcrypto.a LIBSRC= a_object.c a_bitstr.c a_utctm.c a_gentm.c a_time.c a_int.c a_octet.c \ @@ -48,8 +46,7 @@ LIBOBJ= a_object.o a_bitstr.o a_utctm.o a_gentm.o a_time.o a_int.o a_octet.o \ SRC= $(LIBSRC) -EXHEADER= asn1.h asn1_mac.h asn1t.h -HEADER= $(EXHEADER) asn1_locl.h +HEADER= asn1_locl.h ALL= $(GENERAL) $(SRC) $(HEADER) @@ -74,19 +71,6 @@ lib: $(LIBOBJ) 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; - tags: ctags $(SRC) diff --git a/crypto/bf/Makefile b/crypto/bf/Makefile index dd2c2c708e..928e94d326 100644 --- a/crypto/bf/Makefile +++ b/crypto/bf/Makefile @@ -18,8 +18,6 @@ ASFLAGS= $(INCLUDES) $(ASFLAG) AFLAGS= $(ASFLAGS) GENERAL=Makefile -TEST=bftest.c -APPS= LIB=$(TOP)/libcrypto.a LIBSRC=bf_skey.c bf_ecb.c bf_enc.c bf_cfb64.c bf_ofb64.c @@ -27,8 +25,7 @@ LIBOBJ=bf_skey.o bf_ecb.o $(BF_ENC) bf_cfb64.o bf_ofb64.o SRC= $(LIBSRC) -EXHEADER= blowfish.h -HEADER= bf_pi.h bf_locl.h $(EXHEADER) +HEADER= bf_pi.h bf_locl.h ALL= $(GENERAL) $(SRC) $(HEADER) @@ -48,22 +45,6 @@ bf-586.s: asm/bf-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl 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) - -# We need to use force because 'install' matches 'INSTALL' on case -# insensitive systems -FRC.install: -install: FRC.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; - tags: ctags $(SRC) diff --git a/crypto/bio/Makefile b/crypto/bio/Makefile index c395d80496..5477ffb480 100644 --- a/crypto/bio/Makefile +++ b/crypto/bio/Makefile @@ -13,8 +13,6 @@ AR= ar r CFLAGS= $(INCLUDES) $(CFLAG) GENERAL=Makefile -TEST= -APPS= LIB=$(TOP)/libcrypto.a LIBSRC= bio_lib.c bio_cb.c bio_err.c \ @@ -34,8 +32,7 @@ LIBOBJ= bio_lib.o bio_cb.o bio_err.o \ SRC= $(LIBSRC) -EXHEADER= bio.h -HEADER= bio_lcl.h $(EXHEADER) +HEADER= bio_lcl.h ALL= $(GENERAL) $(SRC) $(HEADER) @@ -52,19 +49,6 @@ lib: $(LIBOBJ) 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; - tags: ctags $(SRC) diff --git a/crypto/bn/Makefile b/crypto/bn/Makefile index d1019c9f73..5b45f11851 100644 --- a/crypto/bn/Makefile +++ b/crypto/bn/Makefile @@ -18,8 +18,6 @@ ASFLAGS= $(INCLUDES) $(ASFLAG) AFLAGS= $(ASFLAGS) GENERAL=Makefile -TEST=bntest.c exptest.c -APPS= LIB=$(TOP)/libcrypto.a LIBSRC= bn_add.c bn_div.c bn_exp.c bn_lib.c bn_ctx.c bn_mul.c bn_mod.c \ @@ -36,8 +34,7 @@ LIBOBJ= bn_add.o bn_div.o bn_exp.o bn_lib.o bn_ctx.o bn_mul.o bn_mod.o \ SRC= $(LIBSRC) -EXHEADER= bn.h -HEADER= bn_lcl.h bn_prime.h $(EXHEADER) +HEADER= bn_lcl.h bn_prime.h ALL= $(GENERAL) $(SRC) $(HEADER) @@ -148,19 +145,6 @@ armv4-gf2m.o: armv4-gf2m.S 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; - div: rm -f a.out gcc -I.. -g div.c ../../libcrypto.a diff --git a/crypto/buffer/Makefile b/crypto/buffer/Makefile index 2efba47f07..d87738ccb2 100644 --- a/crypto/buffer/Makefile +++ b/crypto/buffer/Makefile @@ -13,8 +13,6 @@ AR= ar r CFLAGS= $(INCLUDES) $(CFLAG) GENERAL=Makefile -TEST= -APPS= LIB=$(TOP)/libcrypto.a LIBSRC= buffer.c buf_str.c buf_err.c @@ -22,8 +20,7 @@ LIBOBJ= buffer.o buf_str.o buf_err.o SRC= $(LIBSRC) -EXHEADER= buffer.h -HEADER= $(EXHEADER) +HEADER= ALL= $(GENERAL) $(SRC) $(HEADER) @@ -40,19 +37,6 @@ lib: $(LIBOBJ) 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; - tags: ctags $(SRC) diff --git a/crypto/camellia/Makefile b/crypto/camellia/Makefile index a5b983b6cb..2602dbf965 100644 --- a/crypto/camellia/Makefile +++ b/crypto/camellia/Makefile @@ -18,8 +18,6 @@ ASFLAGS= $(INCLUDES) $(ASFLAG) AFLAGS= $(ASFLAGS) GENERAL=Makefile -#TEST=camelliatest.c -APPS= LIB=$(TOP)/libcrypto.a LIBSRC=camellia.c cmll_misc.c cmll_ecb.c cmll_cbc.c cmll_ofb.c \ @@ -29,8 +27,7 @@ LIBOBJ= cmll_ecb.o cmll_ofb.o cmll_cfb.o cmll_ctr.o $(CMLL_ENC) SRC= $(LIBSRC) -EXHEADER= camellia.h -HEADER= cmll_locl.h $(EXHEADER) +HEADER= cmll_locl.h ALL= $(GENERAL) $(SRC) $(HEADER) @@ -54,19 +51,6 @@ cmllt4-sparcv9.s: asm/cmllt4-sparcv9.pl ../perlasm/sparcv9_modes.pl 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; - tags: ctags $(SRC) diff --git a/crypto/cast/Makefile b/crypto/cast/Makefile index 0acc38f28d..08d24b04fb 100644 --- a/crypto/cast/Makefile +++ b/crypto/cast/Makefile @@ -18,8 +18,6 @@ ASFLAGS= $(INCLUDES) $(ASFLAG) AFLAGS= $(ASFLAGS) GENERAL=Makefile -TEST=casttest.c -APPS= LIB=$(TOP)/libcrypto.a LIBSRC=c_skey.c c_ecb.c c_enc.c c_cfb64.c c_ofb64.c @@ -27,8 +25,7 @@ LIBOBJ=c_skey.o c_ecb.o $(CAST_ENC) c_cfb64.o c_ofb64.o SRC= $(LIBSRC) -EXHEADER= cast.h -HEADER= cast_s.h cast_lcl.h $(EXHEADER) +HEADER= cast_s.h cast_lcl.h ALL= $(GENERAL) $(SRC) $(HEADER) @@ -48,19 +45,6 @@ cast-586.s: asm/cast-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl 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; - tags: ctags $(SRC) diff --git a/crypto/cmac/Makefile b/crypto/cmac/Makefile index 2e92a14fae..87a20fcdd9 100644 --- a/crypto/cmac/Makefile +++ b/crypto/cmac/Makefile @@ -13,8 +13,6 @@ AR= ar r CFLAGS= $(INCLUDES) $(CFLAG) GENERAL=Makefile -TEST= -APPS= LIB=$(TOP)/libcrypto.a LIBSRC=cmac.c cm_ameth.c cm_pmeth.c @@ -22,8 +20,7 @@ LIBOBJ=cmac.o cm_ameth.o cm_pmeth.o SRC= $(LIBSRC) -EXHEADER= cmac.h -HEADER= $(EXHEADER) +HEADER= ALL= $(GENERAL) $(SRC) $(HEADER) @@ -40,19 +37,6 @@ lib: $(LIBOBJ) 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; - tags: ctags $(SRC) diff --git a/crypto/cms/Makefile b/crypto/cms/Makefile index b767e250ad..47aec7cc2b 100644 --- a/crypto/cms/Makefile +++ b/crypto/cms/Makefile @@ -13,8 +13,6 @@ AR= ar r CFLAGS= $(INCLUDES) $(CFLAG) GENERAL=Makefile -TEST= -APPS= LIB=$(TOP)/libcrypto.a LIBSRC= cms_lib.c cms_asn1.c cms_att.c cms_io.c cms_smime.c cms_err.c \ @@ -26,8 +24,7 @@ LIBOBJ= cms_lib.o cms_asn1.o cms_att.o cms_io.o cms_smime.o cms_err.o \ SRC= $(LIBSRC) -EXHEADER= cms.h -HEADER= cms_lcl.h $(EXHEADER) +HEADER= cms_lcl.h ALL= $(GENERAL) $(SRC) $(HEADER) @@ -46,19 +43,6 @@ lib: $(LIBOBJ) 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; - tags: ctags $(SRC) diff --git a/crypto/comp/Makefile b/crypto/comp/Makefile index efda832dce..4d1ef529f5 100644 --- a/crypto/comp/Makefile +++ b/crypto/comp/Makefile @@ -13,8 +13,6 @@ AR= ar r CFLAGS= $(INCLUDES) $(CFLAG) GENERAL=Makefile -TEST= -APPS= LIB=$(TOP)/libcrypto.a LIBSRC= comp_lib.c comp_err.c \ @@ -25,8 +23,7 @@ LIBOBJ= comp_lib.o comp_err.o \ SRC= $(LIBSRC) -EXHEADER= comp.h -HEADER= $(EXHEADER) +HEADER= ALL= $(GENERAL) $(SRC) $(HEADER) @@ -43,19 +40,6 @@ lib: $(LIBOBJ) 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; - tags: ctags $(SRC) diff --git a/crypto/conf/Makefile b/crypto/conf/Makefile index 78bb324106..8af03a674b 100644 --- a/crypto/conf/Makefile +++ b/crypto/conf/Makefile @@ -13,8 +13,6 @@ AR= ar r CFLAGS= $(INCLUDES) $(CFLAG) GENERAL=Makefile -TEST= -APPS= LIB=$(TOP)/libcrypto.a LIBSRC= conf_err.c conf_lib.c conf_api.c conf_def.c conf_mod.c \ @@ -25,8 +23,7 @@ LIBOBJ= conf_err.o conf_lib.o conf_api.o conf_def.o conf_mod.o \ SRC= $(LIBSRC) -EXHEADER= conf.h conf_api.h -HEADER= conf_def.h $(EXHEADER) +HEADER= conf_def.h ALL= $(GENERAL) $(SRC) $(HEADER) @@ -43,19 +40,6 @@ lib: $(LIBOBJ) 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; - tags: ctags $(SRC) diff --git a/crypto/des/Makefile b/crypto/des/Makefile index 10b7e349ed..2a8f06f0e5 100644 --- a/crypto/des/Makefile +++ b/crypto/des/Makefile @@ -18,8 +18,6 @@ ASFLAGS= $(INCLUDES) $(ASFLAG) AFLAGS= $(ASFLAGS) GENERAL=Makefile -TEST=destest.c -APPS= LIB=$(TOP)/libcrypto.a LIBSRC= cbc_cksm.c cbc_enc.c cfb64enc.c cfb_enc.c \ @@ -41,8 +39,7 @@ LIBOBJ= set_key.o ecb_enc.o cbc_enc.o \ SRC= $(LIBSRC) -EXHEADER= des.h -HEADER= des_locl.h rpc_des.h spr.h des_ver.h $(EXHEADER) +HEADER= des_locl.h rpc_des.h spr.h des_ver.h ALL= $(GENERAL) $(SRC) $(HEADER) @@ -69,22 +66,6 @@ crypt586.s: asm/crypt586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl 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) - -# We need to use force because 'install' matches 'INSTALL' on case -# insensitive systems -FRC.install: -install: FRC.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; - tags: ctags $(SRC) diff --git a/crypto/dh/Makefile b/crypto/dh/Makefile index 6af06d9d01..8f468e35fd 100644 --- a/crypto/dh/Makefile +++ b/crypto/dh/Makefile @@ -13,8 +13,6 @@ AR= ar r CFLAGS= $(INCLUDES) $(CFLAG) GENERAL=Makefile -TEST= dhtest.c -APPS= LIB=$(TOP)/libcrypto.a LIBSRC= dh_asn1.c dh_gen.c dh_key.c dh_lib.c dh_check.c dh_err.c dh_depr.c \ @@ -24,8 +22,7 @@ LIBOBJ= dh_asn1.o dh_gen.o dh_key.o dh_lib.o dh_check.o dh_err.o dh_depr.o \ SRC= $(LIBSRC) -EXHEADER= dh.h -HEADER= $(EXHEADER) +HEADER= ALL= $(GENERAL) $(SRC) $(HEADER) @@ -42,19 +39,6 @@ lib: $(LIBOBJ) 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; - tags: ctags $(SRC) diff --git a/crypto/dsa/Makefile b/crypto/dsa/Makefile index 5c1982c6cd..4571b88e1f 100644 --- a/crypto/dsa/Makefile +++ b/crypto/dsa/Makefile @@ -13,8 +13,6 @@ AR= ar r CFLAGS= $(INCLUDES) $(CFLAG) GENERAL=Makefile -TEST=dsatest.c -APPS= LIB=$(TOP)/libcrypto.a LIBSRC= dsa_gen.c dsa_key.c dsa_lib.c dsa_asn1.c dsa_vrf.c dsa_sign.c \ @@ -24,8 +22,7 @@ LIBOBJ= dsa_gen.o dsa_key.o dsa_lib.o dsa_asn1.o dsa_vrf.o dsa_sign.o \ SRC= $(LIBSRC) -EXHEADER= dsa.h -HEADER= dsa_locl.h $(EXHEADER) +HEADER= dsa_locl.h ALL= $(GENERAL) $(SRC) $(HEADER) @@ -42,19 +39,6 @@ lib: $(LIBOBJ) 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; - tags: ctags $(SRC) diff --git a/crypto/dso/Makefile b/crypto/dso/Makefile index 07f5d8d159..0471fc4683 100644 --- a/crypto/dso/Makefile +++ b/crypto/dso/Makefile @@ -13,8 +13,6 @@ AR= ar r CFLAGS= $(INCLUDES) $(CFLAG) GENERAL=Makefile -TEST= -APPS= LIB=$(TOP)/libcrypto.a LIBSRC= dso_dl.c dso_dlfcn.c dso_err.c dso_lib.c dso_null.c \ @@ -24,8 +22,7 @@ LIBOBJ= dso_dl.o dso_dlfcn.o dso_err.o dso_lib.o dso_null.o \ SRC= $(LIBSRC) -EXHEADER= dso.h -HEADER= $(EXHEADER) +HEADER= ALL= $(GENERAL) $(SRC) $(HEADER) @@ -42,19 +39,6 @@ lib: $(LIBOBJ) 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; - tags: ctags $(SRC) diff --git a/crypto/ec/Makefile b/crypto/ec/Makefile index b6d50c7c9d..542596795e 100644 --- a/crypto/ec/Makefile +++ b/crypto/ec/Makefile @@ -15,8 +15,6 @@ ASFLAGS= $(INCLUDES) $(ASFLAG) AFLAGS= $(ASFLAGS) GENERAL=Makefile -TEST=ectest.c -APPS= LIB=$(TOP)/libcrypto.a LIBSRC= ec_lib.c ecp_smpl.c ecp_mont.c ecp_nist.c ec_cvt.c ec_mult.c\ @@ -33,8 +31,7 @@ LIBOBJ= ec_lib.o ecp_smpl.o ecp_mont.o ecp_nist.o ec_cvt.o ec_mult.o\ SRC= $(LIBSRC) -EXHEADER= ec.h -HEADER= ec_lcl.h $(EXHEADER) +HEADER= ec_lcl.h ALL= $(GENERAL) $(SRC) $(HEADER) @@ -63,19 +60,6 @@ ecp_nistz256-armv4.o: ecp_nistz256-armv4.S 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; - tags: ctags $(SRC) diff --git a/crypto/ecdh/Makefile b/crypto/ecdh/Makefile index df1b03adb1..03c6948dc9 100644 --- a/crypto/ecdh/Makefile +++ b/crypto/ecdh/Makefile @@ -13,8 +13,6 @@ AR= ar r CFLAGS= $(INCLUDES) $(CFLAG) GENERAL=Makefile -TEST=ecdhtest.c -APPS= LIB=$(TOP)/libcrypto.a LIBSRC= ech_lib.c ech_ossl.c ech_key.c ech_err.c ech_kdf.c @@ -23,8 +21,7 @@ LIBOBJ= ech_lib.o ech_ossl.o ech_key.o ech_err.o ech_kdf.o SRC= $(LIBSRC) -EXHEADER= ecdh.h -HEADER= ech_locl.h $(EXHEADER) +HEADER= ech_locl.h ALL= $(GENERAL) $(SRC) $(HEADER) @@ -41,19 +38,6 @@ lib: $(LIBOBJ) 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; - tags: ctags $(SRC) diff --git a/crypto/ecdsa/Makefile b/crypto/ecdsa/Makefile index da08d2d27e..be6f8490ab 100644 --- a/crypto/ecdsa/Makefile +++ b/crypto/ecdsa/Makefile @@ -13,8 +13,6 @@ AR= ar r CFLAGS= $(INCLUDES) $(CFLAG) GENERAL=Makefile -TEST=ecdsatest.c -APPS= LIB=$(TOP)/libcrypto.a LIBSRC= ecs_lib.c ecs_asn1.c ecs_ossl.c ecs_sign.c ecs_vrf.c ecs_err.c @@ -23,8 +21,7 @@ LIBOBJ= ecs_lib.o ecs_asn1.o ecs_ossl.o ecs_sign.o ecs_vrf.o ecs_err.o SRC= $(LIBSRC) -EXHEADER= ecdsa.h -HEADER= ecs_locl.h $(EXHEADER) +HEADER= ecs_locl.h ALL= $(GENERAL) $(SRC) $(HEADER) @@ -41,19 +38,6 @@ lib: $(LIBOBJ) 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; - tags: ctags $(SRC) diff --git a/crypto/engine/Makefile b/crypto/engine/Makefile index 0bdd2aa3ca..17394102a3 100644 --- a/crypto/engine/Makefile +++ b/crypto/engine/Makefile @@ -13,8 +13,6 @@ AR= ar r CFLAGS= $(INCLUDES) $(CFLAG) GENERAL=Makefile -TEST= enginetest.c -APPS= LIB=$(TOP)/libcrypto.a LIBSRC= eng_err.c eng_lib.c eng_list.c eng_init.c eng_ctrl.c \ @@ -32,8 +30,7 @@ LIBOBJ= eng_err.o eng_lib.o eng_list.o eng_init.o eng_ctrl.o \ SRC= $(LIBSRC) -EXHEADER= engine.h -HEADER= $(EXHEADER) +HEADER= ALL= $(GENERAL) $(SRC) $(HEADER) @@ -50,19 +47,6 @@ lib: $(LIBOBJ) 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; - tags: ctags $(SRC) diff --git a/crypto/err/Makefile b/crypto/err/Makefile index 862b23ba17..0e95d0e76a 100644 --- a/crypto/err/Makefile +++ b/crypto/err/Makefile @@ -13,8 +13,6 @@ AR= ar r CFLAGS= $(INCLUDES) $(CFLAG) GENERAL=Makefile -TEST= -APPS= LIB=$(TOP)/libcrypto.a LIBSRC=err.c err_all.c err_prn.c @@ -22,8 +20,7 @@ LIBOBJ=err.o err_all.o err_prn.o SRC= $(LIBSRC) -EXHEADER= err.h -HEADER= $(EXHEADER) +HEADER= ALL= $(GENERAL) $(SRC) $(HEADER) @@ -40,19 +37,6 @@ lib: $(LIBOBJ) 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; - tags: ctags $(SRC) diff --git a/crypto/evp/Makefile b/crypto/evp/Makefile index d72e6e7148..c523a6d80e 100644 --- a/crypto/evp/Makefile +++ b/crypto/evp/Makefile @@ -13,9 +13,6 @@ AR= ar r CFLAGS= $(INCLUDES) $(CFLAG) GENERAL=Makefile -TEST=evp_test.c p5_crpt2_test.c evp_extra_test.c -TESTDATA=evptests.txt -APPS= LIB=$(TOP)/libcrypto.a LIBSRC= encode.c digest.c evp_enc.c evp_key.c evp_acnf.c evp_cnf.c \ @@ -46,10 +43,9 @@ LIBOBJ= encode.o digest.o evp_enc.o evp_key.o evp_acnf.o evp_cnf.o \ SRC= $(LIBSRC) -EXHEADER= evp.h -HEADER= evp_locl.h $(EXHEADER) +HEADER= evp_locl.h -ALL= $(GENERAL) $(SRC) $(HEADER) +ALL= $(GENERAL) $(SRC) $(HEADER) top: (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all) @@ -64,20 +60,6 @@ lib: $(LIBOBJ) 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) - @[ -f $(TESTDATA) ] && cp $(TESTDATA) ../../test && echo "$(TESTDATA) -> ../../test/$(TESTDATA)" - @$(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; - tags: ctags $(SRC) diff --git a/crypto/hmac/Makefile b/crypto/hmac/Makefile index 42a97783ff..f51612e1ff 100644 --- a/crypto/hmac/Makefile +++ b/crypto/hmac/Makefile @@ -13,8 +13,6 @@ AR= ar r CFLAGS= $(INCLUDES) $(CFLAG) GENERAL=Makefile -TEST=hmactest.c -APPS= LIB=$(TOP)/libcrypto.a LIBSRC=hmac.c hm_ameth.c hm_pmeth.c @@ -22,8 +20,7 @@ LIBOBJ=hmac.o hm_ameth.o hm_pmeth.o SRC= $(LIBSRC) -EXHEADER= hmac.h -HEADER= $(EXHEADER) +HEADER= ALL= $(GENERAL) $(SRC) $(HEADER) @@ -40,19 +37,6 @@ lib: $(LIBOBJ) 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; - tags: ctags $(SRC) diff --git a/crypto/idea/Makefile b/crypto/idea/Makefile index b2e7add666..345b60281f 100644 --- a/crypto/idea/Makefile +++ b/crypto/idea/Makefile @@ -13,8 +13,6 @@ AR= ar r CFLAGS= $(INCLUDES) $(CFLAG) GENERAL=Makefile -TEST=ideatest.c -APPS= LIB=$(TOP)/libcrypto.a LIBSRC=i_cbc.c i_cfb64.c i_ofb64.c i_ecb.c i_skey.c @@ -22,8 +20,7 @@ LIBOBJ=i_cbc.o i_cfb64.o i_ofb64.o i_ecb.o i_skey.o SRC= $(LIBSRC) -EXHEADER= idea.h -HEADER= idea_lcl.h $(EXHEADER) +HEADER= idea_lcl.h ALL= $(GENERAL) $(SRC) $(HEADER) @@ -40,19 +37,6 @@ lib: $(LIBOBJ) 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; - tags: ctags $(SRC) diff --git a/crypto/jpake/Makefile b/crypto/jpake/Makefile index 112dfb1ecb..1f01d73215 100644 --- a/crypto/jpake/Makefile +++ b/crypto/jpake/Makefile @@ -3,13 +3,16 @@ TOP=../.. CFLAGS= $(INCLUDES) $(CFLAG) +GENERAL= Makefile + LIB=$(TOP)/libcrypto.a LIBOBJ=jpake.o jpake_err.o LIBSRC=jpake.c jpake_err.c SRC= $(LIBSRC) -EXHEADER=jpake.h -TEST=jpaketest.c +HEADER= + +ALL= $(GENERAL) $(SRC) $(HEADER) top: (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all) @@ -24,18 +27,6 @@ lib: $(LIBOBJ) 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) - -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; - depend: @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile... $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) diff --git a/crypto/krb5/Makefile b/crypto/krb5/Makefile index 14077390d6..3d923c4b29 100644 --- a/crypto/krb5/Makefile +++ b/crypto/krb5/Makefile @@ -13,8 +13,6 @@ AR= ar r CFLAGS= $(INCLUDES) $(CFLAG) GENERAL=Makefile README -TEST= -APPS= LIB=$(TOP)/libcrypto.a LIBSRC= krb5_asn.c @@ -23,8 +21,7 @@ LIBOBJ= krb5_asn.o SRC= $(LIBSRC) -EXHEADER= krb5_asn.h -HEADER= $(EXHEADER) +HEADER= ALL= $(GENERAL) $(SRC) $(HEADER) @@ -41,19 +38,6 @@ lib: $(LIBOBJ) 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; - tags: ctags $(SRC) diff --git a/crypto/lhash/Makefile b/crypto/lhash/Makefile index 82bddac474..ca7f3734d8 100644 --- a/crypto/lhash/Makefile +++ b/crypto/lhash/Makefile @@ -13,8 +13,6 @@ AR= ar r CFLAGS= $(INCLUDES) $(CFLAG) GENERAL=Makefile -TEST= -APPS= LIB=$(TOP)/libcrypto.a LIBSRC=lhash.c lh_stats.c @@ -22,8 +20,7 @@ LIBOBJ=lhash.o lh_stats.o SRC= $(LIBSRC) -EXHEADER= lhash.h -HEADER= $(EXHEADER) +HEADER= ALL= $(GENERAL) $(SRC) $(HEADER) @@ -40,19 +37,6 @@ lib: $(LIBOBJ) 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; - tags: ctags $(SRC) diff --git a/crypto/md2/Makefile b/crypto/md2/Makefile index 17f878aeb7..153c48ea2f 100644 --- a/crypto/md2/Makefile +++ b/crypto/md2/Makefile @@ -13,8 +13,6 @@ AR= ar r CFLAGS= $(INCLUDES) $(CFLAG) GENERAL=Makefile -TEST=md2test.c -APPS= LIB=$(TOP)/libcrypto.a LIBSRC=md2_dgst.c md2_one.c @@ -22,8 +20,7 @@ LIBOBJ=md2_dgst.o md2_one.o SRC= $(LIBSRC) -EXHEADER= md2.h -HEADER= $(EXHEADER) +HEADER= ALL= $(GENERAL) $(SRC) $(HEADER) @@ -40,19 +37,6 @@ lib: $(LIBOBJ) 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; - tags: ctags $(SRC) diff --git a/crypto/md4/Makefile b/crypto/md4/Makefile index af68603dd3..90aec00fe4 100644 --- a/crypto/md4/Makefile +++ b/crypto/md4/Makefile @@ -14,8 +14,6 @@ AR= ar r CFLAGS= $(INCLUDES) $(CFLAG) GENERAL=Makefile -TEST=md4test.c -APPS= LIB=$(TOP)/libcrypto.a LIBSRC=md4_dgst.c md4_one.c @@ -23,8 +21,7 @@ LIBOBJ=md4_dgst.o md4_one.o SRC= $(LIBSRC) -EXHEADER= md4.h -HEADER= md4_locl.h $(EXHEADER) +HEADER= md4_locl.h ALL= $(GENERAL) $(SRC) $(HEADER) @@ -41,19 +38,6 @@ lib: $(LIBOBJ) 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; - tags: ctags $(SRC) diff --git a/crypto/md5/Makefile b/crypto/md5/Makefile index 5e9464f6dc..79a14bd034 100644 --- a/crypto/md5/Makefile +++ b/crypto/md5/Makefile @@ -18,8 +18,6 @@ ASFLAGS= $(INCLUDES) $(ASFLAG) AFLAGS= $(ASFLAGS) GENERAL=Makefile -TEST=md5test.c -APPS= LIB=$(TOP)/libcrypto.a LIBSRC=md5_dgst.c md5_one.c @@ -27,8 +25,7 @@ LIBOBJ=md5_dgst.o md5_one.o $(MD5_ASM_OBJ) SRC= $(LIBSRC) -EXHEADER= md5.h -HEADER= md5_locl.h $(EXHEADER) +HEADER= md5_locl.h ALL= $(GENERAL) $(SRC) $(HEADER) @@ -58,19 +55,6 @@ md5-sparcv9.S: asm/md5-sparcv9.pl 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; - tags: ctags $(SRC) diff --git a/crypto/mdc2/Makefile b/crypto/mdc2/Makefile index 766008efe6..18915c87f7 100644 --- a/crypto/mdc2/Makefile +++ b/crypto/mdc2/Makefile @@ -13,8 +13,6 @@ AR= ar r CFLAGS= $(INCLUDES) $(CFLAG) GENERAL=Makefile -TEST= mdc2test.c -APPS= LIB=$(TOP)/libcrypto.a LIBSRC=mdc2dgst.c mdc2_one.c @@ -22,8 +20,7 @@ LIBOBJ=mdc2dgst.o mdc2_one.o SRC= $(LIBSRC) -EXHEADER= mdc2.h -HEADER= $(EXHEADER) +HEADER= ALL= $(GENERAL) $(SRC) $(HEADER) @@ -40,19 +37,6 @@ lib: $(LIBOBJ) 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; - tags: ctags $(SRC) diff --git a/crypto/modes/Makefile b/crypto/modes/Makefile index 658af0c296..ed2a9e3dfa 100644 --- a/crypto/modes/Makefile +++ b/crypto/modes/Makefile @@ -17,8 +17,6 @@ ASFLAGS= $(INCLUDES) $(ASFLAG) AFLAGS= $(ASFLAGS) GENERAL=Makefile -TEST= -APPS= LIB=$(TOP)/libcrypto.a LIBSRC= cbc128.c ctr128.c cts128.c cfb128.c ofb128.c gcm128.c \ @@ -28,9 +26,7 @@ LIBOBJ= cbc128.o ctr128.o cts128.o cfb128.o ofb128.o gcm128.o \ SRC= $(LIBSRC) -#EXHEADER= store.h str_compat.h -EXHEADER= modes.h -HEADER= modes_lcl.h $(EXHEADER) +HEADER= modes_lcl.h ALL= $(GENERAL) $(SRC) $(HEADER) @@ -74,19 +70,6 @@ ghashv8-armx.o: ghashv8-armx.S 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; - tags: ctags $(SRC) diff --git a/crypto/objects/Makefile b/crypto/objects/Makefile index 26a30bb39d..ad2db1e809 100644 --- a/crypto/objects/Makefile +++ b/crypto/objects/Makefile @@ -14,8 +14,6 @@ PERL= perl CFLAGS= $(INCLUDES) $(CFLAG) GENERAL=Makefile README -TEST= -APPS= LIB=$(TOP)/libcrypto.a LIBSRC= o_names.c obj_dat.c obj_lib.c obj_err.c obj_xref.c @@ -23,8 +21,7 @@ LIBOBJ= o_names.o obj_dat.o obj_lib.o obj_err.o obj_xref.o SRC= $(LIBSRC) -EXHEADER= objects.h obj_mac.h -HEADER= $(EXHEADER) obj_dat.h obj_xref.h +HEADER= obj_dat.h obj_xref.h ALL= $(GENERAL) $(SRC) $(HEADER) @@ -53,19 +50,6 @@ obj_xref.h: objxref.pl obj_xref.txt obj_mac.num 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; - tags: ctags $(SRC) diff --git a/crypto/ocsp/Makefile b/crypto/ocsp/Makefile index 098e663c3b..77f015de0b 100644 --- a/crypto/ocsp/Makefile +++ b/crypto/ocsp/Makefile @@ -13,8 +13,6 @@ AR= ar r CFLAGS= $(INCLUDES) $(CFLAG) GENERAL=Makefile README -TEST= -APPS= LIB=$(TOP)/libcrypto.a LIBSRC= ocsp_asn.c ocsp_ext.c ocsp_ht.c ocsp_lib.c ocsp_cl.c \ @@ -25,8 +23,7 @@ LIBOBJ= ocsp_asn.o ocsp_ext.o ocsp_ht.o ocsp_lib.o ocsp_cl.o \ SRC= $(LIBSRC) -EXHEADER= ocsp.h -HEADER= ocsp_lcl.h $(EXHEADER) +HEADER= ocsp_lcl.h ALL= $(GENERAL) $(SRC) $(HEADER) @@ -43,19 +40,6 @@ lib: $(LIBOBJ) 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; - tags: ctags $(SRC) diff --git a/crypto/pem/Makefile b/crypto/pem/Makefile index b3e554a423..09a6cc8468 100644 --- a/crypto/pem/Makefile +++ b/crypto/pem/Makefile @@ -13,8 +13,6 @@ AR= ar r CFLAGS= $(INCLUDES) $(CFLAG) GENERAL=Makefile -TEST= -APPS= LIB=$(TOP)/libcrypto.a LIBSRC= pem_sign.c pem_seal.c pem_info.c pem_lib.c pem_all.c pem_err.c \ @@ -25,8 +23,7 @@ LIBOBJ= pem_sign.o pem_seal.o pem_info.o pem_lib.o pem_all.o pem_err.o \ SRC= $(LIBSRC) -EXHEADER= pem.h pem2.h -HEADER= $(EXHEADER) +HEADER= ALL= $(GENERAL) $(SRC) $(HEADER) @@ -43,19 +40,6 @@ lib: $(LIBOBJ) files: $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO -links: $(EXHEADER) - @$(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; - tags: ctags $(SRC) diff --git a/crypto/pkcs12/Makefile b/crypto/pkcs12/Makefile index 3a7498fe7a..07461460da 100644 --- a/crypto/pkcs12/Makefile +++ b/crypto/pkcs12/Makefile @@ -13,8 +13,6 @@ AR= ar r CFLAGS= $(INCLUDES) $(CFLAG) GENERAL=Makefile -TEST= -APPS= LIB=$(TOP)/libcrypto.a LIBSRC= p12_add.c p12_asn.c p12_attr.c p12_crpt.c p12_crt.c p12_decr.c \ @@ -26,8 +24,7 @@ LIBOBJ= p12_add.o p12_asn.o p12_attr.o p12_crpt.o p12_crt.o p12_decr.o \ SRC= $(LIBSRC) -EXHEADER= pkcs12.h -HEADER= $(EXHEADER) +HEADER= ALL= $(GENERAL) $(SRC) $(HEADER) @@ -46,19 +43,6 @@ lib: $(LIBOBJ) 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; - tags: ctags $(SRC) diff --git a/crypto/pkcs7/Makefile b/crypto/pkcs7/Makefile index 987bddf797..4f218e8227 100644 --- a/crypto/pkcs7/Makefile +++ b/crypto/pkcs7/Makefile @@ -12,12 +12,10 @@ AR= ar r PEX_LIBS= EX_LIBS= - + CFLAGS= $(INCLUDES) $(CFLAG) GENERAL=Makefile README -TEST= -APPS= LIB=$(TOP)/libcrypto.a LIBSRC= pk7_asn1.c pk7_lib.c pkcs7err.c pk7_doit.c pk7_smime.c pk7_attr.c \ @@ -27,8 +25,7 @@ LIBOBJ= pk7_asn1.o pk7_lib.o pkcs7err.o pk7_doit.o pk7_smime.o pk7_attr.o \ SRC= $(LIBSRC) -EXHEADER= pkcs7.h -HEADER= $(EXHEADER) +HEADER= ALL= $(GENERAL) $(SRC) $(HEADER) @@ -47,19 +44,6 @@ lib: $(LIBOBJ) 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; - tags: ctags $(SRC) diff --git a/crypto/pqueue/Makefile b/crypto/pqueue/Makefile index 3c2d33dd7f..503b69ce8d 100644 --- a/crypto/pqueue/Makefile +++ b/crypto/pqueue/Makefile @@ -13,8 +13,6 @@ AR= ar r CFLAGS= $(INCLUDES) $(CFLAG) GENERAL=Makefile -TEST= -APPS= LIB=$(TOP)/libcrypto.a LIBSRC=pqueue.c @@ -22,8 +20,7 @@ LIBOBJ=pqueue.o SRC= $(LIBSRC) -EXHEADER= pqueue.h -HEADER= $(EXHEADER) +HEADER= ALL= $(GENERAL) $(SRC) $(HEADER) @@ -40,19 +37,6 @@ lib: $(LIBOBJ) 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; - tags: ctags $(SRC) diff --git a/crypto/rand/Makefile b/crypto/rand/Makefile index 27694aa664..bb9ef9a333 100644 --- a/crypto/rand/Makefile +++ b/crypto/rand/Makefile @@ -13,8 +13,6 @@ AR= ar r CFLAGS= $(INCLUDES) $(CFLAG) GENERAL=Makefile -TEST= randtest.c -APPS= LIB=$(TOP)/libcrypto.a LIBSRC=md_rand.c randfile.c rand_lib.c rand_err.c rand_egd.c \ @@ -24,8 +22,7 @@ LIBOBJ=md_rand.o randfile.o rand_lib.o rand_err.o rand_egd.o \ SRC= $(LIBSRC) -EXHEADER= rand.h -HEADER= $(EXHEADER) +HEADER= ALL= $(GENERAL) $(SRC) $(HEADER) @@ -42,19 +39,6 @@ lib: $(LIBOBJ) 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; - tags: ctags $(SRC) diff --git a/crypto/rc2/Makefile b/crypto/rc2/Makefile index 73eac347e7..22e1b49306 100644 --- a/crypto/rc2/Makefile +++ b/crypto/rc2/Makefile @@ -13,8 +13,6 @@ AR= ar r CFLAGS= $(INCLUDES) $(CFLAG) GENERAL=Makefile -TEST=rc2test.c -APPS= LIB=$(TOP)/libcrypto.a LIBSRC=rc2_ecb.c rc2_skey.c rc2_cbc.c rc2cfb64.c rc2ofb64.c @@ -22,8 +20,7 @@ LIBOBJ=rc2_ecb.o rc2_skey.o rc2_cbc.o rc2cfb64.o rc2ofb64.o SRC= $(LIBSRC) -EXHEADER= rc2.h -HEADER= rc2_locl.h $(EXHEADER) +HEADER= rc2_locl.h ALL= $(GENERAL) $(SRC) $(HEADER) @@ -40,19 +37,6 @@ lib: $(LIBOBJ) 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; - tags: ctags $(SRC) diff --git a/crypto/rc4/Makefile b/crypto/rc4/Makefile index f7be5f92a1..b09da2d303 100644 --- a/crypto/rc4/Makefile +++ b/crypto/rc4/Makefile @@ -17,8 +17,6 @@ ASFLAGS= $(INCLUDES) $(ASFLAG) AFLAGS= $(ASFLAGS) GENERAL=Makefile -TEST=rc4test.c -APPS= LIB=$(TOP)/libcrypto.a LIBSRC=rc4_skey.c rc4_enc.c @@ -26,8 +24,7 @@ LIBOBJ=$(RC4_ENC) SRC= $(LIBSRC) -EXHEADER= rc4.h -HEADER= $(EXHEADER) rc4_locl.h +HEADER= rc4_locl.h ALL= $(GENERAL) $(SRC) $(HEADER) @@ -68,19 +65,6 @@ rc4-%.s: asm/rc4-%.pl; $(PERL) $< $(PERLASM_SCHEME) $@ 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; - tags: ctags $(SRC) diff --git a/crypto/rc5/Makefile b/crypto/rc5/Makefile index 8a8b00eb89..4336e6e0fa 100644 --- a/crypto/rc5/Makefile +++ b/crypto/rc5/Makefile @@ -18,8 +18,6 @@ ASFLAGS= $(INCLUDES) $(ASFLAG) AFLAGS= $(ASFLAGS) GENERAL=Makefile -TEST=rc5test.c -APPS= LIB=$(TOP)/libcrypto.a LIBSRC=rc5_skey.c rc5_ecb.c rc5_enc.c rc5cfb64.c rc5ofb64.c @@ -27,8 +25,7 @@ LIBOBJ=rc5_skey.o rc5_ecb.o $(RC5_ENC) rc5cfb64.o rc5ofb64.o SRC= $(LIBSRC) -EXHEADER= rc5.h -HEADER= rc5_locl.h $(EXHEADER) +HEADER= rc5_locl.h ALL= $(GENERAL) $(SRC) $(HEADER) @@ -48,19 +45,6 @@ rc5-586.s: asm/rc5-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl 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; - tags: ctags $(SRC) diff --git a/crypto/ripemd/Makefile b/crypto/ripemd/Makefile index d5b1067dbe..a5aea85b49 100644 --- a/crypto/ripemd/Makefile +++ b/crypto/ripemd/Makefile @@ -18,8 +18,6 @@ ASFLAGS= $(INCLUDES) $(ASFLAG) AFLAGS= $(ASFLAGS) GENERAL=Makefile -TEST=rmdtest.c -APPS= LIB=$(TOP)/libcrypto.a LIBSRC=rmd_dgst.c rmd_one.c @@ -27,8 +25,7 @@ LIBOBJ=rmd_dgst.o rmd_one.o $(RMD160_ASM_OBJ) SRC= $(LIBSRC) -EXHEADER= ripemd.h -HEADER= rmd_locl.h rmdconst.h $(EXHEADER) +HEADER= rmd_locl.h rmdconst.h ALL= $(GENERAL) $(SRC) $(HEADER) @@ -48,19 +45,6 @@ rmd-586.s: asm/rmd-586.pl ../perlasm/x86asm.pl 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; - tags: ctags $(SRC) diff --git a/crypto/rsa/Makefile b/crypto/rsa/Makefile index 28213bfc41..be8dc757e3 100644 --- a/crypto/rsa/Makefile +++ b/crypto/rsa/Makefile @@ -13,8 +13,6 @@ AR= ar r CFLAGS= $(INCLUDES) $(CFLAG) GENERAL=Makefile -TEST=rsa_test.c -APPS= LIB=$(TOP)/libcrypto.a LIBSRC= rsa_eay.c rsa_gen.c rsa_lib.c rsa_sign.c rsa_saos.c rsa_err.c \ @@ -28,8 +26,7 @@ LIBOBJ= rsa_eay.o rsa_gen.o rsa_lib.o rsa_sign.o rsa_saos.o rsa_err.o \ SRC= $(LIBSRC) -EXHEADER= rsa.h -HEADER= $(EXHEADER) +HEADER= ALL= $(GENERAL) $(SRC) $(HEADER) @@ -46,19 +43,6 @@ lib: $(LIBOBJ) 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; - tags: ctags $(SRC) diff --git a/crypto/seed/Makefile b/crypto/seed/Makefile index 4bc55e4916..b4ea879b0b 100644 --- a/crypto/seed/Makefile +++ b/crypto/seed/Makefile @@ -14,8 +14,6 @@ AR= ar r CFLAGS= $(INCLUDES) $(CFLAG) GENERAL=Makefile -TEST= -APPS= LIB=$(TOP)/libcrypto.a LIBSRC=seed.c seed_ecb.c seed_cbc.c seed_cfb.c seed_ofb.c @@ -23,8 +21,7 @@ LIBOBJ=seed.o seed_ecb.o seed_cbc.o seed_cfb.o seed_ofb.o SRC= $(LIBSRC) -EXHEADER= seed.h -HEADER= seed_locl.h $(EXHEADER) +HEADER= seed_locl.h ALL= $(GENERAL) $(SRC) $(HEADER) @@ -41,19 +38,6 @@ lib: $(LIBOBJ) 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; - tags: ctags $(SRC) diff --git a/crypto/sha/Makefile b/crypto/sha/Makefile index 17dcbc8c9f..593aa7988a 100644 --- a/crypto/sha/Makefile +++ b/crypto/sha/Makefile @@ -18,8 +18,6 @@ ASFLAGS= $(INCLUDES) $(ASFLAG) AFLAGS= $(ASFLAGS) GENERAL=Makefile -TEST=sha1test.c sha256t.c sha512t.c -APPS= LIB=$(TOP)/libcrypto.a LIBSRC=sha1dgst.c sha1_one.c sha256.c sha512.c @@ -27,8 +25,7 @@ LIBOBJ=sha1dgst.o sha1_one.o sha256.o sha512.o $(SHA1_ASM_OBJ) SRC= $(LIBSRC) -EXHEADER= sha.h -HEADER= sha_locl.h $(EXHEADER) +HEADER= sha_locl.h ALL= $(GENERAL) $(SRC) $(HEADER) @@ -103,19 +100,6 @@ sha512-armv8.o: sha512-armv8.S 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; - tags: ctags $(SRC) diff --git a/crypto/srp/Makefile b/crypto/srp/Makefile index 3674dd6cd6..5967ca1103 100644 --- a/crypto/srp/Makefile +++ b/crypto/srp/Makefile @@ -14,8 +14,6 @@ AR= ar r CFLAGS= $(INCLUDES) $(CFLAG) GENERAL=Makefile -TEST=srptest.c -APPS= LIB=$(TOP)/libcrypto.a LIBSRC=srp_lib.c srp_vfy.c @@ -23,8 +21,7 @@ LIBOBJ=srp_lib.o srp_vfy.o SRC= $(LIBSRC) -EXHEADER= srp.h -HEADER= $(EXHEADER) +HEADER= top: (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all) @@ -39,19 +36,6 @@ lib: $(LIBOBJ) 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; - tags: ctags $(SRC) diff --git a/crypto/stack/Makefile b/crypto/stack/Makefile index 5327692ac8..f97b3e8d79 100644 --- a/crypto/stack/Makefile +++ b/crypto/stack/Makefile @@ -13,8 +13,6 @@ AR= ar r CFLAGS= $(INCLUDES) $(CFLAG) GENERAL=Makefile -TEST= -APPS= LIB=$(TOP)/libcrypto.a LIBSRC=stack.c @@ -22,8 +20,7 @@ LIBOBJ=stack.o SRC= $(LIBSRC) -EXHEADER= stack.h safestack.h -HEADER= $(EXHEADER) +HEADER= ALL= $(GENERAL) $(SRC) $(HEADER) @@ -40,19 +37,6 @@ lib: $(LIBOBJ) 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; - tags: ctags $(SRC) diff --git a/crypto/store/Makefile b/crypto/store/Makefile index 0dcfd7857a..79e31b565f 100644 --- a/crypto/store/Makefile +++ b/crypto/store/Makefile @@ -13,9 +13,6 @@ AR= ar r CFLAGS= $(INCLUDES) $(CFLAG) GENERAL=Makefile -#TEST= storetest.c -TEST= -APPS= LIB=$(TOP)/libcrypto.a LIBSRC= str_err.c str_lib.c str_meth.c str_mem.c @@ -23,9 +20,7 @@ LIBOBJ= str_err.o str_lib.o str_meth.o str_mem.o SRC= $(LIBSRC) -#EXHEADER= store.h str_compat.h -EXHEADER= store.h -HEADER= $(EXHEADER) str_locl.h +HEADER= str_locl.h ALL= $(GENERAL) $(SRC) $(HEADER) @@ -42,19 +37,6 @@ lib: $(LIBOBJ) 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; - tags: ctags $(SRC) diff --git a/crypto/ts/Makefile b/crypto/ts/Makefile index 32872a7bde..9635991060 100644 --- a/crypto/ts/Makefile +++ b/crypto/ts/Makefile @@ -17,12 +17,10 @@ AR= ar r PEX_LIBS= EX_LIBS= - + CFLAGS= $(INCLUDES) $(CFLAG) GENERAL= Makefile -TEST= -APPS= LIB=$(TOP)/libcrypto.a LIBSRC= ts_err.c ts_req_utils.c ts_req_print.c ts_rsp_utils.c ts_rsp_print.c \ @@ -34,8 +32,7 @@ LIBOBJ= ts_err.o ts_req_utils.o ts_req_print.o ts_rsp_utils.o ts_rsp_print.o \ SRC= $(LIBSRC) -EXHEADER= ts.h -HEADER= $(EXHEADER) +HEADER= ALL= $(GENERAL) $(SRC) $(HEADER) @@ -54,19 +51,6 @@ lib: $(LIBOBJ) 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; - tags: ctags $(SRC) diff --git a/crypto/txt_db/Makefile b/crypto/txt_db/Makefile index e6f30331d8..454bda0ed3 100644 --- a/crypto/txt_db/Makefile +++ b/crypto/txt_db/Makefile @@ -13,8 +13,6 @@ AR= ar r CFLAGS= $(INCLUDES) $(CFLAG) GENERAL=Makefile -TEST= -APPS= LIB=$(TOP)/libcrypto.a LIBSRC=txt_db.c @@ -22,8 +20,7 @@ LIBOBJ=txt_db.o SRC= $(LIBSRC) -EXHEADER= txt_db.h -HEADER= $(EXHEADER) +HEADER= ALL= $(GENERAL) $(SRC) $(HEADER) @@ -40,19 +37,6 @@ lib: $(LIBOBJ) 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; - tags: ctags $(SRC) diff --git a/crypto/ui/Makefile b/crypto/ui/Makefile index f0376a37ba..4ab59a1def 100644 --- a/crypto/ui/Makefile +++ b/crypto/ui/Makefile @@ -13,9 +13,6 @@ AR= ar r CFLAGS= $(INCLUDES) $(CFLAG) GENERAL=Makefile -#TEST= uitest.c -TEST= -APPS= LIB=$(TOP)/libcrypto.a LIBSRC= ui_err.c ui_lib.c ui_openssl.c ui_util.c @@ -23,8 +20,7 @@ LIBOBJ= ui_err.o ui_lib.o ui_openssl.o ui_util.o SRC= $(LIBSRC) -EXHEADER= ui.h -HEADER= $(EXHEADER) ui_locl.h +HEADER= ui_locl.h ALL= $(GENERAL) $(SRC) $(HEADER) @@ -41,19 +37,6 @@ lib: $(LIBOBJ) 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; - tags: ctags $(SRC) diff --git a/crypto/whrlpool/Makefile b/crypto/whrlpool/Makefile index 566b996290..31c63ad7be 100644 --- a/crypto/whrlpool/Makefile +++ b/crypto/whrlpool/Makefile @@ -18,8 +18,6 @@ ASFLAGS= $(INCLUDES) $(ASFLAG) AFLAGS= $(ASFLAGS) GENERAL=Makefile -TEST=wp_test.c -APPS= LIB=$(TOP)/libcrypto.a LIBSRC=wp_dgst.c wp_block.c @@ -27,8 +25,7 @@ LIBOBJ=wp_dgst.o $(WP_ASM_OBJ) SRC= $(LIBSRC) -EXHEADER= whrlpool.h -HEADER= wp_locl.h $(EXHEADER) +HEADER= wp_locl.h ALL= $(GENERAL) $(SRC) $(HEADER) @@ -53,19 +50,6 @@ $(LIBOBJ): $(LIBSRC) 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; - tags: ctags $(SRC) diff --git a/crypto/x509/Makefile b/crypto/x509/Makefile index 9572ed2ae4..914129a816 100644 --- a/crypto/x509/Makefile +++ b/crypto/x509/Makefile @@ -13,8 +13,6 @@ AR= ar r CFLAGS= $(INCLUDES) $(CFLAG) GENERAL=Makefile README -TEST= -APPS= LIB=$(TOP)/libcrypto.a LIBSRC= x509_def.c x509_d2.c x509_r2x.c x509_cmp.c \ @@ -34,8 +32,7 @@ LIBOBJ= x509_def.o x509_d2.o x509_r2x.o x509_cmp.o \ SRC= $(LIBSRC) -EXHEADER= x509.h x509_vfy.h -HEADER= $(EXHEADER) x509_lcl.h +HEADER= x509_lcl.h ALL= $(GENERAL) $(SRC) $(HEADER) @@ -52,19 +49,6 @@ lib: $(LIBOBJ) 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; - tags: ctags $(SRC) diff --git a/crypto/x509v3/Makefile b/crypto/x509v3/Makefile index f232e67e92..30c1edee6c 100644 --- a/crypto/x509v3/Makefile +++ b/crypto/x509v3/Makefile @@ -13,8 +13,6 @@ AR= ar r CFLAGS= $(INCLUDES) $(CFLAG) GENERAL=Makefile README -TEST=v3nametest.c -APPS= LIB=$(TOP)/libcrypto.a LIBSRC= v3_bcons.c v3_bitst.c v3_conf.c v3_extku.c v3_ia5.c v3_lib.c \ @@ -32,8 +30,7 @@ v3_asid.o v3_addr.o v3_scts.o SRC= $(LIBSRC) -EXHEADER= x509v3.h -HEADER= $(EXHEADER) pcy_int.h +HEADER= pcy_int.h ALL= $(GENERAL) $(SRC) $(HEADER) @@ -50,19 +47,6 @@ lib: $(LIBOBJ) 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; - tags: ctags $(SRC) diff --git a/engines/Makefile b/engines/Makefile index da4ae7714d..769a4e533f 100644 --- a/engines/Makefile +++ b/engines/Makefile @@ -29,8 +29,6 @@ ASFLAGS= $(INCLUDES) $(ASFLAG) AFLAGS= $(ASFLAGS) GENERAL=Makefile engines.com install.com engine_vector.mar -TEST= -APPS= LIB=$(TOP)/libcrypto.a LIBNAMES= 4758cca gmp padlock capi @@ -47,7 +45,6 @@ LIBOBJ= e_4758cca.o \ SRC= $(LIBSRC) -EXHEADER= HEADER= e_4758cca_err.c e_4758cca_err.h \ e_gmp_err.c e_gmp_err.h \ e_chil_err.c e_chil_err.h \ @@ -56,7 +53,7 @@ HEADER= e_4758cca_err.c e_4758cca_err.h \ e_ubsec_err.c e_ubsec_err.h \ e_capi_err.c e_capi_err.h -ALL= $(GENERAL) $(SRC) $(HEADER) +ALL= $(GENERAL) $(SRC) $(HEADER) top: (cd ..; $(MAKE) DIRS=$(DIR) all) @@ -90,9 +87,6 @@ files: $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO @target=files; $(RECURSIVE_MAKE) -links: - @target=links; $(RECURSIVE_MAKE) - # XXXXX This currently only works on systems that use .so as suffix # for shared libraries as well as for Cygwin which uses the # dlfcn_name_converter and therefore stores the engines with .so suffix, too. diff --git a/engines/ccgost/Makefile b/engines/ccgost/Makefile index c44b704553..edd1e50c88 100644 --- a/engines/ccgost/Makefile +++ b/engines/ccgost/Makefile @@ -8,8 +8,6 @@ AR= ar r CFLAGS= $(INCLUDES) $(CFLAG) LIB=$(TOP)/libcrypto.a -TEST=gost2814789test.c - LIBSRC= gost2001.c gost2001_keyx.c gost89.c gost94_keyx.c gost_ameth.c gost_asn1.c gost_crypt.c gost_ctl.c gost_eng.c gosthash.c gost_keywrap.c gost_md.c gost_params.c gost_pmeth.c gost_sign.c LIBOBJ= e_gost_err.o gost2001_keyx.o gost2001.o gost89.o gost94_keyx.o gost_ameth.o gost_asn1.o gost_crypt.o gost_ctl.o gost_eng.o gosthash.o gost_keywrap.o gost_md.o gost_params.o gost_pmeth.o gost_sign.o @@ -63,9 +61,6 @@ install: mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx; \ fi -links: - @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST) - tests: depend: 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) diff --git a/test/Makefile b/test/Makefile index f4635b8947..2e3efd82ea 100644 --- a/test/Makefile +++ b/test/Makefile @@ -12,7 +12,6 @@ PERL= perl # KRB5 stuff KRB5_INCLUDES= LIBKRB5= -TEST= igetest.c PEX_LIBS= EX_LIBS= #-lnsl -lsocket @@ -56,7 +55,6 @@ GOST2814789TEST=gost2814789test RANDTEST= randtest DHTEST= dhtest DSATEST= dsatest -METHTEST= methtest SSLTEST= ssltest RSATEST= rsa_test ENGINETEST= enginetest @@ -111,10 +109,9 @@ SRC= $(BNTEST).c $(ECTEST).c $(ECDSATEST).c $(ECDHTEST).c $(IDEATEST).c \ $(GOST2814789TEST).c $(HEARTBEATTEST).c $(P5_CRPT2_TEST).c \ $(CONSTTIMETEST).c testutil.c -EXHEADER= -HEADER= testutil.h $(EXHEADER) +HEADER= testutil.h -ALL= $(GENERAL) $(SRC) $(HEADER) +ALL= $(GENERAL) $(SRC) $(HEADER) top: (cd ..; $(MAKE) DIRS=$(DIR) TESTS=$(TESTS) all) @@ -126,18 +123,12 @@ exe: $(EXE) dummytest$(EXE_EXT) files: $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO -links: - generate: $(SRC) $(SRC): @sh $(TOP)/util/point.sh dummytest.c $@ errors: -install: - -uninstall: - tags: ctags $(SRC) diff --git a/tools/Makefile b/tools/Makefile index 19950d14e5..edd7fc5d06 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -12,7 +12,6 @@ MAKEFILE= Makefile CFLAGS= $(INCLUDES) $(CFLAG) GENERAL=Makefile -TEST= APPS= c_rehash MISC_APPS= c_hash c_info c_issuer c_name @@ -48,8 +47,6 @@ uninstall: files: $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO -links: - lint: tags: