Further BUILDENV refinement, further fool-proofing of Makefiles and (ce92b6eb) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP OpenSSL

Makefile.org

+5 −3

Original line number	Original line	Diff line number	Diff line
	@@ -152,7 +152,9 @@ BUILDENV= PLATFORM='${PLATFORM}' PROCESSOR='${PROCESSOR}' \
	AR='${AR}' PERL='${PERL}' RANLIB='${RANLIB}' \		AR='${AR}' PERL='${PERL}' RANLIB='${RANLIB}' \
	SDIRS='$(SDIRS)' LIBRPATH='$(INSTALLTOP)/lib' \		SDIRS='$(SDIRS)' LIBRPATH='$(INSTALLTOP)/lib' \
	INSTALLTOP='${INSTALLTOP}' OPENSSLDIR='${OPENSSLDIR}' \		INSTALLTOP='${INSTALLTOP}' OPENSSLDIR='${OPENSSLDIR}' \
	DEPFLAG='${DEPFLAG}' MAKEDEPPROG='${MAKEDEPPROG}' \		MAKEDEPEND='$$(TOP)/util/domd $$(TOP) -MD $(MAKEDEPPROG)'\
			DEPFLAG='-DOPENSSL_NO_DEPRECATED ${DEPFLAG}' \
			MAKEDEPPROG='${MAKEDEPPROG}' \
	LDFLAGS="$(LDFLAGS)" SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \		LDFLAGS="$(LDFLAGS)" SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \
	KRB5_INCLUDES='${KRB5_INCLUDES}' LIBKRB5='${LIBKRB5}' \		KRB5_INCLUDES='${KRB5_INCLUDES}' LIBKRB5='${LIBKRB5}' \
	EXE_EXT='${EXE_EXT}' SHARED_LIBS='${SHARED_LIBS}' \		EXE_EXT='${EXE_EXT}' SHARED_LIBS='${SHARED_LIBS}' \
	@@ -177,7 +179,7 @@ BUILD_CMD=if echo " $(DIRS) " \| grep " $$dir " >/dev/null 2>/dev/null; then \
	fi; fi		fi; fi

	reflect:		reflect:
	[ -n "$(THIS)" ] && $(MAKE) $(THIS) $(BIULDENV)		@[ -n "$(THIS)" ] && $(MAKE) $(THIS) $(BUILDENV)

	sub_all: build_all		sub_all: build_all
	build_all: build_libs build_apps build_tests build_tools		build_all: build_libs build_apps build_tests build_tools
	@@ -350,7 +352,7 @@ depend:
	do \		do \
	if [ -d "$$i" ]; then \		if [ -d "$$i" ]; then \
	(cd $$i && echo "making dependencies $$i..." && \		(cd $$i && echo "making dependencies $$i..." && \
	$(MAKE) $(BUILDENV) CFLAG='-DOPENSSL_NO_DEPRECATED ${CFLAG}' depend ) \|\| exit 1; \		$(MAKE) $(BUILDENV) depend ) \|\| exit 1; \
	fi; \		fi; \
	done;		done;

apps/Makefile

+5 −3

