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

Fix @variables@ to $(variables) in Makefile.am files. 

Fix the ordering of libgnu.a and LTLIBINTL on the linker
command line and added missing LTLIBINTL to tests/Makefile.am.
This commit is contained in:
Lasse Collin 2009-06-26 14:47:31 +03:00
parent d45615c555
commit 1c9360b7d1
12 changed files with 59 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
debug/Makefile.am
View File

@ -15,15 +15,15 @@ noinst_PROGRAMS = \
hex2bin hex2bin
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I@top_srcdir@/src/common \ -I$(top_srcdir)/src/common \
-I@top_srcdir@/src/liblzma/api -I$(top_srcdir)/src/liblzma/api
AM_LDFLAGS = -static AM_LDFLAGS = -static
LDADD = \ LDADD = $(top_builddir)/src/liblzma/liblzma.la
@top_builddir@/src/liblzma/liblzma.la \
@LTLIBINTL@
if COND_GNULIB if COND_GNULIB
LDADD += @top_builddir@/lib/libgnu.a LDADD += $(top_builddir)/lib/libgnu.a
endif endif
LDADD += $(LTLIBINTL)

4
src/liblzma/check/Makefile.am
View File

@ -13,8 +13,8 @@ libcheck_la_SOURCES = \
check.h \ check.h \
crc_macros.h crc_macros.h
libcheck_la_CPPFLAGS = \ libcheck_la_CPPFLAGS = \
-I@top_srcdir@/src/liblzma/api \ -I$(top_srcdir)/src/liblzma/api \
-I@top_srcdir@/src/liblzma/common -I$(top_srcdir)/src/liblzma/common
if COND_CHECK_CRC32 if COND_CHECK_CRC32
if COND_SMALL if COND_SMALL

16
src/liblzma/common/Makefile.am
View File

@ -7,14 +7,14 @@
noinst_LTLIBRARIES = libcommon.la noinst_LTLIBRARIES = libcommon.la
libcommon_la_CPPFLAGS = \ libcommon_la_CPPFLAGS = \
-I@top_srcdir@/src/liblzma/api \ -I$(top_srcdir)/src/liblzma/api \
-I@top_srcdir@/src/liblzma/check \ -I$(top_srcdir)/src/liblzma/check \
-I@top_srcdir@/src/liblzma/rangecoder \ -I$(top_srcdir)/src/liblzma/rangecoder \
-I@top_srcdir@/src/liblzma/lz \ -I$(top_srcdir)/src/liblzma/lz \
-I@top_srcdir@/src/liblzma/lzma \ -I$(top_srcdir)/src/liblzma/lzma \
-I@top_srcdir@/src/liblzma/subblock \ -I$(top_srcdir)/src/liblzma/subblock \
-I@top_srcdir@/src/liblzma/delta \ -I$(top_srcdir)/src/liblzma/delta \
-I@top_srcdir@/src/liblzma/simple -I$(top_srcdir)/src/liblzma/simple
libcommon_la_SOURCES = \ libcommon_la_SOURCES = \
common.c \ common.c \

4
src/liblzma/delta/Makefile.am
View File

@ -7,8 +7,8 @@
noinst_LTLIBRARIES = libdelta.la noinst_LTLIBRARIES = libdelta.la
libdelta_la_CPPFLAGS = \ libdelta_la_CPPFLAGS = \
-I@top_srcdir@/src/liblzma/api \ -I$(top_srcdir)/src/liblzma/api \
-I@top_srcdir@/src/liblzma/common -I$(top_srcdir)/src/liblzma/common
libdelta_la_SOURCES = \ libdelta_la_SOURCES = \
delta_common.c \ delta_common.c \

6
src/liblzma/lz/Makefile.am
View File

