Build: Prepare to support Automake's subdir-objects.

Due to a bug in Automake, subdir-objects won't be enabled
for now.

http://debbugs.gnu.org/cgi/bugreport.cgi?bug=17354

Thanks to Daniel Richard G. for the original patches.

diff --git a/configure.ac b/configure.ac
index e41979bb361f3ee741f60318cdbf8a60ee8a86f0..12c0117a445782f43458238a58ec27285315167d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -482,7 +482,12 @@ fi
 echo
 echo "Initializing Automake:"
 
-AM_INIT_AUTOMAKE([1.12 foreign tar-v7 filename-length-max=99 serial-tests])
+# We don't use "subdir-objects" yet because it breaks "make distclean" when
+# dependencies are enabled (as of Automake 1.14.1) due to this bug:
+# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=17354
+# The -Wno-unsupported is used to silence warnings about missing
+# "subdir-objects".
+AM_INIT_AUTOMAKE([1.12 foreign tar-v7 filename-length-max=99 serial-tests -Wno-unsupported])
 AC_PROG_LN_S
 
 AC_PROG_CC_C99

diff --git a/src/Makefile.am b/src/Makefile.am
index 9fb4caad66947a53cf41fdbab375112aaadc5394..d199e858a8d498069a5dea92343221d049573a56 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -19,4 +19,24 @@ if COND_SCRIPTS
 SUBDIRS += scripts
 endif
 
-EXTRA_DIST = common
+EXTRA_DIST = \
+       common/common_w32res.rc \
+       common/mythread.h \
+       common/sysdefs.h \
+       common/tuklib_common.h \
+       common/tuklib_config.h \
+       common/tuklib_cpucores.c \
+       common/tuklib_cpucores.h \
+       common/tuklib_exit.c \
+       common/tuklib_exit.h \
+       common/tuklib_gettext.h \
+       common/tuklib_integer.h \
+       common/tuklib_mbstr_fw.c \
+       common/tuklib_mbstr.h \
+       common/tuklib_mbstr_width.c \
+       common/tuklib_open_stdxxx.c \
+       common/tuklib_open_stdxxx.h \
+       common/tuklib_physmem.c \
+       common/tuklib_physmem.h \
+       common/tuklib_progname.c \
+       common/tuklib_progname.h

diff --git a/src/liblzma/Makefile.am b/src/liblzma/Makefile.am
index 1b4091088329dca08cec49914a21d135fc3d1dba..3720532f24d0b346167be0c01e26117e985a4b34 100644 (file)
--- a/src/liblzma/Makefile.am
+++ b/src/liblzma/Makefile.am
@@ -32,10 +32,10 @@ liblzma_la_LDFLAGS += \
        -Wl,--version-script=$(top_srcdir)/src/liblzma/liblzma.map
 endif
 
-liblzma_la_SOURCES += $(top_srcdir)/src/common/tuklib_physmem.c
+liblzma_la_SOURCES += ../common/tuklib_physmem.c
 
 if COND_THREADS
-liblzma_la_SOURCES += $(top_srcdir)/src/common/tuklib_cpucores.c
+liblzma_la_SOURCES += ../common/tuklib_cpucores.c
 endif
 
 include $(srcdir)/common/Makefile.inc

diff --git a/src/lzmainfo/Makefile.am b/src/lzmainfo/Makefile.am
index b90b3b3d6426255be1a7c73619fda9038f106888..ff7172b50f380a32778fea8bf43c4dfa68f349d2 100644 (file)
--- a/src/lzmainfo/Makefile.am
+++ b/src/lzmainfo/Makefile.am
@@ -9,8 +9,8 @@ bin_PROGRAMS = lzmainfo
 
 lzmainfo_SOURCES = \
        lzmainfo.c \
-       $(top_srcdir)/src/common/tuklib_progname.c \
-       $(top_srcdir)/src/common/tuklib_exit.c
+       ../common/tuklib_progname.c \
+       ../common/tuklib_exit.c
 
 if COND_W32
 lzmainfo_SOURCES += lzmainfo_w32res.rc

diff --git a/src/xz/Makefile.am b/src/xz/Makefile.am
index 088319b326a90f3dccb826df61b6749841783450..1f4a2791fbae4a6311fcad08080be454a8f499c3 100644 (file)
--- a/src/xz/Makefile.am
+++ b/src/xz/Makefile.am
@@ -33,11 +33,11 @@ xz_SOURCES = \
        suffix.h \
        util.c \
        util.h \
-       $(top_srcdir)/src/common/tuklib_open_stdxxx.c \
-       $(top_srcdir)/src/common/tuklib_progname.c \
-       $(top_srcdir)/src/common/tuklib_exit.c \
-       $(top_srcdir)/src/common/tuklib_mbstr_width.c \
-       $(top_srcdir)/src/common/tuklib_mbstr_fw.c
+       ../common/tuklib_open_stdxxx.c \
+       ../common/tuklib_progname.c \
+       ../common/tuklib_exit.c \
+       ../common/tuklib_mbstr_width.c \
+       ../common/tuklib_mbstr_fw.c
 
 if COND_W32
 xz_SOURCES += xz_w32res.rc

diff --git a/src/xzdec/Makefile.am b/src/xzdec/Makefile.am
index 70746c0c34552bf27d193360ef7d0925a38ad6cf..5ff8e373e91d9f7c969f24c0f69a8ccf3dce7a81 100644 (file)
--- a/src/xzdec/Makefile.am
+++ b/src/xzdec/Makefile.am
@@ -14,8 +14,8 @@
 
 xzdec_SOURCES = \
        xzdec.c \
-       $(top_srcdir)/src/common/tuklib_progname.c \
-       $(top_srcdir)/src/common/tuklib_exit.c
+       ../common/tuklib_progname.c \
+       ../common/tuklib_exit.c
 
 if COND_W32
 xzdec_SOURCES += xzdec_w32res.rc
@@ -37,8 +37,8 @@ xzdec_LDADD += $(LTLIBINTL)
 
 lzmadec_SOURCES = \
        xzdec.c \
-       $(top_srcdir)/src/common/tuklib_progname.c \
-       $(top_srcdir)/src/common/tuklib_exit.c
+       ../common/tuklib_progname.c \
+       ../common/tuklib_exit.c
 
 if COND_W32
 lzmadec_SOURCES += lzmadec_w32res.rc