procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

More parallel build fixes

Browse source 
* 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.
This commit is contained in:
Po Lu 2023-02-19 21:25:37 +08:00
parent 18f723faa8
commit f319605207
3 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
cross/Makefile.in
View file

@ -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

5
java/Makefile.in
View file

@ -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

9
src/Makefile.in
View file

@ -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