@ -7,9 +7,9 @@
noinst_LTLIBRARIES = liblz.la noinst_LTLIBRARIES = liblz.la
liblz_la_CPPFLAGS = \ liblz_la_CPPFLAGS = \
-I@top_srcdir@/src/liblzma/api \ -I$(top_srcdir)/src/liblzma/api \
-I@top_srcdir@/src/liblzma/common \ -I$(top_srcdir)/src/liblzma/common \
-I@top_srcdir@/src/liblzma/check -I$(top_srcdir)/src/liblzma/check
liblz_la_SOURCES = liblz_la_SOURCES =

8
src/liblzma/lzma/Makefile.am
View File

@ -10,10 +10,10 @@ EXTRA_DIST = fastpos_tablegen.c
## Using liblzma2 since liblzma is already used for the final library. ## Using liblzma2 since liblzma is already used for the final library.
noinst_LTLIBRARIES = liblzma2.la noinst_LTLIBRARIES = liblzma2.la
liblzma2_la_CPPFLAGS = \ liblzma2_la_CPPFLAGS = \
-I@top_srcdir@/src/liblzma/api \ -I$(top_srcdir)/src/liblzma/api \
-I@top_srcdir@/src/liblzma/common \ -I$(top_srcdir)/src/liblzma/common \
-I@top_srcdir@/src/liblzma/lz \ -I$(top_srcdir)/src/liblzma/lz \
-I@top_srcdir@/src/liblzma/rangecoder -I$(top_srcdir)/src/liblzma/rangecoder
liblzma2_la_SOURCES = lzma_common.h liblzma2_la_SOURCES = lzma_common.h

4
src/liblzma/rangecoder/Makefile.am
View File

@ -11,8 +11,8 @@ noinst_LTLIBRARIES = librangecoder.la
librangecoder_la_SOURCES = range_common.h librangecoder_la_SOURCES = range_common.h
librangecoder_la_CPPFLAGS = \ librangecoder_la_CPPFLAGS = \
-I@top_srcdir@/src/liblzma/api \ -I$(top_srcdir)/src/liblzma/api \
-I@top_srcdir@/src/liblzma/common -I$(top_srcdir)/src/liblzma/common
if COND_ENCODER_LZMA1 if COND_ENCODER_LZMA1
librangecoder_la_SOURCES += \ librangecoder_la_SOURCES += \

4
src/liblzma/simple/Makefile.am
View File

@ -7,8 +7,8 @@
noinst_LTLIBRARIES = libsimple.la noinst_LTLIBRARIES = libsimple.la
libsimple_la_CPPFLAGS = \ libsimple_la_CPPFLAGS = \
-I@top_srcdir@/src/liblzma/api \ -I$(top_srcdir)/src/liblzma/api \
-I@top_srcdir@/src/liblzma/common -I$(top_srcdir)/src/liblzma/common
libsimple_la_SOURCES = \ libsimple_la_SOURCES = \
simple_coder.c \ simple_coder.c \
simple_coder.h \ simple_coder.h \

4
src/liblzma/subblock/Makefile.am
View File

@ -8,8 +8,8 @@
noinst_LTLIBRARIES = libsubblock.la noinst_LTLIBRARIES = libsubblock.la
libsubblock_la_SOURCES = libsubblock_la_SOURCES =
libsubblock_la_CPPFLAGS = \ libsubblock_la_CPPFLAGS = \
-I@top_srcdir@/src/liblzma/api \ -I$(top_srcdir)/src/liblzma/api \
-I@top_srcdir@/src/liblzma/common -I$(top_srcdir)/src/liblzma/common
if COND_ENCODER_SUBBLOCK if COND_ENCODER_SUBBLOCK
libsubblock_la_SOURCES += \ libsubblock_la_SOURCES += \

21
src/xz/Makefile.am
View File

