X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcommon.am;h=7fbf430c520f08ebbbcec625ba6b83fdd85ca783;hb=b69b0bd6e6912b338bb991d97b92ea9acb29c656;hp=479b244d7fec199e6848e207f8b8335e6d0fa45a;hpb=32fcb07923a563d3edbdc72220dddebb6f565eaa;p=vlc

diff --git a/modules/common.am b/modules/common.am
index 479b244d7f..7fbf430c52 100644
--- a/modules/common.am
+++ b/modules/common.am
@@ -7,29 +7,24 @@
 
 NULL =
 SUFFIXES =
-libvlcdir = $(libdir)/vlc/$(basedir)
+libvlcdir = $(vlclibdir)/$(basedir)
 EXTRA_DIST = Modules.am
 BUILT_SOURCES =
 CLEANFILES = $(BUILT_SOURCES)
 
-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) \
+	-no-undefined \
 	 `$(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
-endif
-endif
+AM_LIBADD = `$(VLC_CONFIG) -libs plugin $@` \
+	$(LTLIBVLCCORE) $(top_builddir)/compat/libcompat.la
 
 include $(srcdir)/Modules.am