Jumbo Makfiles update.
- eliminate ambiguities between GNU-ish and SysV-ish make flavors; - switch [back] to -e; - fold/unify rules; This is follow-up to the patch introducing common BUILDENV. Idea is to collect as much parameters in $(TOP) as possible and "strip" lower Makefiles for most variables [and thus makes them more readable].
This commit is contained in:
@@ -312,7 +312,7 @@ BUILD_CMD=shlib_target=; if [ -n "$(SHARED_LIBS)" ]; then \
|
||||
else \
|
||||
LIBRARIES="$(LIBSSL) $(LIBCRYPTO)"; \
|
||||
fi; \
|
||||
$(MAKE) -f $(TOP)/Makefile.shared \
|
||||
$(MAKE) -f $(TOP)/Makefile.shared -e \
|
||||
APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \
|
||||
LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
|
||||
link_app.$${shlib_target}
|
||||
@@ -549,8 +549,11 @@ md5test.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
|
||||
md5test.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
|
||||
md5test.o: ../include/openssl/ossl_typ.h ../include/openssl/safestack.h
|
||||
md5test.o: ../include/openssl/stack.h ../include/openssl/symhacks.h md5test.c
|
||||
mdc2test.o: ../e_os.h ../include/openssl/e_os2.h
|
||||
mdc2test.o: ../include/openssl/opensslconf.h mdc2test.c
|
||||
mdc2test.o: ../include/openssl/buffer.h ../include/openssl/crypto.h
|
||||
mdc2test.o: ../include/openssl/e_os2.h ../include/openssl/opensslconf.h
|
||||
mdc2test.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
|
||||
mdc2test.o: ../include/openssl/safestack.h ../include/openssl/stack.h
|
||||
mdc2test.o: ../include/openssl/symhacks.h mdc2test.c
|
||||
randtest.o: ../e_os.h ../include/openssl/e_os2.h
|
||||
randtest.o: ../include/openssl/opensslconf.h ../include/openssl/ossl_typ.h
|
||||
randtest.o: ../include/openssl/rand.h randtest.c
|
||||
@@ -559,8 +562,11 @@ rc2test.o: ../include/openssl/opensslconf.h ../include/openssl/rc2.h rc2test.c
|
||||
rc4test.o: ../e_os.h ../include/openssl/e_os2.h
|
||||
rc4test.o: ../include/openssl/opensslconf.h ../include/openssl/rc4.h
|
||||
rc4test.o: ../include/openssl/sha.h rc4test.c
|
||||
rc5test.o: ../e_os.h ../include/openssl/e_os2.h
|
||||
rc5test.o: ../include/openssl/opensslconf.h rc5test.c
|
||||
rc5test.o: ../include/openssl/buffer.h ../include/openssl/crypto.h
|
||||
rc5test.o: ../include/openssl/e_os2.h ../include/openssl/opensslconf.h
|
||||
rc5test.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
|
||||
rc5test.o: ../include/openssl/safestack.h ../include/openssl/stack.h
|
||||
rc5test.o: ../include/openssl/symhacks.h rc5test.c
|
||||
rmdtest.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
|
||||
rmdtest.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
|
||||
rmdtest.o: ../include/openssl/evp.h ../include/openssl/obj_mac.h
|
||||
|
Reference in New Issue
Block a user