Support for tweaking package-part of install path

[vlc] / modules / common.am

diff --git a/modules/common.am b/modules/common.am
index 1036b8e448836b8191c0d8d2e808d75bc492fb31..413986296430d7b0a254f8521c42cf66cb4439c8 100644 (file)
--- a/modules/common.am
+++ b/modules/common.am
@@ -7,36 +7,41 @@
 
 NULL =
 SUFFIXES =
-libvlcdir = $(libdir)/vlc/$(basedir)
+libvlcdir = $(vlclibdir)/$(basedir)
 EXTRA_DIST = Modules.am
 BUILT_SOURCES =
 CLEANFILES = $(BUILT_SOURCES)
 
-include $(srcdir)/Modules.am
-
-if HAVE_PLUGINS
-LTLIBVLC = $(top_builddir)/src/libvlc.la
+LTLIBVLCCORE = $(top_builddir)/src/libvlccore.la
 
 AM_CFLAGS = `$(VLC_CONFIG) --cflags plugin $@`
 AM_CXXFLAGS = `$(VLC_CONFIG) --cxxflags plugin $@`
 AM_OBJCFLAGS = `$(VLC_CONFIG) --objcflags plugin $@`
 AM_LDFLAGS = -rpath '$(libvlcdir)' \
-       -avoid-version -module -no-undefined \
+       -avoid-version -module \
+       -export-symbol-regex ^vlc_entry \
        -shrext $(LIBEXT) \
         `$(VLC_CONFIG) --ldflags plugin $@`
-AM_LIBADD = `$(VLC_CONFIG) -libs plugin $@` $(LTLIBVLC)
-
-if HAVE_COMPILER_EXPORT
-AM_LDFLAGS += -export-dynamic
-else
-AM_LDFLAGS += -export-symbol-regex ^vlc_entry
+AM_LIBADD = `$(VLC_CONFIG) -libs plugin $@`
+if HAVE_WIN32
+# Windows does not support undefined symbols
+AM_LDFLAGS += -no-undefined
+AM_LIBADD += $(LTLIBVLCCORE)
 endif
+if HAVE_WINCE
+# Same for Windows CE
+AM_LDFLAGS += -no-undefined
+AM_LIBADD += $(LTLIBVLCCORE)
 endif
 
-nice:
-       $(top_builddir)/compile
+include $(srcdir)/Modules.am
 
 if MAINTAINER_MODE
 $(srcdir)/Makefile.am: $(srcdir)/Modules.am $(top_srcdir)/modules/genmf
        cd \$(top_srcdir) && \$(SHELL) modules/genmf $(dir)
 endif
+
+nice:
+       $(top_builddir)/compile
+
+.PHONY: nice