mirror of
https://git.tukaani.org/xz.git
synced 2024-04-04 12:36:23 +02:00
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:
parent
d45615c555
commit
1c9360b7d1
12 changed files with 59 additions and 55 deletions
|
@ -15,15 +15,15 @@ noinst_PROGRAMS = \
|
|||
hex2bin
|
||||
|
||||
AM_CPPFLAGS = \
|
||||
-I@top_srcdir@/src/common \
|
||||
-I@top_srcdir@/src/liblzma/api
|
||||
-I$(top_srcdir)/src/common \
|
||||
-I$(top_srcdir)/src/liblzma/api
|
||||
|
||||
AM_LDFLAGS = -static
|
||||
|
||||
LDADD = \
|
||||
@top_builddir@/src/liblzma/liblzma.la \
|
||||
@LTLIBINTL@
|
||||
LDADD = $(top_builddir)/src/liblzma/liblzma.la
|
||||
|
||||
if COND_GNULIB
|
||||
LDADD += @top_builddir@/lib/libgnu.a
|
||||
LDADD += $(top_builddir)/lib/libgnu.a
|
||||
endif
|
||||
|
||||
LDADD += $(LTLIBINTL)
|
||||
|
|
|
@ -13,8 +13,8 @@ libcheck_la_SOURCES = \
|
|||
check.h \
|
||||
crc_macros.h
|
||||
libcheck_la_CPPFLAGS = \
|
||||
-I@top_srcdir@/src/liblzma/api \
|
||||
-I@top_srcdir@/src/liblzma/common
|
||||
-I$(top_srcdir)/src/liblzma/api \
|
||||
-I$(top_srcdir)/src/liblzma/common
|
||||
|
||||
if COND_CHECK_CRC32
|
||||
if COND_SMALL
|
||||
|
|
|
@ -7,14 +7,14 @@
|
|||
|
||||
noinst_LTLIBRARIES = libcommon.la
|
||||
libcommon_la_CPPFLAGS = \
|
||||
-I@top_srcdir@/src/liblzma/api \
|
||||
-I@top_srcdir@/src/liblzma/check \
|
||||
-I@top_srcdir@/src/liblzma/rangecoder \
|
||||
-I@top_srcdir@/src/liblzma/lz \
|
||||
-I@top_srcdir@/src/liblzma/lzma \
|
||||
-I@top_srcdir@/src/liblzma/subblock \
|
||||
-I@top_srcdir@/src/liblzma/delta \
|
||||
-I@top_srcdir@/src/liblzma/simple
|
||||
-I$(top_srcdir)/src/liblzma/api \
|
||||
-I$(top_srcdir)/src/liblzma/check \
|
||||
-I$(top_srcdir)/src/liblzma/rangecoder \
|
||||
-I$(top_srcdir)/src/liblzma/lz \
|
||||
-I$(top_srcdir)/src/liblzma/lzma \
|
||||
-I$(top_srcdir)/src/liblzma/subblock \
|
||||
-I$(top_srcdir)/src/liblzma/delta \
|
||||
-I$(top_srcdir)/src/liblzma/simple
|
||||
|
||||
libcommon_la_SOURCES = \
|
||||
common.c \
|
||||
|
|
|
@ -7,8 +7,8 @@
|
|||
|
||||
noinst_LTLIBRARIES = libdelta.la
|
||||
libdelta_la_CPPFLAGS = \
|
||||
-I@top_srcdir@/src/liblzma/api \
|
||||
-I@top_srcdir@/src/liblzma/common
|
||||
-I$(top_srcdir)/src/liblzma/api \
|
||||
-I$(top_srcdir)/src/liblzma/common
|
||||
|
||||
libdelta_la_SOURCES = \
|
||||
delta_common.c \
|
||||
|
|
|
@ -7,9 +7,9 @@
|
|||
|
||||
noinst_LTLIBRARIES = liblz.la
|
||||
liblz_la_CPPFLAGS = \
|
||||
-I@top_srcdir@/src/liblzma/api \
|
||||
-I@top_srcdir@/src/liblzma/common \
|
||||
-I@top_srcdir@/src/liblzma/check
|
||||
-I$(top_srcdir)/src/liblzma/api \
|
||||
-I$(top_srcdir)/src/liblzma/common \
|
||||
-I$(top_srcdir)/src/liblzma/check
|
||||
liblz_la_SOURCES =
|
||||
|
||||
|
||||
|
|
|
@ -10,10 +10,10 @@ EXTRA_DIST = fastpos_tablegen.c
|
|||
## Using liblzma2 since liblzma is already used for the final library.
|
||||
noinst_LTLIBRARIES = liblzma2.la
|
||||
liblzma2_la_CPPFLAGS = \
|
||||
-I@top_srcdir@/src/liblzma/api \
|
||||
-I@top_srcdir@/src/liblzma/common \
|
||||
-I@top_srcdir@/src/liblzma/lz \
|
||||
-I@top_srcdir@/src/liblzma/rangecoder
|
||||
-I$(top_srcdir)/src/liblzma/api \
|
||||
-I$(top_srcdir)/src/liblzma/common \
|
||||
-I$(top_srcdir)/src/liblzma/lz \
|
||||
-I$(top_srcdir)/src/liblzma/rangecoder
|
||||
|
||||
liblzma2_la_SOURCES = lzma_common.h
|
||||
|
||||
|
|
|
@ -11,8 +11,8 @@ noinst_LTLIBRARIES = librangecoder.la
|
|||
|
||||
librangecoder_la_SOURCES = range_common.h
|
||||
librangecoder_la_CPPFLAGS = \
|
||||
-I@top_srcdir@/src/liblzma/api \
|
||||
-I@top_srcdir@/src/liblzma/common
|
||||
-I$(top_srcdir)/src/liblzma/api \
|
||||
-I$(top_srcdir)/src/liblzma/common
|
||||
|
||||
if COND_ENCODER_LZMA1
|
||||
librangecoder_la_SOURCES += \
|
||||
|
|
|
@ -7,8 +7,8 @@
|
|||
|
||||
noinst_LTLIBRARIES = libsimple.la
|
||||
libsimple_la_CPPFLAGS = \
|
||||
-I@top_srcdir@/src/liblzma/api \
|
||||
-I@top_srcdir@/src/liblzma/common
|
||||
-I$(top_srcdir)/src/liblzma/api \
|
||||
-I$(top_srcdir)/src/liblzma/common
|
||||
libsimple_la_SOURCES = \
|
||||
simple_coder.c \
|
||||
simple_coder.h \
|
||||
|
|
|
@ -8,8 +8,8 @@
|
|||
noinst_LTLIBRARIES = libsubblock.la
|
||||
libsubblock_la_SOURCES =
|
||||
libsubblock_la_CPPFLAGS = \
|
||||
-I@top_srcdir@/src/liblzma/api \
|
||||
-I@top_srcdir@/src/liblzma/common
|
||||
-I$(top_srcdir)/src/liblzma/api \
|
||||
-I$(top_srcdir)/src/liblzma/common
|
||||
|
||||
if COND_ENCODER_SUBBLOCK
|
||||
libsubblock_la_SOURCES += \
|
||||
|
|
|
@ -32,21 +32,22 @@ xz_SOURCES = \
|
|||
|
||||
xz_CPPFLAGS = \
|
||||
-DLOCALEDIR=\"$(localedir)\" \
|
||||
-I@top_srcdir@/src/common \
|
||||
-I@top_srcdir@/src/liblzma/api \
|
||||
-I@top_builddir@/lib \
|
||||
-I@top_srcdir@/lib \
|
||||
@STATIC_CPPFLAGS@
|
||||
-I$(top_srcdir)/src/common \
|
||||
-I$(top_srcdir)/src/liblzma/api \
|
||||
-I$(top_builddir)/lib \
|
||||
-I$(top_srcdir)/lib \
|
||||
$(STATIC_CPPFLAGS)
|
||||
|
||||
xz_LDFLAGS = @STATIC_LDFLAGS@
|
||||
xz_LDADD = \
|
||||
@top_builddir@/src/liblzma/liblzma.la \
|
||||
@LTLIBINTL@
|
||||
xz_LDFLAGS = $(STATIC_LDFLAGS)
|
||||
xz_LDADD = $(top_builddir)/src/liblzma/liblzma.la
|
||||
|
||||
if COND_GNULIB
|
||||
xz_LDADD += @top_builddir@/lib/libgnu.a
|
||||
xz_LDADD += $(top_builddir)/lib/libgnu.a
|
||||
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
|
||||
## for lzma, unlzma, and lzcat for compatibility with LZMA Utils 4.32.x.
|
||||
|
|
|
@ -9,19 +9,20 @@ bin_PROGRAMS = xzdec lzmadec
|
|||
|
||||
xzdec_SOURCES = xzdec.c
|
||||
xzdec_CPPFLAGS = \
|
||||
-I@top_srcdir@/src/common \
|
||||
-I@top_srcdir@/src/liblzma/api \
|
||||
-I@top_builddir@/lib \
|
||||
@STATIC_CPPFLAGS@
|
||||
xzdec_LDFLAGS = @STATIC_LDFLAGS@
|
||||
xzdec_LDADD = \
|
||||
@top_builddir@/src/liblzma/liblzma.la \
|
||||
@LTLIBINTL@
|
||||
-I$(top_srcdir)/src/common \
|
||||
-I$(top_srcdir)/src/liblzma/api \
|
||||
-I$(top_builddir)/lib \
|
||||
$(STATIC_CPPFLAGS)
|
||||
xzdec_LDFLAGS = $(STATIC_LDFLAGS)
|
||||
xzdec_LDADD = $(top_builddir)/src/liblzma/liblzma.la
|
||||
|
||||
if COND_GNULIB
|
||||
xzdec_LDADD += @top_builddir@/lib/libgnu.a
|
||||
xzdec_LDADD += $(top_builddir)/lib/libgnu.a
|
||||
endif
|
||||
|
||||
xzdec_LDADD += $(LTLIBINTL)
|
||||
|
||||
|
||||
lzmadec_SOURCES = $(xzdec_SOURCES)
|
||||
lzmadec_CPPFLAGS = $(xzdec_CPPFLAGS) -DLZMADEC
|
||||
lzmadec_LDFLAGS = $(xzdec_LDFLAGS)
|
||||
|
|
|
@ -15,16 +15,18 @@ EXTRA_DIST = \
|
|||
compress_prepared_bcj_x86
|
||||
|
||||
AM_CPPFLAGS = \
|
||||
-I@top_srcdir@/src/common \
|
||||
-I@top_srcdir@/src/liblzma/api \
|
||||
-I@top_builddir@/lib
|
||||
-I$(top_srcdir)/src/common \
|
||||
-I$(top_srcdir)/src/liblzma/api \
|
||||
-I$(top_builddir)/lib
|
||||
|
||||
LDADD = @top_builddir@/src/liblzma/liblzma.la
|
||||
LDADD = $(top_builddir)/src/liblzma/liblzma.la
|
||||
|
||||
if COND_GNULIB
|
||||
LDADD += @top_builddir@/lib/libgnu.a
|
||||
LDADD += $(top_builddir)/lib/libgnu.a
|
||||
endif
|
||||
|
||||
LDADD += $(LTLIBINTL)
|
||||
|
||||
check_PROGRAMS = \
|
||||
create_compress_files \
|
||||
test_check \
|
||||
|
|
Loading…
Reference in a new issue