diff options
| author | Jim Meyering <meyering@redhat.com> | 2012-09-09 08:21:16 +0200 |
|---|---|---|
| committer | Jim Meyering <meyering@redhat.com> | 2012-09-11 11:23:17 +0200 |
| commit | 8a0e1bce040f982b27cd715a253d6c83bf806dbe (patch) | |
| tree | df71e707f1accd01f745a89860276e0142b7af04 /src | |
| parent | ada994274cacac427e7a2004e7bd6c16e7f140a7 (diff) | |
| download | coreutils-8a0e1bce040f982b27cd715a253d6c83bf806dbe.tar.xz | |
build: build lib/ using non-recursive make
* bootstrap.conf (gnulib_modules): Use the new module.
(bootstrap_post_import_hook): Invoke prefix-gnulib-mk.
* configure.ac (AC_CONFIG_FILES): Remove lib/Makefile.
* lib/Makefile.am: Renamed...
* lib/local.mk: ...to this.
* src/local.mk (CLEANFILES): Append, don't set.
(noinst_LIBRARIES): Likewise.
(AM_CPPFLAGS): Don't set this here.
* Makefile.am (AM_CPPFLAGS): Define here instead.
(noinst_LIBRARIES, CLEANFILES, MOSTLYCLEANDIRS, MOSTLYCLEANFILES):
Initialize here, so we can append to them from each included local.mk
(SUBDIRS): Remove "lib".
Diffstat (limited to 'src')
| -rw-r--r-- | src/local.mk | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/local.mk b/src/local.mk index 78e7743fb..0f9e000a9 100644 --- a/src/local.mk +++ b/src/local.mk @@ -65,16 +65,14 @@ EXTRA_DIST += \ src/extract-magic \ src/c99-to-c89.diff -CLEANFILES = $(SCRIPTS) +CLEANFILES += $(SCRIPTS) # Also remove these sometimes-built programs. # For example, even when excluded, they're built via 'sc_check-AUTHORS' # or 'dist'. CLEANFILES += $(no_install__progs) -AM_CPPFLAGS = -I$(top_srcdir)/lib -Isrc - -noinst_LIBRARIES = src/libver.a +noinst_LIBRARIES += src/libver.a nodist_src_libver_a_SOURCES = src/version.c src/version.h # Tell the linker to omit references to unused shared libraries. |