From fcf53bf9f5894665af07499137d7e8ef888cdcdd Mon Sep 17 00:00:00 2001 From: Po Lu Date: Tue, 11 Jul 2023 16:47:13 +0800 Subject: Fix doc file generation on Android * .gitignore: Ignore cross/etc/DOC. * configure.ac: Make the directory `cross/etc'. * cross/Makefile.in (CLEAN_SUBDIRS): Clean files inside `etc' as well. * java/Makefile.in (install_temp): Copy cross/etc/DOC to the package if it is available. * src/Makefile.in (SOME_MACHINE_OBJECTS): Add androidselect.c, sfntfont-android.c and sfntfont.c. (libemacs.so): Depend on $(etc)/DOC. --- cross/Makefile.in | 2 +- cross/verbose.mk.android | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'cross') diff --git a/cross/Makefile.in b/cross/Makefile.in index 5976272b253..a7b5700440e 100644 --- a/cross/Makefile.in +++ b/cross/Makefile.in @@ -51,7 +51,7 @@ LIB_SRC_TOP_SRCDIR = $(realpath $(top_src)) LIBSRC_BINARIES = lib-src/etags lib-src/ctags lib-src/emacsclient \ lib-src/ebrowse lib-src/hexl lib-src/movemail -CLEAN_SUBDIRS=src lib-src lib +CLEAN_SUBDIRS = src lib-src lib etc .PHONY: all all: lib/libgnu.a src/libemacs.so src/android-emacs $(LIBSRC_BINARIES) diff --git a/cross/verbose.mk.android b/cross/verbose.mk.android index 998f9843c7d..d41d6b6aac0 100644 --- a/cross/verbose.mk.android +++ b/cross/verbose.mk.android @@ -45,7 +45,7 @@ have_working_info = $(filter notintermediate,$(value .FEATURES)) # since the bug is not annoying elsewhere. AM_V_AR = @$(info $ AR $@) -AM_V_at = @ +AM_V_at = @ AM_V_CC = @$(info $ CC $@) AM_V_CXX = @$(info $ CXX $@) AM_V_CCLD = @$(info $ CCLD $@) -- cgit v1.2.3