Ah, got it. Trouble is, though, that Makefile.org is made to work with other make implementations as well. Adding gnuisms in it will create problems.
Cheers, Richard In message <[email protected]> on Wed, 8 Dec 2010 15:40:29 +0100, Mårten Wikström <[email protected]> said: marten> Yes, it is a GNU Make feature as far as I know. The + tells make that marten> the rule is recursive and thus propagates the -j magic to sub makes. marten> Normally it handles this magic automatically but for this to work you marten> have to call sub makes with $(MAKE), if you use anything else you marten> manually have to mark the recipe with a +. See section 5.7.1 in marten> http://www.gnu.org/software/make/manual/make.html#MAKE-Variable marten> marten> Cheers, marten> marten> Mårten marten> marten> 2010/12/8 Richard Levitte <[email protected]>: marten> > Hmmm, I'm not aware of the meaning of a '+' at the start of command marten> > lines, never seen it before. I can't see any explanation in the GNU marten> > make manual, so I assume it's another implementation of make that marten> > supports this. marten> > marten> > Please enlighten me. marten> > marten> > Cheers, marten> > Richard marten> > marten> > In message <[email protected]> on Wed, 8 Dec 2010 13:01:48 +0100, Mårten Wikström <[email protected]> said: marten> > marten> > marten.wikstrom> Hi! marten> > marten.wikstrom> marten> > marten.wikstrom> With the attached patch I can build openssl in parallel. Perhaps it is marten> > marten.wikstrom> useful for someone else as well. marten> > marten.wikstrom> marten> > marten.wikstrom> Cheers, marten> > marten.wikstrom> marten> > marten.wikstrom> Mårten marten> > marten.wikstrom> marten> > marten.wikstrom> marten> > marten.wikstrom> marten> > marten.wikstrom> Index: openssl-0.9.8q/Makefile.org marten> > marten.wikstrom> =================================================================== marten> > marten.wikstrom> --- openssl-0.9.8q.orig/Makefile.org 2010-12-08 11:13:10.381185998 +0100 marten> > marten.wikstrom> +++ openssl-0.9.8q/Makefile.org 2010-12-08 11:13:59.111185998 +0100 marten> > marten.wikstrom> @@ -326,7 +326,7 @@ marten> > marten.wikstrom> build_libs: build_crypto build_fips build_ssl build_shared build_engines marten> > marten.wikstrom> marten> > marten.wikstrom> build_crypto: marten> > marten.wikstrom> - if [ -n "$(FIPSCANLIB)" ]; then \ marten> > marten.wikstrom> + +if [ -n "$(FIPSCANLIB)" ]; then \ marten> > marten.wikstrom> EXCL_OBJ='$(AES_ASM_OBJ) $(BN_ASM) $(DES_ENC) $(CPUID_OBJ) marten> > marten.wikstrom> $(SHA1_ASM_OBJ) $(FIPS_EX_OBJ)' ; export EXCL_OBJ ; \ marten> > marten.wikstrom> ARX='$(PERL) $${TOP}/util/arx.pl $(AR)' ; \ marten> > marten.wikstrom> else \ marten> > marten.wikstrom> @@ -334,22 +334,24 @@ marten> > marten.wikstrom> fi ; export ARX ; \ marten> > marten.wikstrom> dir=crypto; target=all; $(BUILD_ONE_CMD) marten> > marten.wikstrom> build_fips: marten> > marten.wikstrom> - @dir=fips; target=all; [ -z "$(FIPSCANLIB)" ] || $(BUILD_ONE_CMD) marten> > marten.wikstrom> + +...@dir=fips; target=all; [ -z "$(FIPSCANLIB)" ] || $(BUILD_ONE_CMD) marten> > marten.wikstrom> build_ssl: build_crypto marten> > marten.wikstrom> - @dir=ssl; target=all; $(BUILD_ONE_CMD) marten> > marten.wikstrom> + +...@dir=ssl; target=all; $(BUILD_ONE_CMD) marten> > marten.wikstrom> build_engines: build_crypto marten> > marten.wikstrom> - @dir=engines; target=all; $(BUILD_ONE_CMD) marten> > marten.wikstrom> + +...@dir=engines; target=all; $(BUILD_ONE_CMD) marten> > marten.wikstrom> build_apps: build_libs marten> > marten.wikstrom> - @dir=apps; target=all; $(BUILD_ONE_CMD) marten> > marten.wikstrom> + +...@dir=apps; target=all; $(BUILD_ONE_CMD) marten> > marten.wikstrom> build_tests: build_libs marten> > marten.wikstrom> - @dir=test; target=all; $(BUILD_ONE_CMD) marten> > marten.wikstrom> + +...@dir=test; target=all; $(BUILD_ONE_CMD) marten> > marten.wikstrom> build_tools: build_libs marten> > marten.wikstrom> - @dir=tools; target=all; $(BUILD_ONE_CMD) marten> > marten.wikstrom> + +...@dir=tools; target=all; $(BUILD_ONE_CMD) marten> > marten.wikstrom> marten> > marten.wikstrom> all_testapps: build_libs build_testapps marten> > marten.wikstrom> build_testapps: marten> > marten.wikstrom> @dir=crypto; target=testapps; $(BUILD_ONE_CMD) marten> > marten.wikstrom> marten> > marten.wikstrom> +libcrypto.a: build_crypto marten> > marten.wikstrom> +libssl.a: build_ssl marten> > marten.wikstrom> build_shared: $(SHARED_LIBS) marten> > marten.wikstrom> libcrypto$(SHLIB_EXT): libcrypto.a $(SHARED_FIPS) marten> > marten.wikstrom> @if [ "$(SHLIB_TARGET)" != "" ]; then \ marten> > marten.wikstrom> Index: openssl-0.9.8q/crypto/Makefile marten> > marten.wikstrom> =================================================================== marten> > marten.wikstrom> --- openssl-0.9.8q.orig/crypto/Makefile 2010-12-08 11:25:54.941185997 +0100 marten> > marten.wikstrom> +++ openssl-0.9.8q/crypto/Makefile 2010-12-08 11:27:54.031185995 +0100 marten> > marten.wikstrom> @@ -82,17 +82,17 @@ marten> > marten.wikstrom> @if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi marten> > marten.wikstrom> marten> > marten.wikstrom> subdirs: marten> > marten.wikstrom> - @target=all; $(RECURSIVE_MAKE) marten> > marten.wikstrom> + +...@target=all; $(RECURSIVE_MAKE) marten> > marten.wikstrom> marten> > marten.wikstrom> files: marten> > marten.wikstrom> $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO marten> > marten.wikstrom> - @target=files; $(RECURSIVE_MAKE) marten> > marten.wikstrom> + +...@target=files; $(RECURSIVE_MAKE) marten> > marten.wikstrom> marten> > marten.wikstrom> links: marten> > marten.wikstrom> @$(PERL) $(TOP)/util/mklink.pl ../include/openssl $(EXHEADER) marten> > marten.wikstrom> @$(PERL) $(TOP)/util/mklink.pl ../test $(TEST) marten> > marten.wikstrom> @$(PERL) $(TOP)/util/mklink.pl ../apps $(APPS) marten> > marten.wikstrom> - @target=links; $(RECURSIVE_MAKE) marten> > marten.wikstrom> + +...@target=links; $(RECURSIVE_MAKE) marten> > marten.wikstrom> marten> > marten.wikstrom> # lib: and $(LIB): are splitted to avoid end-less loop marten> > marten.wikstrom> lib: buildinf.h $(LIB) subdirs marten> > marten.wikstrom> @@ -107,7 +107,7 @@ marten> > marten.wikstrom> fi marten> > marten.wikstrom> marten> > marten.wikstrom> libs: marten> > marten.wikstrom> - @target=lib; $(RECURSIVE_MAKE) marten> > marten.wikstrom> + +...@target=lib; $(RECURSIVE_MAKE) marten> > marten.wikstrom> marten> > marten.wikstrom> install: marten> > marten.wikstrom> @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... marten> > marten.wikstrom> @@ -116,10 +116,10 @@ marten> > marten.wikstrom> (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ marten> > marten.wikstrom> chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ marten> > marten.wikstrom> done; marten> > marten.wikstrom> - @target=install; $(RECURSIVE_MAKE) marten> > marten.wikstrom> + +...@target=install; $(RECURSIVE_MAKE) marten> > marten.wikstrom> marten> > marten.wikstrom> lint: marten> > marten.wikstrom> - @target=lint; $(RECURSIVE_MAKE) marten> > marten.wikstrom> + +...@target=lint; $(RECURSIVE_MAKE) marten> > marten.wikstrom> marten> > marten.wikstrom> depend: marten> > marten.wikstrom> @[ -z "$(THIS)" -o -f buildinf.h ] || touch buildinf.h # fake marten> > marten.wikstrom> buildinf.h if it does not exist marten> > marten.wikstrom> @@ -130,12 +130,12 @@ marten> > marten.wikstrom> marten> > marten.wikstrom> clean: marten> > marten.wikstrom> rm -f buildinf.h *.s *.o */*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff marten> > marten.wikstrom> - @target=clean; $(RECURSIVE_MAKE) marten> > marten.wikstrom> + +...@target=clean; $(RECURSIVE_MAKE) marten> > marten.wikstrom> marten> > marten.wikstrom> dclean: marten> > marten.wikstrom> $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' marten> > marten.wikstrom> $(MAKEFILE) >Makefile.new marten> > marten.wikstrom> mv -f Makefile.new $(MAKEFILE) marten> > marten.wikstrom> - @target=dclean; $(RECURSIVE_MAKE) marten> > marten.wikstrom> + +...@target=dclean; $(RECURSIVE_MAKE) marten> > marten.wikstrom> marten> > marten.wikstrom> # DO NOT DELETE THIS LINE -- make depend depends on it. -- Richard Levitte [email protected] http://richard.levitte.org/ "Life is a tremendous celebration - and I'm invited!" -- from a friend's blog, translated from Swedish ______________________________________________________________________ OpenSSL Project http://www.openssl.org Development Mailing List [email protected] Automated List Manager [email protected]
