Commit a80e33b9 authored by Richard Levitte's avatar Richard Levitte
Browse files

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: default avatarRich Salz <rsalz@openssl.org>
parent dee502be

Makefile.org

+1 −2
Original line number Diff line number Diff line
@@ -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}	\

apps/Makefile

+2 −6
Original line number Diff line number Diff line
@@ -68,10 +68,8 @@ 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)
@@ -135,8 +133,6 @@ tags: 


tests:



links:



lint:

	lint -DLINT $(INCLUDES) $(SRC)>fluff

crypto/Makefile

+2 −22
Original line number Diff line number Diff line
@@ -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,10 +43,8 @@ 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)
@@ -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)

crypto/aes/Makefile

+1 −18
Original line number Diff line number Diff line
@@ -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)

crypto/asn1/Makefile

+1 −17
Original line number Diff line number Diff line
@@ -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)