X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.am;h=6cb20d6645ae4abac12758c1532fd738c3c853cf;hb=5dc560308c06e1862a0250651e5595fc7b0c2a82;hp=caf3d71de604ac773d7167bb95c1d04e678e0f62;hpb=698853e41d9689751ae298f2a1bf16264ac94c40;p=vlc

diff --git a/Makefile.am b/Makefile.am
index caf3d71de6..6cb20d6645 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,8 +9,7 @@
 #  - libs/* are needed by modules
 BASE_SUBDIRS = po compat src bin modules share doc test
 EXTRA_SUBDIRS = m4 \
-	libs/loader libs/srtp libs/unzip \
-	projects/activex
+	libs/loader libs/srtp libs/unzip
 DIST_SUBDIRS = $(BASE_SUBDIRS) $(EXTRA_SUBDIRS)
 
 SUBDIRS = po compat src
@@ -29,9 +28,6 @@ if BUILD_VLC
 SUBDIRS += bin
 endif
 SUBDIRS += modules share doc test
-if BUILD_ACTIVEX
-SUBDIRS += projects/activex
-endif
 
 EXTRA_DIST = \
 	HACKING \
@@ -356,32 +352,6 @@ doc:
 
 .PHONY: libvlc core doc
 
-if HAVE_BEOS
-noinst_DATA = vlc-bundle
-vlc-bundle: vlc
-	rm -Rf $(top_builddir)/vlc-bundle ; mkdir -p $(top_builddir)/vlc-bundle
-	cp $(top_builddir)/vlc $(top_builddir)/vlc-bundle/
-	xres -o $(top_builddir)/vlc-bundle/vlc $(srcdir)/share/vlc_beos.rsrc
-	for i in "" `$(VLC_CONFIG) --target plugin` ; do \
-	  if test -n "$$i" ; then \
-	    mkdir -p $(top_builddir)/vlc-bundle/plugins ; \
-	    cp "$$i$(LIBEXT)" $(top_builddir)/vlc-bundle/plugins/ ; \
-	  fi ; \
-	done
-	if test -d $(CONTRIB_DIR)/vlc-lib ; then \
-	  mkdir -p $(top_builddir)/vlc-bundle/lib ; \
-	  for i in $(CONTRIB_DIR)/vlc-lib/*.so ; do \
-	    cp $$i $(top_builddir)/vlc-bundle/lib/ ; \
-	  done ; \
-	fi
-	cat $(top_srcdir)/po/LINGUAS | while read i; do \
-	  mkdir -p "$(top_builddir)/vlc-bundle/share/locale/$$i/LC_MESSAGES" ; \
-	  cp "$(top_builddir)/po/$$i.gmo" \
-	    "$(top_builddir)/vlc-bundle/share/locale/$$i/LC_MESSAGES/vlc.mo" || true ; \
-	done
-	find $(top_builddir)/vlc-bundle -type f -exec mimeset -f "{}" \;
-endif
-
 ###############################################################################
 # Building aliases
 ###############################################################################
@@ -501,7 +471,7 @@ VLC-release.app: vlc
              $(top_builddir)/tmp/modules/gui/macosx; \
 	done
 	$(AM_V_GEN)cd $(top_builddir)/tmp/extras/package/macosx && \
-        xcodebuild -target vlc SYMROOT=../../../build $(silentstd) && \
+	xcodebuild -target vlc SYMROOT=../../../build DSTROOT=../../../build $(silentstd) && \
 	cd ../../../../ && \
 	cp -R $(top_builddir)/tmp/build/Default/VLC.bundle $(top_builddir)/VLC-release.app; \
 	rm -Rf $(top_builddir)/tmp
@@ -654,7 +624,7 @@ VLC.app: vlc $(top_builddir)/src/.libs/libvlccore.dylib $(top_builddir)/src/.lib
              $(top_builddir)/tmp/modules/gui/macosx; \
 	done
 	$(AM_V_GEN)cd $(top_builddir)/tmp/extras/package/macosx && \
-	xcodebuild -target vlc SYMROOT=../../../build $(silentstd) && \
+	xcodebuild -target vlc SYMROOT=../../../build DSTROOT=../../../build $(silentstd) && \
 	cd ../../../../ && \
 	cp -R $(top_builddir)/tmp/build/Default/VLC.bundle $(top_builddir)/VLC.app
 	$(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS
@@ -692,15 +662,31 @@ VLC.app: vlc $(top_builddir)/src/.libs/libvlccore.dylib $(top_builddir)/src/.lib
 destdir=$(prefix)
 win32_destdir=$(top_builddir)/vlc-$(VERSION)
 win32_debugdir=$(top_builddir)/symbols-$(VERSION)
-win32_lua_destdir=$(win32_destdir)/lua
 win32_xpi_destdir=$(win32_destdir)/vlc-plugin
 
+if HAVE_WIN64
+build-npapi:
+	touch $@
+
+build-activex:
+	touch $@
+else
+if HAVE_WINCE
+build-npapi:
+	touch $@
+
+build-activex:
+	touch $@
+else
 if HAVE_WIN32
 include extras/package/npapi.am
+include extras/package/activex.am
+endif
+endif
 endif
 
 #Win-common is for win32 and wince
-package-win-common: install
+package-win-common: install build-npapi build-activex
 # Check that tmp isn't in the way
 	@if test -e "$(win32_destdir)"; then \
 	    echo "Error: please remove $(win32_destdir), it is in the way"; \
@@ -735,51 +721,9 @@ package-win-common: install
 	cp -r $(destdir)/lib/vlc/plugins $(win32_destdir)
 
 if BUILD_LUA
-# Copy the lua scripts (HTTP)
-	mkdir -p $(win32_lua_destdir)
-	cp -r $(destdir)/share/vlc/lua/http "$(win32_lua_destdir)/http"
-
-# Lua Scripts - cannot be simplified yet, because make install doesn't install READMEs
-	$(INSTALL) -d $(win32_lua_destdir)
-	for i in $(srcdir)/share/lua/*.* ; do \
-	  $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/`basename $${i}` ; \
-	done
-	$(INSTALL) -d $(win32_lua_destdir)/modules
-	for i in $(srcdir)/share/lua/modules/*.* ; do \
-	  $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/modules/`basename $${i}` ; \
-	done
-	$(INSTALL) -d $(win32_lua_destdir)/extensions
-	for i in $(srcdir)/share/lua/extensions/*.* ; do \
-	  $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/extensions/`basename $${i}` ; \
-	done
-	$(INSTALL) -d $(win32_lua_destdir)/intf
-	for i in $(srcdir)/share/lua/intf/*.* ; do \
-	  $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/intf/`basename $${i}` ; \
-	done
-	$(INSTALL) -d $(win32_lua_destdir)/intf/modules
-	for i in $(srcdir)/share/lua/intf/modules/*.* ; do \
-	  $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/intf/modules/`basename $${i}` ; \
-	done
-	$(INSTALL) -d $(win32_lua_destdir)/meta/art
-	for i in $(srcdir)/share/lua/meta/art/*.* ; do \
-	  $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/meta/art/`basename $${i}` ; \
-	done
-	$(INSTALL) -d $(win32_lua_destdir)/meta/fetcher
-	for i in $(srcdir)/share/lua/meta/fetcher/*.* ; do \
-	  $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/meta/fetcher/`basename $${i}` ; \
-	done
-	$(INSTALL) -d $(win32_lua_destdir)/meta/reader
-	for i in $(srcdir)/share/lua/meta/reader/*.* ; do \
-	  $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/meta/reader/`basename $${i}` ; \
-	done
-	$(INSTALL) -d $(win32_lua_destdir)/playlist
-	for i in $(srcdir)/share/lua/playlist/*.* ; do \
-	  $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/playlist/`basename $${i}` ; \
-	done
-	$(INSTALL) -d $(win32_lua_destdir)/sd
-	for i in $(srcdir)/share/lua/sd/*.* ; do \
-	  $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/sd/`basename $${i}` ; \
-	done
+	mkdir -p $(win32_destdir)/lua
+	cp -r $(destdir)/lib/vlc/lua/* $(win32_destdir)/lua
+	cp -r $(destdir)/share/vlc/lua/* $(win32_destdir)/lua
 endif
 
 if BUILD_HTTPD
@@ -796,8 +740,13 @@ if BUILD_OSDMENU
 		rm -f -- "$$file.tmp"; \
 	done
 endif
-if BUILD_ACTIVEX
-	cp $(top_srcdir)/projects/activex/axvlc.dll.manifest $(win32_destdir)
+if !HAVE_WIN64
+if !HAVE_WINCE
+	cp "$(top_builddir)/activex-vlc/src/axvlc.dll.manifest" "$(win32_destdir)/"
+	cp "$(top_builddir)/activex-vlc/installed/lib/axvlc.dll" "$(win32_destdir)/"
+	cp "$(top_builddir)/npapi-vlc/src/npvlc.dll.manifest" "$(win32_destdir)/"
+	cp "$(top_builddir)/npapi-vlc/installed/lib/npvlc.dll" "$(win32_destdir)/"
+endif
 endif
 
 # SDK
@@ -805,11 +754,13 @@ endif
 	cp -r $(destdir)/include "$(win32_destdir)/sdk"
 	cp -r $(destdir)/lib/pkgconfig "$(win32_destdir)/sdk/lib"
 	for file in libvlc.dll.a libvlc.la libvlccore.dll.a libvlccore.la; do \
-        cp -r $(destdir)/lib/$$file "$(win32_destdir)/sdk/lib"; done
-if BUILD_ACTIVEX
+        cp -rv $(destdir)/lib/$$file "$(win32_destdir)/sdk/lib"; done
+if !HAVE_WIN64
+if !HAVE_WINCE
 	mkdir -p "$(win32_destdir)/sdk/activex"
-	cp $(srcdir)/projects/activex/README.TXT $(win32_destdir)/sdk/activex/
-	cp $(srcdir)/projects/activex/test.html $(win32_destdir)/sdk/activex/
+	cp $(top_builddir)/activex-vlc/README $(win32_destdir)/sdk/activex/README.TXT
+	cp $(top_builddir)/activex-vlc/src/test.html $(win32_destdir)/sdk/activex/
+endif
 endif
 
 	find $(win32_destdir) -type f \( -name "*xml" -or -name "*html" -or -name '*js' -or -name '*css' -or -name '*hosts' -or -iname '*txt' -or -name '*.cfg' -or -name '*.lua' \) -exec $(U2D) {} \;
@@ -818,6 +769,7 @@ endif
 if USE_PEFLAGS
 	find $(win32_destdir) -type f \( -name '*$(LIBEXT)' -print -o -name '*$(EXEEXT)' -print \) -exec $(PEFLAGS) --dynamicbase=true --nxcompat=true {} \;
 endif
+	find $(win32_destdir)/plugins/ -type f \( -name '*.a' -or -name '*.la' \) -exec rm -rvf {} \;
 
 package-win-base: package-win-common
 	find $(win32_destdir) -type f \( -name '*$(LIBEXT)' -or -name '*$(EXEEXT)' \) | while read i; \
@@ -829,36 +781,32 @@ package-win-base: package-win-common
 	  fi ; \
 	done
 
-package-win32-webplugin-common: package-win-base build-npapi
+package-win32-webplugin-common: package-win-base
 	mkdir -p "$(win32_xpi_destdir)/plugins"
 	find $(destdir) -maxdepth 4 -name "*$(LIBEXT)" -exec cp {} "$(win32_xpi_destdir)/" \;
 if !HAVE_WIN64
-	cp $(top_srcdir)/npapi-vlc/src/npvlc.dll.manifest "$(win32_xpi_destdir)/plugins"
+	cp $(top_builddir)/npapi-vlc/src/npvlc.dll.manifest "$(win32_xpi_destdir)/plugins"
 endif
 	cp "$(top_srcdir)/extras/package/win32/libvlc.dll.manifest" "$(win32_xpi_destdir)/plugins"
 	cp -r $(win32_destdir)/plugins/ "$(win32_xpi_destdir)/plugins"
 	rm -rf "$(win32_xpi_destdir)/plugins/plugins/*qt*"
 	rm -rf "$(win32_xpi_destdir)/plugins/plugins/*skins*"
 
-package-win32-xpi: package-win32-webplugin-common build-npapi
+package-win32-xpi: package-win32-webplugin-common
 if !HAVE_WIN64
 	cp $(top_builddir)/npapi-vlc/src/install.rdf "$(win32_xpi_destdir)"
 	cd $(win32_xpi_destdir) && zip -r "../vlc-$(VERSION).xpi" install.rdf plugins
 endif
 
-package-win32-crx: package-win32-webplugin-common build-npapi
+package-win32-crx: package-win32-webplugin-common
 if !HAVE_WIN64
 	cp $(top_builddir)/npapi-vlc/src/manifest.json "$(win32_xpi_destdir)"
 	crxmake --pack-extension "$(win32_xpi_destdir)" \
 		--extension-output "$(win32_destdir)/vlc-$(VERSION).crx" --ignore-file install.rdf
 endif
 
-package-win32-base-exe: package-win-base build-npapi
+package-win32-base-exe: package-win-base
 # Script installer
-if !HAVE_WIN64
-	cp "$(top_builddir)/npapi-vlc/installed/lib/npvlc.dll" "$(win32_destdir)/"
-	cp "$(top_builddir)/npapi-vlc/src/npvlc.dll.manifest" "$(win32_destdir)/"
-endif
 	cp "$(top_builddir)/extras/package/win32/vlc.win32.nsi" "$(win32_destdir)/"
 	cp "$(top_builddir)/extras/package/win32/spad.nsi" "$(win32_destdir)/"
 	mkdir "$(win32_destdir)/languages"