diff options
| author | Lasse Collin <lasse.collin@tukaani.org> | 2010-10-05 14:13:16 +0300 |
|---|---|---|
| committer | Lasse Collin <lasse.collin@tukaani.org> | 2010-10-05 14:13:16 +0300 |
| commit | f9907503f882a745dce9d84c2968f6c175ba966a (patch) | |
| tree | a8a22c6a4da420044c972cc384d27ca0bf8133e2 /src | |
| parent | configure.ac: Silence a warning from Autoconf 2.68. (diff) | |
| download | xz-f9907503f882a745dce9d84c2968f6c175ba966a.tar.xz | |
Build: Remove the static/dynamic tricks.
Most distros want xz linked against shared liblzma, so
it doesn't help much to require --enable-dynamic for that.
Those who want to avoid PIC on x86-32 to get better
performance, can still do it e.g. by using --disable-shared
to compile xz and then another pass to compile shared liblzma.
Part of these static/dynamic tricks were needed for Windows
in the past. Nowadays we rely on GCC and binutils to do the
right thing with auto-import. If the Autotooled build system
needs to support some other toolchain on Windows in the future,
this may need some rethinking.
Diffstat (limited to 'src')
| -rw-r--r-- | src/lzmainfo/Makefile.am | 4 | ||||
| -rw-r--r-- | src/xz/Makefile.am | 4 | ||||
| -rw-r--r-- | src/xzdec/Makefile.am | 4 |
3 files changed, 3 insertions, 9 deletions
diff --git a/src/lzmainfo/Makefile.am b/src/lzmainfo/Makefile.am index cbc7e5c7..3e18c5fb 100644 --- a/src/lzmainfo/Makefile.am +++ b/src/lzmainfo/Makefile.am @@ -16,10 +16,8 @@ lzmainfo_CPPFLAGS = \ -DLOCALEDIR=\"$(localedir)\" \ -I$(top_srcdir)/src/common \ -I$(top_srcdir)/src/liblzma/api \ - -I$(top_builddir)/lib \ - $(DYNAMIC_CPPFLAGS) + -I$(top_builddir)/lib -lzmainfo_LDFLAGS = $(DYNAMIC_LDFLAGS) lzmainfo_LDADD = $(top_builddir)/src/liblzma/liblzma.la if COND_GNULIB diff --git a/src/xz/Makefile.am b/src/xz/Makefile.am index da716dca..e4ed59cf 100644 --- a/src/xz/Makefile.am +++ b/src/xz/Makefile.am @@ -46,10 +46,8 @@ xz_CPPFLAGS = \ -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 diff --git a/src/xzdec/Makefile.am b/src/xzdec/Makefile.am index ad487721..c31a30a7 100644 --- a/src/xzdec/Makefile.am +++ b/src/xzdec/Makefile.am @@ -27,9 +27,7 @@ xzdec_CPPFLAGS = \ -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 |