Add support for libproxy via pkg-config

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 6920a02a11d602a55367026d78ca86e56b3a0777..c00082a9a59b5bd43b0594cc82ebe43743a813a8 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -453,7 +453,6 @@ VLC-release.app: vlc
            simple_prefs.h \
            simple_prefs.m \
            vout.h \
-           voutqt.m \
            voutgl.m \
            wizard.h \
            wizard.m \
@@ -621,7 +620,6 @@ VLC.app: vlc $(top_builddir)/src/.libs/libvlccore.dylib $(top_builddir)/src/.lib
            simple_prefs.h \
            simple_prefs.m \
            vout.h \
-           voutqt.m \
            voutgl.m \
            wizard.h \
            wizard.m \
@@ -754,6 +752,9 @@ package-win32-base-debug: package-win-common
            $(INSTALL) "$$i" "vlc-$(VERSION)/plugins/" ; \
          fi ; done
 
+# Contrib *.dll's
+       cp $(srcdir)/extras/contrib/lib/*.dll "vlc-$(VERSION)/" || true
+
 # Copy the lua scripts (HTTP)
 if BUILD_LUA
        mkdir -p "$(win32_lua_destdir)/http/images"
@@ -885,9 +886,8 @@ endif
 
 #strip exe and main dll
 package-win-common-strip: package-win32-base-debug
-       $(STRIP) "vlc-$(VERSION)/vlc$(EXEEXT)"
-       $(STRIP) "vlc-$(VERSION)/libvlccore$(LIBEXT)"
-       $(STRIP) "vlc-$(VERSION)/libvlc$(LIBEXT)"
+       for i in "" vlc-$(VERSION)/*$(LIBEXT) ; \
+         do if test -n "$$i" ; then $(STRIP) "$$i" ; fi; done
 if BUILD_MOZILLA
        $(STRIP) "vlc-$(VERSION)/mozilla/npvlc$(LIBEXT)"
 endif