Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1528)

Unified Diff: src/xzdec/Makefile.am

Issue 7109015: Update XZ Utils to 5.0.3 (in deps) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/xz/
Patch Set: Created 9 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/xz/xz.1 ('k') | src/xzdec/lzmadec_w32res.rc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/xzdec/Makefile.am
===================================================================
--- src/xzdec/Makefile.am (revision 50504)
+++ src/xzdec/Makefile.am (working copy)
@@ -12,8 +12,6 @@
$(xzdec_CPPFLAGS) $(CPPFLAGS) $(RCFLAGS) -i $< -o $@
-bin_PROGRAMS = xzdec lzmadec
-
xzdec_SOURCES = \
xzdec.c \
$(top_srcdir)/src/common/tuklib_progname.c \
@@ -27,9 +25,7 @@
-DTUKLIB_GETTEXT=0 \
-I$(top_srcdir)/src/common \
-I$(top_srcdir)/src/liblzma/api \
- -I$(top_builddir)/lib \
- $(STATIC_CPPFLAGS)
-xzdec_LDFLAGS = $(STATIC_LDFLAGS)
+ -I$(top_builddir)/lib
xzdec_LDADD = $(top_builddir)/src/liblzma/liblzma.la
if COND_GNULIB
@@ -53,8 +49,17 @@
lzmadec_LDADD = $(xzdec_LDADD)
+bin_PROGRAMS =
+
+if COND_XZDEC
+bin_PROGRAMS += xzdec
dist_man_MANS = xzdec.1
+endif
+if COND_LZMADEC
+bin_PROGRAMS += lzmadec
+
+# FIXME: If xzdec is disabled, this will create a dangling symlink.
install-data-hook:
cd $(DESTDIR)$(mandir)/man1 && \
target=`echo xzdec | sed '$(transform)'` && \
@@ -66,3 +71,4 @@
cd $(DESTDIR)$(mandir)/man1 && \
link=`echo lzmadec | sed '$(transform)'` && \
rm -f $$link.1
+endif
« no previous file with comments | « src/xz/xz.1 ('k') | src/xzdec/lzmadec_w32res.rc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698