[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
feature/android f3196052070 7/9: More parallel build fixes
From: |
Po Lu |
Subject: |
feature/android f3196052070 7/9: More parallel build fixes |
Date: |
Sun, 19 Feb 2023 09:14:48 -0500 (EST) |
branch: feature/android
commit f3196052070999ef9f9c822a676443b14df6a0e6
Author: Po Lu <luangruo@yahoo.com>
Commit: Po Lu <luangruo@yahoo.com>
More parallel build fixes
* cross/Makefile.in: (.PHONY):
* java/Makefile.in: (.PHONY):
* src/Makefile.in: (libemacs.so): Avoid calling ndk-build from
two places at once. Build android-emacs separately from
libemacs.so.
---
cross/Makefile.in | 10 +++++++---
java/Makefile.in | 5 +++--
src/Makefile.in | 9 +++++----
3 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/cross/Makefile.in b/cross/Makefile.in
index c059fda1e3c..ac23b2e23f5 100644
--- a/cross/Makefile.in
+++ b/cross/Makefile.in
@@ -149,9 +149,13 @@ src/Makefile src/config.h &:
$(top_builddir)/src/config.h.android \
sed -i 's/-I\$$(top_srcdir)\/lib//g' src/Makefile
.PHONY: src/android-emacs src/libemacs.so
-src/android-emacs src/libemacs.so &: src/Makefile src/config.h \
- src/verbose.mk lib/libgnu.a $(PRE_BUILD_DEPS)
- $(MAKE) -C src android-emacs libemacs.so
+
+src/libemacs.so: src/Makefile src/config.h src/verbose.mk \
+ lib/libgnu.a $(PRE_BUILD_DEPS)
+ $(MAKE) -C src libemacs.so
+
+src/android-emacs: src/Makefile src/config.h $(PRE_BUILD_DEPS)
+ $(MAKE) -C src android-emacs
lib-src/Makefile: $(top_builddir)/lib-src/Makefile.android
$(AM_V_GEN) mkdir -p src lib-src
diff --git a/java/Makefile.in b/java/Makefile.in
index 91feb53e96b..52e0a7a75f1 100644
--- a/java/Makefile.in
+++ b/java/Makefile.in
@@ -149,10 +149,11 @@ $(libsrc)/asset-directory-tool:
# install_tmp is a directory used to generate emacs.apk-in.
# That is then packaged into $(APK_NAME).
+# There is no need to depend on NDK_BUILD_SHARED as libemacs.so
+# does already.
.PHONY: install_temp install_temp/assets/directory-tree
-install_temp: $(CROSS_BINS) $(CROSS_LIBS) $(NDK_BUILD_SHARED) \
- $(RESOURCE_FILES)
+install_temp: $(CROSS_BINS) $(CROSS_LIBS) $(RESOURCE_FILES)
$(AM_V_GEN)
# Make the working directory for this stuff
$(AM_V_SILENT) rm -rf install_temp
diff --git a/src/Makefile.in b/src/Makefile.in
index d5d979a9bd3..da348812eb7 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -770,12 +770,13 @@ libemacs.so: $(ALLOBJS) $(LIBEGNU_ARCHIVE) $(EMACSRES) \
$(AM_V_at)$(MAKE_PDUMPER_FINGERPRINT) $@
# There is also a binary named `android-emacs' which simply calls
-# emacs.so.
+# emacs.so. It need not link against libemacs because app_process
+# will do that instead.
-android-emacs: libemacs.so android-emacs.c
+android-emacs: android-emacs.c
$(AM_V_CCLD)$(CC) $(lastword $^) -o $@ \
- $(ALL_CFLAGS) $(LDFLAGS) \
- $(LIBEGNU_ARCHIVE) -L. "-l:libemacs.so"
+ $(ALL_CFLAGS) $(LDFLAGS) \
+ $(LIBEGNU_ARCHIVE)
endif
## The following oldxmenu-related rules are only (possibly) used if
- feature/android updated (c8f49c9276d -> 05791d09f65), Po Lu, 2023/02/19
- feature/android 0aa19e993b1 2/9: Fix gamegrid.el with high resolution displays, Po Lu, 2023/02/19
- feature/android c09dca3fb03 5/9: Fix sfntfont.c build without mmap, Po Lu, 2023/02/19
- feature/android 47dbdb06dc4 4/9: Improve Android documentation, Po Lu, 2023/02/19
- feature/android 0998ab3ade7 3/9: Report both sides of the region to the input method upon setup, Po Lu, 2023/02/19
- feature/android f3196052070 7/9: More parallel build fixes,
Po Lu <=
- feature/android 05791d09f65 9/9: * cross/Makefile.in (src/libemacs.so): Depend on libgnu.a., Po Lu, 2023/02/19
- feature/android 585ee91b21f 8/9: More fixes to parallel Make, Po Lu, 2023/02/19
- feature/android efc46330aa1 1/9: Allow opening more files in emacsclient on Android, Po Lu, 2023/02/19
- feature/android 18f723faa85 6/9: Fix parallel compilation of Android port, Po Lu, 2023/02/19