aboutsummaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorPo Lu2023-02-19 21:25:37 +0800
committerPo Lu2023-02-19 21:25:37 +0800
commitf3196052070999ef9f9c822a676443b14df6a0e6 (patch)
treeecb0d5af0e45b8a02de9f8785dba6a78610b2b82 /java
parent18f723faa85b78dff7c8f59257640feededc44d1 (diff)
downloademacs-f3196052070999ef9f9c822a676443b14df6a0e6.tar.gz
emacs-f3196052070999ef9f9c822a676443b14df6a0e6.zip
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.
Diffstat (limited to 'java')
-rw-r--r--java/Makefile.in5
1 files changed, 3 insertions, 2 deletions
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:
149 149
150# install_tmp is a directory used to generate emacs.apk-in. 150# install_tmp is a directory used to generate emacs.apk-in.
151# That is then packaged into $(APK_NAME). 151# That is then packaged into $(APK_NAME).
152# There is no need to depend on NDK_BUILD_SHARED as libemacs.so
153# does already.
152 154
153.PHONY: install_temp install_temp/assets/directory-tree 155.PHONY: install_temp install_temp/assets/directory-tree
154install_temp: $(CROSS_BINS) $(CROSS_LIBS) $(NDK_BUILD_SHARED) \ 156install_temp: $(CROSS_BINS) $(CROSS_LIBS) $(RESOURCE_FILES)
155 $(RESOURCE_FILES)
156 $(AM_V_GEN) 157 $(AM_V_GEN)
157# Make the working directory for this stuff 158# Make the working directory for this stuff
158 $(AM_V_SILENT) rm -rf install_temp 159 $(AM_V_SILENT) rm -rf install_temp