More fixes to parallel Make

* cross/ndk-build/ndk-build.mk.in (NDK_BUILD_MODULES)
(NDK_BUILD_SHARED, NDK_BUILD_STATIC): Define group rule to build
all files so that they are built within one make process.
* java/Makefile.in: Reorganize cross compilation and make sure
there is only one make subprocess for each subdirectory of
cross.

1 files changed, 25 insertions, 15 deletions

diff --git a/java/Makefile.in b/java/Makefile.in
index 52e0a7a75f1..482419f07fa 100644
--- a/java/Makefile.in
+++ b/java/Makefile.in
@@ -113,33 +113,43 @@ APK_NAME := emacs-$(version)-$(ANDROID_MIN_SDK)-$(ANDROID_ABI).apk
 all: $(APK_NAME)
 
 # Binaries to cross-compile.
-CROSS_BINS = ../cross/src/android-emacs ../cross/lib-src/ctags  \
-             ../cross/lib-src/hexl ../cross/lib-src/movemail    \
-             ../cross/lib-src/ebrowse ../cross/lib-src/emacsclient \
-             ../cross/lib-src/etags
+CROSS_SRC_BINS = $(top_builddir)/cross/src/android-emacs
+CROSS_LIBSRC_BINS = $(top_builddir)/cross/lib-src/ctags         \
+                    $(top_builddir)/cross/lib-src/hexl          \
+                    $(top_builddir)/cross/lib-src/movemail      \
+                    $(top_builddir)/cross/lib-src/ebrowse       \
+                    $(top_builddir)/cross/lib-src/emacsclient   \
+                    $(top_builddir)/cross/lib-src/etags
+CROSS_BINS = $(CROSS_SRC_BINS) $(CROSS_LIBSRC_BINS)
 
 # Libraries to cross-compile.
-CROSS_LIBS = ../cross/src/libemacs.so
+CROSS_LIBS = $(top_builddir)/cross/src/libemacs.so
 
 # Make sure gnulib is built first!
 # If not, then the recursive invocations of make below will try to
 # build gnulib at the same time.
-CROSS_ARCHIVES = ../cross/lib/libgnu.a
+CROSS_ARCHIVES = $(top_builddir)/cross/lib/libgnu.a
 
 # Third party libraries to compile.
 include $(top_builddir)/cross/ndk-build/ndk-build.mk
 
 .PHONY: $(CROSS_BINS) $(CROSS_LIBS) $(CROSS_ARCHIVES)
 
-../cross/src/android-emacs ../cross/src/libemacs.so: $(CROSS_ARCHIVES)
-        $(MAKE) -C ../cross src/$(notdir $@)
-
-../cross/lib-src/hexl ../cross/lib-src/movemail \
-../cross/lib-src/ctags ../cross/lib-src/ebrowse &: $(CROSS_ARCHIVES)
-        $(MAKE) -C ../cross lib-src/$(notdir $@)
-
-../cross/lib/libgnu.a:
-        $(MAKE) -C ../cross lib/libgnu.a
+# There should only be a single invocation of $(MAKE) -C
+# $(top_srcdir)/cross for each directory under $(top_srcdir)/cross.
+$(CROSS_SRC_BINS) $(CROSS_LIBS) &: $(CROSS_ARCHIVES)
+        $(MAKE) -C $(top_builddir)/cross $(foreach file,        \
+                                           $(CROSS_SRC_BINS)    \
+                                           $(CROSS_LIBS),       \
+                                           src/$(notdir $(file)))
+
+$(CROSS_LIBSRC_BINS) &: $(CROSS_ARCHIVES)
+        $(MAKE) -C $(top_builddir)/cross $(foreach file,                \
+                                           $(CROSS_LIBSRC_BINS),        \
+                                           lib-src/$(notdir $(file)))
+
+$(CROSS_ARCHIVES):
+        $(MAKE) -C $(top_builddir)/cross lib/libgnu.a
 
 # This is needed to generate the ``.directory-tree'' file used by the
 # Android emulations of readdir and faccessat.