Dead code

[vlc] / modules / common.am

diff --git a/modules/common.am b/modules/common.am
index 1e086960d895853c1b4a9280c8b1626cb161d7ec..64d9a22f454910fff9b673e5a119c35d08fb19bf 100644 (file)
--- a/modules/common.am
+++ b/modules/common.am
@@ -7,29 +7,25 @@
 
 NULL =
 SUFFIXES =
-libvlcdir = $(libdir)/vlc/$(basedir)
+libvlcdir = $(vlclibdir)/$(basedir)
 EXTRA_DIST = Modules.am
 BUILT_SOURCES =
 CLEANFILES = $(BUILT_SOURCES)
 
-if HAVE_PLUGINS
 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) \
+       -rpath "$(libvlcdir)" \
+       -no-undefined \
         `$(VLC_CONFIG) --ldflags plugin $@`
-AM_LIBADD = `$(VLC_CONFIG) -libs plugin $@` $(LTLIBVLCCORE)
-
-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