X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.am;h=44b4caee545b97a7c3dbe38f7603ac72c3a690ea;hb=52e494f47e019d73691bf999192ac918c93c21f6;hp=f4f8fe32f59e135556cdafbb00704aab0de1542c;hpb=b78f809be42adf566b68cae23301cf2166abe162;p=vlc

diff --git a/Makefile.am b/Makefile.am
index f4f8fe32f5..44b4caee54 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -314,7 +314,7 @@ DISTCLEANFILES = $(BUILT_SOURCES_distclean) vlc-config.in compile ChangeLog
 # Don't use it if you don't know what it is about.
 # Don't complain if it doesn't work. -- Courmisch
 libvlc:
-	cd src && $(MAKE) $(AM_MAKEFLAGS) libvlccore.la
+	cd src && $(MAKE) $(AM_MAKEFLAGS) libvlc.la
 
 core: libvlc
 	cd bin && $(MAKE) $(AM_MAKEFLAGS) vlc$(EXEEXT)
@@ -642,7 +642,7 @@ VLC.app: vlc $(top_builddir)/src/.libs/libvlccore.dylib $(top_builddir)/src/.lib
 	$(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
-	$(INSTALL) $(top_builddir)/src/.libs/vlc $(top_builddir)/VLC.app/Contents/MacOS/VLC
+	$(INSTALL) $(top_builddir)/bin/.libs/vlc $(top_builddir)/VLC.app/Contents/MacOS/VLC
 	ln -sf ../../../modules $(top_builddir)/VLC.app/Contents/MacOS/modules
 	install -d $(top_builddir)/VLC.app/Contents/MacOS/share
 	for i in `ls $(srcdir)/share`; do \
@@ -668,6 +668,9 @@ VLC.app: vlc $(top_builddir)/src/.libs/libvlccore.dylib $(top_builddir)/src/.lib
 # the same setup as the maintaner(s).
 #
 
+############################################################################
+## Win                                                                    ##
+############################################################################
 win32_destdir=$(top_builddir)/vlc-$(VERSION)
 win32_lua_destdir=$(win32_destdir)/lua
 win32_http_destdir=$(win32_destdir)/http
@@ -684,7 +687,7 @@ package-win-common:
 
 # Copy relevant files
 # Copy executables and libs
-	cp "$(top_builddir)/src/.libs/vlc$(EXEEXT)" "$(win32_destdir)/"
+	cp "$(top_builddir)/bin/.libs/vlc$(EXEEXT)" "$(win32_destdir)/"
 	cp "$(top_srcdir)/extras/package/win32/vlc.exe.manifest" "$(win32_destdir)/"
 	cp "$(top_builddir)/src/.libs/libvlccore$(LIBEXT)" "$(win32_destdir)/"
 	cp "$(top_builddir)/src/.libs/libvlc$(LIBEXT)" "$(win32_destdir)/"
@@ -908,10 +911,19 @@ package-win32-base-zip: package-win32-base
 	rm -f -- vlc-$(VERSION)-win32.zip
 	zip -r -9 vlc-$(VERSION)-win32.zip vlc-$(VERSION)
 
+package-win32-base-debug-zip: package-win32-base-debug
+# Create package
+	rm -f -- vlc-$(VERSION)-win32-debug.zip
+	zip -r -9 vlc-$(VERSION)-win32-debug.zip vlc-$(VERSION)
+
 package-win32-base-7zip: package-win32-base
 # Create package 
 	7z a -t7z -m0=lzma -mx=9 -mfb=64 -md=32m -ms=on vlc-$(VERSION)-win32.7z vlc-$(VERSION)
 
+package-win32-base-debug-7zip: package-win32-base-debug
+# Create package
+	7z a -t7z -m0=lzma -mx=9 -mfb=64 -md=32m -ms=on vlc-$(VERSION)-win32-debug.7z vlc-$(VERSION)
+
 package-win32-exe: package-win32-base package-win32-base-exe
 # Clean up
 	rm -Rf $(win32_destdir)
@@ -920,16 +932,28 @@ package-win32-zip: package-win32-base-zip
 # Clean up
 	rm -Rf $(win32_destdir)
 
+package-win32-debug-zip: package-win32-base-debug-zip
+# Clean up
+	rm -Rf $(win32_destdir)
+
 package-win32-7zip: package-win32-base-7zip
 # Clean up
 	rm -Rf $(win32_destdir)
 
+package-win32-debug-7zip: package-win32-base-debug-7zip
+# Clean up
+	rm -Rf $(win32_destdir)
+
 package-win32-no-clean: package-win32-base-zip package-win32-base-7zip package-win32-base-exe 
 
 package-win32: package-win32-no-clean
 # Clean up
 	rm -Rf $(win32_destdir)
 
+package-win32-debug: package-win32-base-debug-zip package-win32-base-debug-7zip
+# Clean up
+	rm -Rf $(win32_destdir)
+
 package-wince-base: package-win-common package-win-common-strip
 
 package-wince-base-zip:
@@ -941,6 +965,9 @@ package-wince: package-wince-base  package-wince-base-zip
 	rm -Rf $(win32_destdir)
 
 
+#####################################################################
+##   BeOS                                                          ##
+#####################################################################
 package-beos:
 # Check that tmp isn't in the way
 	@if test -e $(srcdir)/tmp; then \
@@ -976,7 +1003,10 @@ package-beos:
 # Clean up
 	rm -Rf $(srcdir)/tmp
 
-package-macosx: VLC-release.app
+#########################################################################
+## MacOS X                                                             ##
+#########################################################################
+package-macosx: VLC-release.app ChangeLog
 # Check that the temporary location isn't in the way
 	@if test -e "$(top_builddir)/vlc-$(VERSION)/"; then \
 	  rm -Rf "$(top_builddir)/vlc-$(VERSION)/" ; \