root
/
xz
mirror of https://git.tukaani.org/xz.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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.
This commit is contained in:
Lasse Collin 2014-10-29 21:15:35 +02:00
parent 08c2aa16be
commit c923b140b2
6 changed files with 40 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
configure.ac
View File

@ -482,7 +482,12 @@ fi
echo echo
echo "Initializing Automake:" 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_LN_S
AC_PROG_CC_C99 AC_PROG_CC_C99

22
src/Makefile.am
View File

@ -19,4 +19,24 @@ if COND_SCRIPTS
SUBDIRS += scripts SUBDIRS += scripts
endif 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

4
src/liblzma/Makefile.am
View File

@ -32,10 +32,10 @@ liblzma_la_LDFLAGS += \
-Wl,--version-script=$(top_srcdir)/src/liblzma/liblzma.map -Wl,--version-script=$(top_srcdir)/src/liblzma/liblzma.map
endif endif
liblzma_la_SOURCES += $(top_srcdir)/src/common/tuklib_physmem.c liblzma_la_SOURCES += ../common/tuklib_physmem.c
if COND_THREADS if COND_THREADS
liblzma_la_SOURCES += $(top_srcdir)/src/common/tuklib_cpucores.c liblzma_la_SOURCES += ../common/tuklib_cpucores.c
endif endif
include $(srcdir)/common/Makefile.inc include $(srcdir)/common/Makefile.inc

4
src/lzmainfo/Makefile.am
View File

@ -9,8 +9,8 @@ bin_PROGRAMS = lzmainfo
lzmainfo_SOURCES = \ lzmainfo_SOURCES = \
lzmainfo.c \ lzmainfo.c \
$(top_srcdir)/src/common/tuklib_progname.c \ ../common/tuklib_progname.c \
$(top_srcdir)/src/common/tuklib_exit.c ../common/tuklib_exit.c
if COND_W32 if COND_W32
lzmainfo_SOURCES += lzmainfo_w32res.rc lzmainfo_SOURCES += lzmainfo_w32res.rc

10
src/xz/Makefile.am
View File

@ -33,11 +33,11 @@ xz_SOURCES = \
suffix.h \ suffix.h \
util.c \ util.c \
util.h \ util.h \
$(top_srcdir)/src/common/tuklib_open_stdxxx.c \ ../common/tuklib_open_stdxxx.c \
$(top_srcdir)/src/common/tuklib_progname.c \ ../common/tuklib_progname.c \
$(top_srcdir)/src/common/tuklib_exit.c \ ../common/tuklib_exit.c \
$(top_srcdir)/src/common/tuklib_mbstr_width.c \ ../common/tuklib_mbstr_width.c \
$(top_srcdir)/src/common/tuklib_mbstr_fw.c ../common/tuklib_mbstr_fw.c
if COND_W32 if COND_W32
xz_SOURCES += xz_w32res.rc xz_SOURCES += xz_w32res.rc

8
src/xzdec/Makefile.am
View File

@ -14,8 +14,8 @@
xzdec_SOURCES = \ xzdec_SOURCES = \
xzdec.c \ xzdec.c \
$(top_srcdir)/src/common/tuklib_progname.c \ ../common/tuklib_progname.c \
$(top_srcdir)/src/common/tuklib_exit.c ../common/tuklib_exit.c
if COND_W32 if COND_W32
xzdec_SOURCES += xzdec_w32res.rc xzdec_SOURCES += xzdec_w32res.rc
@ -37,8 +37,8 @@ xzdec_LDADD += $(LTLIBINTL)
lzmadec_SOURCES = \ lzmadec_SOURCES = \
xzdec.c \ xzdec.c \
$(top_srcdir)/src/common/tuklib_progname.c \ ../common/tuklib_progname.c \
$(top_srcdir)/src/common/tuklib_exit.c ../common/tuklib_exit.c
if COND_W32 if COND_W32
lzmadec_SOURCES += lzmadec_w32res.rc lzmadec_SOURCES += lzmadec_w32res.rc