Index: src/xz/Makefile.am |
=================================================================== |
--- src/xz/Makefile.am (revision 50504) |
+++ src/xz/Makefile.am (working copy) |
@@ -34,7 +34,9 @@ |
$(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_cpucores.c |
+ $(top_srcdir)/src/common/tuklib_cpucores.c \ |
+ $(top_srcdir)/src/common/tuklib_mbstr_width.c \ |
+ $(top_srcdir)/src/common/tuklib_mbstr_fw.c |
if COND_W32 |
xz_SOURCES += xz_w32res.rc |
@@ -44,10 +46,8 @@ |
-DLOCALEDIR=\"$(localedir)\" \ |
-I$(top_srcdir)/src/common \ |
-I$(top_srcdir)/src/liblzma/api \ |
- -I$(top_builddir)/lib \ |
- $(STATIC_CPPFLAGS) |
+ -I$(top_builddir)/lib |
-xz_LDFLAGS = $(STATIC_LDFLAGS) |
xz_LDADD = $(top_builddir)/src/liblzma/liblzma.la |
if COND_GNULIB |
@@ -69,8 +69,12 @@ |
## Create symlinks for unxz and xzcat for convenience. Create symlinks also |
## for lzma, unlzma, and lzcat for compatibility with LZMA Utils 4.32.x. |
-xzlinks = unxz xzcat lzma unlzma lzcat |
+xzlinks = unxz xzcat |
+if COND_LZMALINKS |
+xzlinks += lzma unlzma lzcat |
+endif |
+ |
install-exec-hook: |
cd $(DESTDIR)$(bindir) && \ |
target=`echo xz | sed '$(transform)'`$(EXEEXT) && \ |