diff options
| author | Po Lu <luangruo@yahoo.com> | 2023-08-13 09:45:36 +0800 |
|---|---|---|
| committer | Po Lu <luangruo@yahoo.com> | 2023-08-13 09:45:36 +0800 |
| commit | b35431b218ada2d84eb251d18e5543388b598d80 (patch) | |
| tree | 5d6a87706325d5346648352e55265cd6c1cc4bac /cross | |
| parent | d21e84d1e72988bd55d43ea991dd365b7bd713cf (diff) | |
| download | emacs-b35431b218ada2d84eb251d18e5543388b598d80.tar.gz | |
Fix bootstrap-clean in the cross directory on USG
* cross/Makefile.in (FIND_DELETE): New variable.
(CLEAN_SUBDIRS): Avoid including src if not already present.
(clean, bootstrap-clean, etc): Use FIND_DELETE.
Diffstat (limited to 'cross')
| -rw-r--r-- | cross/Makefile.in | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/cross/Makefile.in b/cross/Makefile.in index a7b5700440e..b66025283aa 100644 --- a/cross/Makefile.in +++ b/cross/Makefile.in @@ -22,6 +22,8 @@ srcdir = @srcdir@ top_builddir = @top_builddir@ builddir = @builddir@ +FIND_DELETE = @FIND_DELETE@ + -include $(top_builddir)/src/verbose.mk # Cross-compiling Emacs for Android. @@ -51,7 +53,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 etc +CLEAN_SUBDIRS = $(wildcard src lib-src lib etc) .PHONY: all all: lib/libgnu.a src/libemacs.so src/android-emacs $(LIBSRC_BINARIES) @@ -174,17 +176,19 @@ $(LIBSRC_BINARIES) &: src/verbose.mk $(top_builddir)/$@ lib/libgnu.a \ .PHONY: clean maintainer-clean distclean clean: - for dir in $(CLEAN_SUBDIRS); do \ - find $$dir -type f -delete; \ + for dir in $(CLEAN_SUBDIRS); do \ + find $$dir -type f $(FIND_DELETE); \ done rm -rf lib/config.h lib-src/config.h # ndk-build won't have been generated in a non-Android build. - -make -C ndk-build clean + if test -f ndk-build/Makefile; then \ + $(MAKE) -C ndk-build clean; \ + fi maintainer-clean distclean bootstrap-clean: clean # Remove links created by configure. - for dir in $(CLEAN_SUBDIRS); do \ - find $$dir -type l -delete; \ + for dir in $(CLEAN_SUBDIRS); do \ + find $$dir -type l $(FIND_DELETE); \ done rm -rf lib/Makefile lib/gnulib.mk ndk-build/Makefile rm -rf ndk-build/ndk-build.mk Makefile |