aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPo Lu2023-02-19 21:25:37 +0800
committerPo Lu2023-02-19 21:25:37 +0800
commitf3196052070999ef9f9c822a676443b14df6a0e6 (patch)
treeecb0d5af0e45b8a02de9f8785dba6a78610b2b82 /src
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 'src')
-rw-r--r--src/Makefile.in9
1 files changed, 5 insertions, 4 deletions
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) \
770 $(AM_V_at)$(MAKE_PDUMPER_FINGERPRINT) $@ 770 $(AM_V_at)$(MAKE_PDUMPER_FINGERPRINT) $@
771 771
772# There is also a binary named `android-emacs' which simply calls 772# There is also a binary named `android-emacs' which simply calls
773# emacs.so. 773# emacs.so. It need not link against libemacs because app_process
774# will do that instead.
774 775
775android-emacs: libemacs.so android-emacs.c 776android-emacs: android-emacs.c
776 $(AM_V_CCLD)$(CC) $(lastword $^) -o $@ \ 777 $(AM_V_CCLD)$(CC) $(lastword $^) -o $@ \
777 $(ALL_CFLAGS) $(LDFLAGS) \ 778 $(ALL_CFLAGS) $(LDFLAGS) \
778 $(LIBEGNU_ARCHIVE) -L. "-l:libemacs.so" 779 $(LIBEGNU_ARCHIVE)
779endif 780endif
780 781
781## The following oldxmenu-related rules are only (possibly) used if 782## The following oldxmenu-related rules are only (possibly) used if