diff options
Diffstat (limited to 'archivers/libarchive/files/Makefile.in')
| -rw-r--r-- | archivers/libarchive/files/Makefile.in | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/archivers/libarchive/files/Makefile.in b/archivers/libarchive/files/Makefile.in index fd98403d36c..0e39ba42441 100644 --- a/archivers/libarchive/files/Makefile.in +++ b/archivers/libarchive/files/Makefile.in @@ -34,7 +34,7 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -@BUILD_BSDTAR_TRUE@bin_PROGRAMS = bsdtar$(EXEEXT) +bin_PROGRAMS = $(am__EXEEXT_1) check_PROGRAMS = libarchive_test$(EXEEXT) TESTS = libarchive_test$(EXEEXT) subdir = . @@ -122,6 +122,7 @@ libarchive_la_OBJECTS = $(am_libarchive_la_OBJECTS) libarchive_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(libarchive_la_LDFLAGS) $(LDFLAGS) -o $@ +@BUILD_BSDTAR_TRUE@am__EXEEXT_1 = bsdtar$(EXEEXT) binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) PROGRAMS = $(bin_PROGRAMS) am_bsdtar_OBJECTS = tar/bsdtar-bsdtar.$(OBJEXT) \ @@ -396,6 +397,8 @@ EXTRA_DIST = version \ tar/getdate.c \ cpio + +# Always build libarchive, regardless lib_LTLIBRARIES = libarchive.la dist_man_MANS = $(libarchive_dist_man_MANS) $(bsdtar_dist_man_MANS) @@ -561,12 +564,15 @@ bsdtar_DEPENDENCIES = libarchive.la \ libarchive/archive_entry.h \ libarchive/archive.h +@STATIC_BSDTAR_FALSE@bsdtar_static = +@STATIC_BSDTAR_TRUE@bsdtar_static = -static bsdtar_LDADD = libarchive.la bsdtar_CPPFLAGS = -I$(top_builddir)/libarchive -# Link libarchive statically... -bsdtar_dist_man_MANS = tar/bsdtar.1 -@STATIC_BSDTAR_FALSE@bsdtar_LDFLAGS = -I$(destdir)/libarchive -@STATIC_BSDTAR_TRUE@bsdtar_LDFLAGS = -static -I$(destdir)/libarchive +bsdtar_LDFLAGS = $(bsdtar_static) -I$(destdir)/libarchive +@BUILD_BSDTAR_FALSE@bsdtar_dist_man_MANS = +@BUILD_BSDTAR_TRUE@bsdtar_dist_man_MANS = tar/bsdtar.1 +@BUILD_BSDTAR_FALSE@bsdtar_programs = +@BUILD_BSDTAR_TRUE@bsdtar_programs = bsdtar all: $(BUILT_SOURCES) config.h $(MAKE) $(AM_MAKEFLAGS) all-am |