Fix compiler warning

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index eff37f2629ce5c85c58f649b9e2e38e7bb3c3bde..38fd1faf533abe93ae53ebf89870b68d7296a2d8 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,7 +11,8 @@ NULL =
 #  - modules should come before . because vlc needs the builtins
 #  - . should come before mozilla because the plugin needs libvlc_pic.a
 #  - po should come before . because VLC.app needs the pofiles
-SUBDIRS = intl modules po . mozilla activex share m4 doc
+#  - loader should come before modules because some plugins need it
+SUBDIRS = intl loader modules po . mozilla activex share m4 doc
 DIST_SUBDIRS = $(SUBDIRS) src debian ipkg lib
 
 EXTRA_DIST = \
@@ -487,6 +488,20 @@ endif
 
 # the opposite of install-{data,exec}-local
 uninstall-local:
+       @for i in "" `$(VLC_CONFIG) --target plugin` ; do if test -n "$$i" ; then \
+         echo rm -f "$(DESTDIR)$(libdir)/vlc/`echo $$i | sed -e 's,.*modules/\([^/]*\).*,\1,'`/$$(basename $$i$(LIBEXT))" ; \
+         rm -f "$(DESTDIR)$(libdir)/vlc/`echo $$i | sed -e 's,.*modules/\([^/]*\).*,\1,'`/$$(basename $$i$(LIBEXT))" ; \
+       fi ; done
+       @for i in "" `$(VLC_CONFIG) --target builtin` ; do if test -n "$$i" ; then \
+         echo rm -f "$(DESTDIR)$(libdir)/vlc/$$(basename $$i)" ; \
+         rm -f "$(DESTDIR)$(libdir)/vlc/$$(basename $$i)" ; \
+       fi ; done
+if BUILD_MOZILLA
+       @for i in "" `$(VLC_CONFIG) --target builtin pic` ; do if test -n "$$i" ; then \
+         echo rm -f "$$i" "$(DESTDIR)$(libdir)/vlc/$$(basename $$i)" ; \
+         rm -f "$$i" "$(DESTDIR)$(libdir)/vlc/$$(basename $$i)" ; \
+       fi ; done
+endif
        for i in "" $(ALIASES) ; do if test -n "$$i" ; then \
          rm -f "$(DESTDIR)$(bindir)/$$i" ; \
        fi ; done
@@ -789,8 +804,8 @@ endif
 
        mkdir -p "$(top_builddir)/vlc-${VERSION}/activex"
 if BUILD_ACTIVEX
-       cp $(top_builddir)/activex/README.TXT  $(top_builddir)/vlc-${VERSION}/activex/ ;
-       cp $(top_builddir)/activex/test.html  $(top_builddir)/vlc-${VERSION}/activex/ ;
+       cp $(srcdir)/activex/README.TXT  $(top_builddir)/vlc-${VERSION}/activex/ ;
+       cp $(srcdir)/activex/test.html  $(top_builddir)/vlc-${VERSION}/activex/ ;
        unix2dos $(top_builddir)/vlc-${VERSION}/activex/* ;
 
        cp $(top_builddir)/activex/*$(LIBEXT) $(top_builddir)/vlc-${VERSION}/activex/ ;