Original line number	Original line	Diff line number	Diff line
	@@ -7,8 +7,6 @@ TOP= ..
	CC= cc		CC= cc
	INCLUDES= -I$(TOP) -I../include $(KRB5_INCLUDES)		INCLUDES= -I$(TOP) -I../include $(KRB5_INCLUDES)
	CFLAG= -g -static		CFLAG= -g -static
	MAKEDEPPROG= makedepend
	MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
	MAKEFILE= Makefile		MAKEFILE= Makefile
	PERL= perl		PERL= perl
	RM= rm -f		RM= rm -f
	@@ -130,7 +128,11 @@ lint:
	lint -DLINT $(INCLUDES) $(SRC)>fluff		lint -DLINT $(INCLUDES) $(SRC)>fluff

	depend:		depend:
	$(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(SRC)		@if [ -z "$(THIS)" ]; then \
			$(MAKE) -f $(TOP)/Makefile reflect THIS=$@; \
			else \
			$(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(SRC); \
			fi

	dclean:		dclean:
	$(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new		$(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new

crypto/Makefile

+6 −5

Original line number	Original line	Diff line number	Diff line
	@@ -151,11 +151,12 @@ depend:
	[ -z "$(THIS)" -o -f buildinf.h ] \|\| touch buildinf.h # fake buildinf.h if it does not exist		[ -z "$(THIS)" -o -f buildinf.h ] \|\| touch buildinf.h # fake buildinf.h if it does not exist
	[ -z "$(THIS)" ] \|\| $(MAKEDEPEND) -- $(CFLAG) $(INCLUDE) $(DEPFLAG) -- $(PROGS) $(LIBSRC)		[ -z "$(THIS)" ] \|\| $(MAKEDEPEND) -- $(CFLAG) $(INCLUDE) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
	[ -z "$(THIS)" -o -s buildinf.h ] \|\| rm buildinf.h		[ -z "$(THIS)" -o -s buildinf.h ] \|\| rm buildinf.h
	@[ -z "$(THIS)" ] \|\| for i in $(SDIRS) ;\		@[ -z "$(THIS)" ] \|\| (set -e; \
	do \		for i in $(SDIRS) ; do \
	( cd $$i && echo "making depend in crypto/$$i..." && \		( cd $$i && echo "making depend in crypto/$$i..." && \
	$(MAKE) INCLUDES='${INCLUDES}' depend ); \		$(MAKE) INCLUDES='${INCLUDES}' depend \
	done;		); \
			done; )
	@if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi		@if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi

	clean:		clean:

crypto/aes/Makefile

+18 −5

Original line number	Original line	Diff line number	Diff line
	@@ -8,8 +8,6 @@ CC= cc
	CPP= $(CC) -E		CPP= $(CC) -E
	INCLUDES=		INCLUDES=
	CFLAG=-g		CFLAG=-g
	MAKEDEPPROG= makedepend
	MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
	MAKEFILE= Makefile		MAKEFILE= Makefile
	AR= ar r		AR= ar r

	@@ -65,9 +63,7 @@ links:
	@$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)		@$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
	@$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)		@$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)

	install: installs		install:

	installs:
	@[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...		@[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
	@headerlist="$(EXHEADER)"; for i in $$headerlist ; \		@headerlist="$(EXHEADER)"; for i in $$headerlist ; \
	do \		do \
	@@ -84,6 +80,7 @@ lint:
	lint -DLINT $(INCLUDES) $(SRC)>fluff		lint -DLINT $(INCLUDES) $(SRC)>fluff

	depend:		depend:
			@[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
	$(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)		$(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)

	dclean:		dclean:
	@@ -95,3 +92,19 @@ clean:

	# DO NOT DELETE THIS LINE -- make depend depends on it.		# DO NOT DELETE THIS LINE -- make depend depends on it.

			aes_cbc.o: ../../include/openssl/aes.h ../../include/openssl/e_os2.h
			aes_cbc.o: ../../include/openssl/opensslconf.h aes_cbc.c aes_locl.h
			aes_cfb.o: ../../e_os.h ../../include/openssl/aes.h
			aes_cfb.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
			aes_cfb.o: aes_cfb.c aes_locl.h
			aes_core.o: ../../include/openssl/aes.h ../../include/openssl/e_os2.h
			aes_core.o: ../../include/openssl/opensslconf.h aes_core.c aes_locl.h
			aes_ctr.o: ../../include/openssl/aes.h ../../include/openssl/e_os2.h
			aes_ctr.o: ../../include/openssl/opensslconf.h aes_ctr.c aes_locl.h
			aes_ecb.o: ../../include/openssl/aes.h ../../include/openssl/e_os2.h
			aes_ecb.o: ../../include/openssl/opensslconf.h aes_ecb.c aes_locl.h
			aes_misc.o: ../../include/openssl/aes.h ../../include/openssl/e_os2.h
			aes_misc.o: ../../include/openssl/opensslconf.h
			aes_misc.o: ../../include/openssl/opensslv.h aes_locl.h aes_misc.c
			aes_ofb.o: ../../include/openssl/aes.h ../../include/openssl/e_os2.h
			aes_ofb.o: ../../include/openssl/opensslconf.h aes_locl.h aes_ofb.c

crypto/asn1/Makefile

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -7,8 +7,6 @@ TOP= ../..
	CC= cc		CC= cc
	INCLUDES= -I.. -I$(TOP) -I../../include		INCLUDES= -I.. -I$(TOP) -I../../include
	CFLAG=-g		CFLAG=-g
	MAKEDEPPROG= makedepend
	MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
	MAKEFILE= Makefile		MAKEFILE= Makefile
	AR= ar r		AR= ar r

	@@ -94,6 +92,7 @@ lint:
	lint -DLINT $(INCLUDES) $(SRC)>fluff		lint -DLINT $(INCLUDES) $(SRC)>fluff

	depend:		depend:
			@[ -n "$(MAKEDEPEND)" ] # should be set by top Makefile...
	$(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)		$(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)

	dclean:		dclean: