X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcommon.am;h=0c995a1d9626937d06a99e2321515cefc78936ff;hb=92c3f4a5c88652aa8cdcca9b4406b8a836342949;hp=413986296430d7b0a254f8521c42cf66cb4439c8;hpb=56988959488ac0a479e52d63c1ad155f69c59be1;p=vlc

diff --git a/modules/common.am b/modules/common.am
index 4139862964..0c995a1d96 100644
--- a/modules/common.am
+++ b/modules/common.am
@@ -7,7 +7,7 @@
 
 NULL =
 SUFFIXES =
-libvlcdir = $(vlclibdir)/$(basedir)
+libvlcdir = $(vlclibdir)/modules/$(basedir)
 EXTRA_DIST = Modules.am
 BUILT_SOURCES =
 CLEANFILES = $(BUILT_SOURCES)
@@ -21,27 +21,15 @@ AM_LDFLAGS = -rpath '$(libvlcdir)' \
 	-avoid-version -module \
 	-export-symbol-regex ^vlc_entry \
 	-shrext $(LIBEXT) \
+	-rpath "$(libvlcdir)" \
+	-no-undefined \
 	 `$(VLC_CONFIG) --ldflags plugin $@`
-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
+AM_LIBADD = `$(VLC_CONFIG) -libs plugin $@` \
+	$(LTLIBVLCCORE) $(top_builddir)/compat/libcompat.la
 
 include $(srcdir)/Modules.am
 
 if MAINTAINER_MODE
 $(srcdir)/Makefile.am: $(srcdir)/Modules.am $(top_srcdir)/modules/genmf
-	cd \$(top_srcdir) && \$(SHELL) modules/genmf $(dir)
+	$(AM_V_GEN)cd \$(top_srcdir) && \$(SHELL) modules/genmf $(dir)
 endif
-
-nice:
-	$(top_builddir)/compile
-
-.PHONY: nice