@ -32,21 +32,22 @@ xz_SOURCES = \
xz_CPPFLAGS = \ xz_CPPFLAGS = \
-DLOCALEDIR=\"$(localedir)\" \ -DLOCALEDIR=\"$(localedir)\" \
-I@top_srcdir@/src/common \ -I$(top_srcdir)/src/common \
-I@top_srcdir@/src/liblzma/api \ -I$(top_srcdir)/src/liblzma/api \
-I@top_builddir@/lib \ -I$(top_builddir)/lib \
-I@top_srcdir@/lib \ -I$(top_srcdir)/lib \
@STATIC_CPPFLAGS@ $(STATIC_CPPFLAGS)
xz_LDFLAGS = @STATIC_LDFLAGS@ xz_LDFLAGS = $(STATIC_LDFLAGS)
xz_LDADD = \ xz_LDADD = $(top_builddir)/src/liblzma/liblzma.la
@top_builddir@/src/liblzma/liblzma.la \
@LTLIBINTL@
if COND_GNULIB if COND_GNULIB
xz_LDADD += @top_builddir@/lib/libgnu.a xz_LDADD += $(top_builddir)/lib/libgnu.a
endif endif
# libgnu.a may need these libs, so this must be after libgnu.a.
xz_LDADD += $(LTLIBINTL)
## Create symlinks for unxz and xzcat for convenicen. Create symlinks also ## Create symlinks for unxz and xzcat for convenicen. Create symlinks also
## for lzma, unlzma, and lzcat for compatibility with LZMA Utils 4.32.x. ## for lzma, unlzma, and lzcat for compatibility with LZMA Utils 4.32.x.

19
src/xzdec/Makefile.am
View File

@ -9,19 +9,20 @@ bin_PROGRAMS = xzdec lzmadec
xzdec_SOURCES = xzdec.c xzdec_SOURCES = xzdec.c
xzdec_CPPFLAGS = \ xzdec_CPPFLAGS = \
-I@top_srcdir@/src/common \ -I$(top_srcdir)/src/common \
-I@top_srcdir@/src/liblzma/api \ -I$(top_srcdir)/src/liblzma/api \
-I@top_builddir@/lib \ -I$(top_builddir)/lib \
@STATIC_CPPFLAGS@ $(STATIC_CPPFLAGS)
xzdec_LDFLAGS = @STATIC_LDFLAGS@ xzdec_LDFLAGS = $(STATIC_LDFLAGS)
xzdec_LDADD = \ xzdec_LDADD = $(top_builddir)/src/liblzma/liblzma.la
@top_builddir@/src/liblzma/liblzma.la \
@LTLIBINTL@
if COND_GNULIB if COND_GNULIB
xzdec_LDADD += @top_builddir@/lib/libgnu.a xzdec_LDADD += $(top_builddir)/lib/libgnu.a
endif endif
xzdec_LDADD += $(LTLIBINTL)
lzmadec_SOURCES = $(xzdec_SOURCES) lzmadec_SOURCES = $(xzdec_SOURCES)
lzmadec_CPPFLAGS = $(xzdec_CPPFLAGS) -DLZMADEC lzmadec_CPPFLAGS = $(xzdec_CPPFLAGS) -DLZMADEC
lzmadec_LDFLAGS = $(xzdec_LDFLAGS) lzmadec_LDFLAGS = $(xzdec_LDFLAGS)

12
tests/Makefile.am
View File

@ -15,16 +15,18 @@ EXTRA_DIST = \
compress_prepared_bcj_x86 compress_prepared_bcj_x86
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I@top_srcdir@/src/common \ -I$(top_srcdir)/src/common \
-I@top_srcdir@/src/liblzma/api \ -I$(top_srcdir)/src/liblzma/api \
-I@top_builddir@/lib -I$(top_builddir)/lib
LDADD = @top_builddir@/src/liblzma/liblzma.la LDADD = $(top_builddir)/src/liblzma/liblzma.la
if COND_GNULIB if COND_GNULIB
LDADD += @top_builddir@/lib/libgnu.a LDADD += $(top_builddir)/lib/libgnu.a
endif endif
LDADD += $(LTLIBINTL)
check_PROGRAMS = \ check_PROGRAMS = \
create_compress_files \ create_compress_files \
test_check \ test_check \