Commit 17085b02 authored by Richard Levitte's avatar Richard Levitte
Browse files

Pass CFLAG to dependency makers, so non-standard system include paths are 

handled properly.
Part of PR 75
parent 4367eb87

Makefile.org

+1 −1
Original line number Diff line number Diff line
@@ -600,7 +600,7 @@ depend: 
	do \

	if [ -d "$$i" ]; then \

		(cd $$i && echo "making dependencies $$i..." && \

		$(MAKE) SDIRS='${SDIRS}' DEPFLAG='${DEPFLAG}' MAKEDEPPROG='${MAKEDEPPROG}' KRB5_INCLUDES='${KRB5_INCLUDES}' PERL='${PERL}' depend ) || exit 1; \

		$(MAKE) SDIRS='${SDIRS}' CFLAG='${CFLAG}' DEPFLAG='${DEPFLAG}' MAKEDEPPROG='${MAKEDEPPROG}' KRB5_INCLUDES='${KRB5_INCLUDES}' PERL='${PERL}' depend ) || exit 1; \

	fi; \

	done;

apps/Makefile.ssl

+1 −1
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ lint: 
	lint -DLINT $(INCLUDES) $(SRC)>fluff



depend:

	$(MAKEDEPEND) $(INCLUDES) $(DEPFLAG) $(PROGS) $(SRC)

	$(MAKEDEPEND) $(CFLAG) $(INCLUDES) $(DEPFLAG) $(PROGS) $(SRC)



dclean:

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

crypto/Makefile.ssl

+2 −2
Original line number Diff line number Diff line
@@ -136,12 +136,12 @@ lint: 


depend:

	if [ ! -f buildinf.h ]; then touch buildinf.h; fi # fake buildinf.h if it does not exist

	$(MAKEDEPEND) $(INCLUDE) $(DEPFLAG) $(PROGS) $(LIBSRC)

	$(MAKEDEPEND) $(CFLAG) $(INCLUDE) $(DEPFLAG) $(PROGS) $(LIBSRC)

	if [ ! -s buildinf.h ]; then rm buildinf.h; fi

	@for i in $(SDIRS) ;\

	do \

	(cd $$i && echo "making depend in crypto/$$i..." && \

	$(MAKE) MAKEFILE='${MAKEFILE}' INCLUDES='${INCLUDES}' DEPFLAG='${DEPFLAG}' PERL='${PERL}' depend ); \

	$(MAKE) MAKEFILE='${MAKEFILE}' INCLUDES='${INCLUDES}' CFLAG='${CFLAG}' DEPFLAG='${DEPFLAG}' PERL='${PERL}' depend ); \

	done;



clean:

crypto/aes/Makefile.ssl

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ lint: 
	lint -DLINT $(INCLUDES) $(SRC)>fluff



depend:

	$(MAKEDEPEND) $(INCLUDES) $(DEPFLAG) $(PROGS) $(LIBSRC)

	$(MAKEDEPEND) $(CFLAG) $(INCLUDES) $(DEPFLAG) $(PROGS) $(LIBSRC)



dclean:

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

crypto/asn1/Makefile.ssl

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ lint: 
	lint -DLINT $(INCLUDES) $(SRC)>fluff



depend:

	$(MAKEDEPEND) $(INCLUDES) $(DEPFLAG) $(PROGS) $(LIBSRC)

	$(MAKEDEPEND) $(CFLAG) $(INCLUDES) $(DEPFLAG) $(PROGS) $(LIBSRC)



dclean:

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