From a80e33b991e29988309964439fa8dba30af7ea5c Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Thu, 26 Mar 2015 21:44:59 +0100 Subject: 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 --- engines/Makefile | 8 +------- engines/ccgost/Makefile | 5 ----- 2 files changed, 1 insertion(+), 12 deletions(-) (limited to 'engines') 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: -- cgit v1.2.3