diff options
| author | Nick Wellnhofer <wellnhofer@aevum.de> | 2019-01-30 15:22:02 +0100 |
|---|---|---|
| committer | Nick Wellnhofer <wellnhofer@aevum.de> | 2019-02-12 12:31:20 +0100 |
| commit | e176258ef677808066fdc2390ea820020329e58a (patch) | |
| tree | a14c80f54be3f6b5463bfc1784b80ab3afa04eb0 | |
| parent | d5d511f0b7190229b4f3ddea9ef64c9210a99681 (diff) | |
| download | libxslt-e176258ef677808066fdc2390ea820020329e58a.tar.gz | |
Remove WIN32_EXTRA_* variables
Simply use LDFLAGS and LIBS instead.
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | libexslt/Makefile.am | 2 | ||||
| -rw-r--r-- | libxslt/Makefile.am | 1 | ||||
| -rw-r--r-- | python/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/plugins/Makefile.am | 2 | ||||
| -rw-r--r-- | xsltproc/Makefile.am | 2 |
6 files changed, 5 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac index 74fb5e6e..ae643387 100644 --- a/configure.ac +++ b/configure.ac @@ -579,15 +579,11 @@ expanded_libdir=$( LIBXSLT_DEFAULT_PLUGINS_PATH="$expanded_libdir/libxslt-plugins" AC_SUBST(LIBXSLT_DEFAULT_PLUGINS_PATH) -WIN32_EXTRA_LIBADD= -WIN32_EXTRA_LDFLAGS= case "$host" in *-*-cygwin*|*-*-mingw*) - WIN32_EXTRA_LDFLAGS="-no-undefined" + LDFLAGS="$LDFLAGS -no-undefined" ;; esac -AC_SUBST(WIN32_EXTRA_LIBADD) -AC_SUBST(WIN32_EXTRA_LDFLAGS) AC_SUBST(XSLTPROCDV) diff --git a/libexslt/Makefile.am b/libexslt/Makefile.am index 54495243..de1104c2 100644 --- a/libexslt/Makefile.am +++ b/libexslt/Makefile.am @@ -28,7 +28,7 @@ libexslt_la_SOURCES = \ dynamic.c libexslt_la_LIBADD = $(top_builddir)/libxslt/libxslt.la $(EXTRA_LIBS) $(LIBGCRYPT_LIBS) $(M_LIBS) -libexslt_la_LDFLAGS = $(WIN32_EXTRA_LDFLAGS) -version-info $(LIBEXSLT_VERSION_INFO) +libexslt_la_LDFLAGS = -version-info $(LIBEXSLT_VERSION_INFO) man_MANS = libexslt.3 diff --git a/libxslt/Makefile.am b/libxslt/Makefile.am index ef2de24e..22dbdefa 100644 --- a/libxslt/Makefile.am +++ b/libxslt/Makefile.am @@ -64,7 +64,6 @@ endif libxslt_la_LIBADD = $(LIBXML_LIBS) $(EXTRA_LIBS) $(M_LIBS) libxslt_la_LDFLAGS = \ - $(WIN32_EXTRA_LDFLAGS) \ $(LIBXSLT_VERSION_SCRIPT) \ -version-info $(LIBXSLT_VERSION_INFO) diff --git a/python/Makefile.am b/python/Makefile.am index fa58b78f..f6b38791 100644 --- a/python/Makefile.am +++ b/python/Makefile.am @@ -19,7 +19,7 @@ EXTRA_DIST = \ libxslt-python-api.xml \ $(DOCS) -libxsltmod_la_LDFLAGS = $(WIN32_EXTRA_LDFLAGS) -module -avoid-version +libxsltmod_la_LDFLAGS = -module -avoid-version if WITH_PYTHON mylibs = \ diff --git a/tests/plugins/Makefile.am b/tests/plugins/Makefile.am index 0f8c3780..e0736ab9 100644 --- a/tests/plugins/Makefile.am +++ b/tests/plugins/Makefile.am @@ -21,7 +21,7 @@ plugindir = $(abs_builddir)/.libs xmlsoft_org_xslt_testplugin_la_CFLAGS = -DMODULE_COMPILE $(LIBXML_CFLAGS) $(LIBXSLT_CFLAGS) xmlsoft_org_xslt_testplugin_la_SOURCES = testplugin.c xmlsoft_org_xslt_testplugin_la_LIBADD = $(top_builddir)/libxslt/libxslt.la $(EXTRA_LIBS) -xmlsoft_org_xslt_testplugin_la_LDFLAGS = $(WIN32_EXTRA_LDFLAGS) -module -avoid-version -rpath $(plugindir) +xmlsoft_org_xslt_testplugin_la_LDFLAGS = -module -avoid-version -rpath $(plugindir) test-logall: @echo '## Running plugin tests' diff --git a/xsltproc/Makefile.am b/xsltproc/Makefile.am index 1a8804fc..cce3b81c 100644 --- a/xsltproc/Makefile.am +++ b/xsltproc/Makefile.am @@ -23,7 +23,7 @@ DEPS = $(top_builddir)/libxslt/libxslt.la \ LDADDS = $(top_builddir)/libxslt/libxslt.la \ $(top_builddir)/libexslt/libexslt.la \ - $(LIBXML_LIBS) $(EXTRA_LIBS) $(M_LIBS) $(WIN32_EXTRA_LIBADD) + $(LIBXML_LIBS) $(EXTRA_LIBS) $(M_LIBS) xsltproc_LDADD = $(LIBGCRYPT_LIBS) $(LDADDS) |