diff options
author | Lasse Collin <lasse.collin@tukaani.org> | 2009-06-26 14:47:31 +0300 |
---|---|---|
committer | Lasse Collin <lasse.collin@tukaani.org> | 2009-06-26 14:47:31 +0300 |
commit | 1c9360b7d1197457aaad2f8888b99f1149861579 (patch) | |
tree | 9b5cec00c4dd3c08d2b9c12134d3c3293af4eb9b /src/xzdec/Makefile.am | |
parent | Allow to explicitly specify autotool versions in autogen.sh. (diff) | |
download | xz-1c9360b7d1197457aaad2f8888b99f1149861579.tar.xz |
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.
Diffstat (limited to '')
-rw-r--r-- | src/xzdec/Makefile.am | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/src/xzdec/Makefile.am b/src/xzdec/Makefile.am index dfc6f7ce..1f13cd67 100644 --- a/src/xzdec/Makefile.am +++ b/src/xzdec/Makefile.am @@ -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) |