diff options
| author | DongHun Kwak <dh0128.kwak@samsung.com> | 2018-01-05 10:19:05 +0900 |
|---|---|---|
| committer | DongHun Kwak <dh0128.kwak@samsung.com> | 2018-01-05 10:19:20 +0900 |
| commit | f4ef47c4cf343faf4464001aa73ba0fe4878000b (patch) | |
| tree | 0a6fecfbbfce53d96cb3e9ca33e12d17391e3050 /tests/plugins | |
| parent | 8737843a4d457b79d3c6abbc17fbf97b81a8861e (diff) | |
| parent | 28153c89adaff8d83720eb1c37d940cca6506c9c (diff) | |
| download | libxslt-f4ef47c4cf343faf4464001aa73ba0fe4878000b.tar.gz libxslt-f4ef47c4cf343faf4464001aa73ba0fe4878000b.tar.bz2 libxslt-f4ef47c4cf343faf4464001aa73ba0fe4878000b.zip | |
Merge branch 'tizen_base' into tizen
Change-Id: I8832282d1456721bfd7565a90f89065c90b24b6f
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>
Diffstat (limited to 'tests/plugins')
| -rw-r--r-- | tests/plugins/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/plugins/Makefile.in | 16 |
2 files changed, 8 insertions, 10 deletions
diff --git a/tests/plugins/Makefile.am b/tests/plugins/Makefile.am index e0736ab9..0f8c3780 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 = -module -avoid-version -rpath $(plugindir) +xmlsoft_org_xslt_testplugin_la_LDFLAGS = $(WIN32_EXTRA_LDFLAGS) -module -avoid-version -rpath $(plugindir) test-logall: @echo '## Running plugin tests' diff --git a/tests/plugins/Makefile.in b/tests/plugins/Makefile.in index c51070e2..fab25580 100644 --- a/tests/plugins/Makefile.in +++ b/tests/plugins/Makefile.in @@ -90,7 +90,7 @@ build_triplet = @build@ host_triplet = @host@ subdir = tests/plugins ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) @@ -251,7 +251,6 @@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ -MV = @MV@ M_LIBS = @M_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -268,6 +267,9 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PYTHON = @PYTHON@ PYTHONSODV = @PYTHONSODV@ PYTHON_INCLUDES = @PYTHON_INCLUDES@ @@ -277,12 +279,10 @@ PYTHON_SUBDIR = @PYTHON_SUBDIR@ PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ RELDATE = @RELDATE@ -RM = @RM@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -TAR = @TAR@ THREAD_LIBS = @THREAD_LIBS@ VERSION = @VERSION@ VERSION_SCRIPT_FLAGS = @VERSION_SCRIPT_FLAGS@ @@ -301,8 +301,6 @@ XSLTPROCDV = @XSLTPROCDV@ XSLT_INCLUDEDIR = @XSLT_INCLUDEDIR@ XSLT_LIBDIR = @XSLT_LIBDIR@ XSLT_LIBS = @XSLT_LIBS@ -XSLT_LOCALE_WINAPI = @XSLT_LOCALE_WINAPI@ -XSLT_LOCALE_XLOCALE = @XSLT_LOCALE_XLOCALE@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -367,7 +365,7 @@ CLEANFILES = *.res @WITH_MODULES_TRUE@xmlsoft_org_xslt_testplugin_la_CFLAGS = -DMODULE_COMPILE $(LIBXML_CFLAGS) $(LIBXSLT_CFLAGS) @WITH_MODULES_TRUE@xmlsoft_org_xslt_testplugin_la_SOURCES = testplugin.c @WITH_MODULES_TRUE@xmlsoft_org_xslt_testplugin_la_LIBADD = $(top_builddir)/libxslt/libxslt.la $(EXTRA_LIBS) -@WITH_MODULES_TRUE@xmlsoft_org_xslt_testplugin_la_LDFLAGS = -module -avoid-version -rpath $(plugindir) +@WITH_MODULES_TRUE@xmlsoft_org_xslt_testplugin_la_LDFLAGS = $(WIN32_EXTRA_LDFLAGS) -module -avoid-version -rpath $(plugindir) all: all-am .SUFFIXES: @@ -381,9 +379,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tests/plugins/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tests/plugins/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu tests/plugins/Makefile + $(AUTOMAKE) --foreign tests/plugins/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ |