X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.am;h=fff7f22f77342cf37cca62a5291541011c422eaf;hb=bbb25382d9057fc86b1270d061126ce6f697d0d6;hp=7b04962761284cc37a46618a065b105fe22fa1a5;hpb=ecebe41fa1d54a8937a8440b72f76dcf607621e1;p=vlc

diff --git a/Makefile.am b/Makefile.am
index 7b04962761..fff7f22f77 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -357,9 +357,9 @@ vlc-bundle: vlc
 	    cp "$$i$(LIBEXT)" $(top_builddir)/vlc-bundle/plugins/ ; \
 	  fi ; \
 	done
-	if test -d $(top_builddir)/extras/contrib/vlc-lib ; then \
+	if test -d $(CONTRIB_DIR)/vlc-lib ; then \
 	  mkdir -p $(top_builddir)/vlc-bundle/lib ; \
-	  for i in $(top_builddir)/extras/contrib/vlc-lib/*.so ; do \
+	  for i in $(CONTRIB_DIR)/vlc-lib/*.so ; do \
 	    cp $$i $(top_builddir)/vlc-bundle/lib/ ; \
 	  done ; \
 	fi
@@ -410,7 +410,7 @@ vlc$(EXEEXT):
 	ln -sf bin/vlc-static$(EXEEXT) vlc$(EXEEXT)
 
 if HAVE_DARWIN
-if BUILD_VLC
+if BUILD_MACOSX_VLC_APP
 # Create the MacOS X app
 noinst_DATA = VLC.app
 endif
@@ -440,7 +440,7 @@ VLC-release.app: vlc
 	  cp "$(srcdir)/$$i" $(top_builddir)/tmp; \
 	done
 	mkdir -p $(top_builddir)/tmp/extras/contrib/Sparkle
-	cp -R $(top_srcdir)/extras/contrib/Sparkle/Sparkle.framework $(top_builddir)/tmp/extras/contrib/Sparkle
+	cp -R $(CONTRIB_DIR)/Sparkle/Sparkle.framework $(top_builddir)/tmp/extras/contrib/Sparkle
 	mkdir -p $(top_builddir)/tmp/modules/audio_output
 	mkdir -p $(top_builddir)/tmp/modules/gui/macosx
 	for i in \
@@ -492,9 +492,9 @@ VLC-release.app: vlc
              $(top_builddir)/tmp/modules/gui/macosx; \
 	done
 	$(AM_V_GEN)cd $(top_builddir)/tmp/extras/package/macosx && \
-        xcodebuild -target vlc $(silentstd) && \
+        xcodebuild -target vlc SYMROOT=../../../build $(silentstd) && \
 	cd ../../../../ && \
-	cp -R $(top_builddir)/tmp/extras/package/macosx/build/Default/VLC.bundle $(top_builddir)/VLC-release.app; \
+	cp -R $(top_builddir)/tmp/build/Default/VLC.bundle $(top_builddir)/VLC-release.app; \
 	rm -Rf $(top_builddir)/tmp
 	$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS
 	PRODUCT="VLC-release.app" ACTION="release-makefile" src_dir=$(srcdir) build_dir=$(top_builddir) sh $(srcdir)/projects/macosx/framework/Pre-Compile.sh
@@ -593,7 +593,7 @@ VLC.app: vlc $(top_builddir)/src/.libs/libvlccore.dylib $(top_builddir)/src/.lib
 	  cp "$(srcdir)/$$i" $(top_builddir)/tmp; \
 	done
 	mkdir -p $(top_builddir)/tmp/extras/contrib/Sparkle
-	cp -R $(top_srcdir)/extras/contrib/Sparkle/Sparkle.framework $(top_builddir)/tmp/extras/contrib/Sparkle
+	cp -R $(CONTRIB_DIR)/Sparkle/Sparkle.framework $(top_builddir)/tmp/extras/contrib/Sparkle
 	mkdir -p $(top_builddir)/tmp/modules/audio_output
 	mkdir -p $(top_builddir)/tmp/modules/gui/macosx
 	for i in \
@@ -645,9 +645,9 @@ 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 $(silentstd) && \
+	xcodebuild -target vlc SYMROOT=../../../build $(silentstd) && \
 	cd ../../../../ && \
-	cp -R $(top_builddir)/tmp/extras/package/macosx/build/Default/VLC.bundle $(top_builddir)/VLC.app
+	cp -R $(top_builddir)/tmp/build/Default/VLC.bundle $(top_builddir)/VLC.app
 	$(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS
 	touch $(top_builddir)/VLC.app/Contents/MacOS/VLC
 	chmod +x $(top_builddir)/VLC.app/Contents/MacOS/VLC
@@ -765,7 +765,7 @@ package-win32-base-debug: package-win-common
 	  fi ; done
 
 # Contrib *.dll's
-	cp $(srcdir)/extras/contrib/lib/*.dll "vlc-$(VERSION)/" || true
+#	cp $(CONTRIB_DIR)/lib/*.dll "vlc-$(VERSION)/" || true
 
 #Enable DEP and ASLR for all the binaries
 if USE_PEFLAGS
@@ -788,6 +788,8 @@ if BUILD_LUA
 	unix2dos $(win32_lua_destdir)/http/*.css
 	cp $(srcdir)/share/lua/http/js/*.js $(win32_lua_destdir)/http/js/
 	unix2dos $(win32_lua_destdir)/http/js/*.js
+	cp $(srcdir)/share/lua/http/*.lua $(win32_lua_destdir)/http/
+	unix2dos $(win32_lua_destdir)/http/*.lua
 	cp $(srcdir)/share/lua/http/dialogs/* $(win32_lua_destdir)/http/dialogs/
 	unix2dos $(win32_lua_destdir)/http/dialogs/*
 	cp $(srcdir)/share/lua/http/dialogs/.hosts $(win32_lua_destdir)/http/dialogs/
@@ -810,9 +812,13 @@ if BUILD_LUA
 	for i in $(srcdir)/share/lua/playlist/*.* ; do \
 	  $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/playlist/`basename $${i}` ; \
 	done
-	$(INSTALL) -d $(win32_lua_destdir)/meta
-	for i in $(srcdir)/share/lua/meta/*.* ; do \
-	  $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/meta/`basename $${i}` ; \
+	$(INSTALL) -d $(win32_lua_destdir)/meta/art
+	for i in $(srcdir)/share/lua/meta/art/*.lua ; do \
+	  $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/meta/art/`basename $${i}` ; \
+	done
+	$(INSTALL) -d $(win32_lua_destdir)/meta/reader
+	for i in $(srcdir)/share/lua/meta/reader/*.lua ; do \
+	  $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/meta/reader/`basename $${i}` ; \
 	done
 	$(INSTALL) -d $(win32_lua_destdir)/intf
 	for i in $(srcdir)/share/lua/intf/*.* ; do \
@@ -901,6 +907,9 @@ package-win-common-strip: package-win32-base-debug
 	  echo "OK."; mkdir -p "$(win32_debugdir)"; \
 	fi
 	for i in "" $(win32_destdir)/*$(LIBEXT) \
+	            $(win32_destdir)/*$(EXEEXT) \
+	            $(win32_destdir)/activex/*$(LIBEXT) \
+	            $(win32_destdir)/mozilla/*$(LIBEXT) \
 	            $(win32_destdir)/plugins/*$(LIBEXT) \
 	; do \
 	  if test -n "$$i" ; then \
@@ -927,7 +936,7 @@ package-win32-base-exe: package-win32-base
 	else \
 	    echo 'Error: cannot locate makensis tool'; exit 1; \
 	fi; \
-	eval "$$MAKENSIS $(win32_destdir)/spad.nsi"
+	eval "$$MAKENSIS $(win32_destdir)/spad.nsi"; \
 	eval "$$MAKENSIS $(win32_destdir)/vlc.win32.nsi"
 
 package-win32-base-zip: package-win32-base