diff options
| author | Po Lu <luangruo@yahoo.com> | 2023-03-05 10:18:28 +0800 |
|---|---|---|
| committer | Po Lu <luangruo@yahoo.com> | 2023-03-05 10:18:28 +0800 |
| commit | 3be448f429065cc9ed874e940ec4f40a0a1c7abf (patch) | |
| tree | 7c748bae1a3d41e1f14326e77b2a20a3cd7b2ff4 /cross | |
| parent | 1f4818d3e31f9870e1b0706fe22274d433ca32ea (diff) | |
| download | emacs-3be448f429065cc9ed874e940ec4f40a0a1c7abf.tar.gz | |
Remove redundant second copy of gnulib
* .gitignore: Simplify cross/lib rule.
* admin/merge-gnulib (avoided_flags): Stop copying to cross/lib.
* configure.ac: Link gnulib source and header files to
cross/lib.
* cross/Makefile.in (LIB_SRCDIR): Make relative to builddir.
(maintainer-clean): Merge with distclean. Remove links created
by configure.
Diffstat (limited to 'cross')
| -rw-r--r-- | cross/Makefile.in | 27 |
1 files changed, 10 insertions, 17 deletions
diff --git a/cross/Makefile.in b/cross/Makefile.in index b30aade759f..b8955a70ebd 100644 --- a/cross/Makefile.in +++ b/cross/Makefile.in @@ -33,9 +33,10 @@ top_builddir = @top_builddir@ # $(top_builddir)/lib-src/Makefile.android are copied to their usual # locations in this directory. -# This is possibly the ugliest Makefile ever written! +# N.B. that LIB_SRCDIR is actually relative to builddir, because that +# is where the gnulib files get linked. -LIB_SRCDIR = $(realpath $(srcdir)/lib) +LIB_SRCDIR = $(realpath $(builddir)/lib) LIB_TOP_SRCDIR = $(realpath $(top_srcdir)) SRC_SRCDIR = $(realpath $(top_srcdir)/src) @@ -49,7 +50,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 +CLEAN_SUBDIRS=src lib-src lib .PHONY: all all: lib/libgnu.a src/libemacs.so src/android-emacs $(LIBSRC_BINARIES) @@ -185,23 +186,15 @@ $(LIBSRC_BINARIES) &: src/verbose.mk $(top_builddir)/$@ lib/libgnu.a \ clean: for dir in $(CLEAN_SUBDIRS); do \ find $$dir -type f -delete; \ - done; \ - if [ -e lib/Makefile ]; then \ - make -C lib clean; \ - fi + 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 -distclean bootstrap-clean: clean - if [ -e lib/Makefile ]; then \ - make -C lib distclean; \ - fi -# Just in case. +maintainer-clean distclean bootstrap-clean: clean +# Remove links created by configure. + for dir in $(CLEAN_SUBDIRS); do \ + find $$dir -type l -delete; \ + done rm -rf lib/Makefile lib/gnulib.mk ndk-build/Makefile rm -rf ndk-build/ndk-build.mk Makefile - -maintainer-clean: distclean bootstrap-clean - if [ -e lib/Makefile ]; then \ - make -C lib maintainer-clean; \ - fi |