X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.am;h=2dcffe8dcde239bc70b9e6758e7faf61b2271916;hb=759d0b9f6c3ac385bb274d58ede20bb140561d8b;hp=bee6d02182ce367bbf3a7cef41c744e049aa289c;hpb=d1296b32da7293d0f780cdb9b4782c84e39fb1da;p=vlc

diff --git a/Makefile.am b/Makefile.am
index bee6d02182..2dcffe8dcd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,13 +8,14 @@
 SUBDIRS = po intl m4 share
 DIST_SUBDIRS = $(SUBDIRS) modules src debian doc ipkg lib
 
-EXTRA_DIST = BUGS FAQ HACKING MAINTAINERS STATUS src/extras/COPYING \
+EXTRA_DIST = FAQ HACKING MAINTAINERS STATUS src/extras/COPYING \
              INSTALL.win32 README.MacOSX.rtf vlc.spec install-win32 \
              Modules.am macosx-dmg \
              configure.ac.in mkinstalldirs bootstrap
 MOSTLYCLEANFILES =
 BUILT_SOURCES =
 SUFFIXES = 
+NULL =
 
 # List of programs, libraries and headers that need to be built and/or
 # distributed. Initialized to empty because we'll use += later.
@@ -259,11 +260,16 @@ EXTRA_DIST += \
 	extras/MacOSX/Resources/mpeg2.icns \
 	extras/MacOSX/Resources/mpeg4.icns \
 	extras/MacOSX/Resources/vlc.icns \
+	extras/MacOSX/Resources/back.png \
+	extras/MacOSX/Resources/begin.png \
+	extras/MacOSX/Resources/end.png \
+	extras/MacOSX/Resources/forw.png \
+	extras/MacOSX/Resources/list.png \
 	extras/MacOSX/Resources/pause.png \
 	extras/MacOSX/Resources/play.png \
+	extras/MacOSX/Resources/prefs.png \
 	extras/MacOSX/Resources/stop.png \
-	extras/MacOSX/Resources/stepf.png \
-	extras/MacOSX/Resources/stepr.png \
+	extras/MacOSX/Resources/vlc_hg.png \
 	extras/MacOSX/vlc.pbproj/project.pbxproj \
 	$(NULL)
 
@@ -273,29 +279,22 @@ EXTRA_DIST += \
 
 EXTRA_DIST += \
 	msvc/vlc.dsw \
-	msvc/libvlc.dsp \
 	msvc/libvlc.dsp.in \
-	msvc/vlc.dsp \
-	msvc/vlc.dsp.in \
-	msvc/vlc.dsp.out \
-	msvc/plugins.dsp \
 	msvc/plugins.dsp.in \
+	msvc/vlc.dsp.in \
 	msvc/config.h \
 	msvc/modules_builtin_msvc.h \
 	evc/vlc.vcw \
-	evc/libvlc.vcp \
 	evc/libvlc.vcp.in \
-	evc/vlc.vcp \
 	evc/vlc.vcp.in \
-	evc/vlc.vcp.out \
-	evc/plugins.vcp \
 	evc/plugins.vcp.in \
+	evc/vlc.c \
 	evc/config.h \
 	evc/modules_builtin_evc.h \
 	$(NULL)
 
 show-libvlc-sources: FORCE
-	@echo X: $(SOURCES_libvlc_common) $(SOURCES_libvlc_win32) $(SOURCES_libvlc_dirent) $(SOURCES_libvlc_getopt) $(SOURCES_libvlc_libc)
+	@echo X: $(SOURCES_libvlc_common) $(SOURCES_libvlc_win32) $(SOURCES_libvlc_dirent) $(SOURCES_libvlc_getopt)
 
 show-libvlc-headers: FORCE
 	@echo X: $(HEADERS_include) $(HEADERS_include_built)
@@ -314,10 +313,12 @@ lib_LIBRARIES += lib/libvlc.a $(LIBRARIES_libvlc_pic)
 lib_libvlc_a_SOURCES = $(SOURCES_libvlc)
 lib_libvlc_a_CFLAGS = $(CPPFLAGS_default) -D__VLC__ $(CFLAGS_default) @CFLAGS_vlc@
 lib_libvlc_a_CXXFLAGS = $(CPPFLAGS_default) -D__VLC__ $(CXXFLAGS_default)
+lib_libvlc_a_OBJCFLAGS = $(CPPFLAGS_default) -D__VLC__ $(OBJCFLAGS_default)
 
 lib_libvlc_pic_a_SOURCES = $(SOURCES_libvlc)
 lib_libvlc_pic_a_CFLAGS = $(CPPFLAGS_pic) -D__VLC__ $(CFLAGS_pic) @CFLAGS_vlc@
 lib_libvlc_pic_a_CXXFLAGS = $(CPPFLAGS_pic) -D__VLC__ $(CXXFLAGS_pic)
+lib_libvlc_pic_a_OBJCFLAGS = $(CPPFLAGS_pic) -D__VLC__ $(OBJCFLAGS_pic)
 
 if HAVE_BEOS
 OPT_SOURCES_libvlc_beos = $(SOURCES_libvlc_beos)
@@ -334,9 +335,6 @@ endif
 if BUILD_GETOPT
 OPT_SOURCES_libvlc_getopt = $(SOURCES_libvlc_getopt)
 endif
-if BUILD_LIBC
-OPT_SOURCES_libvlc_libc = $(SOURCES_libvlc_libc)
-endif
 if BUILD_MOZILLA
 LIBRARIES_libvlc_pic = lib/libvlc_pic.a
 endif
@@ -347,7 +345,6 @@ EXTRA_DIST += \
 	$(SOURCES_libvlc_win32) \
 	$(SOURCES_libvlc_dirent) \
 	$(SOURCES_libvlc_getopt) \
-	$(SOURCES_libvlc_libc) \
 	$(NULL)
 
 SOURCES_libvlc_beos = \
@@ -355,7 +352,7 @@ SOURCES_libvlc_beos = \
 	$(NULL)
 
 SOURCES_libvlc_darwin = \
-	src/misc/darwin_specific.c \
+	src/misc/darwin_specific.m \
 	$(NULL)
 
 SOURCES_libvlc_win32 = \
@@ -373,10 +370,6 @@ SOURCES_libvlc_getopt = \
 	src/extras/getopt1.c \
 	$(NULL)
 
-SOURCES_libvlc_libc = \
-	src/extras/libc.c
-	$(NULL)
-
 SOURCES_libvlc_common = \
 	src/libvlc.c \
 	src/libvlc.h \
@@ -417,6 +410,7 @@ SOURCES_libvlc_common = \
 	src/misc/objects.c \
 	src/misc/variables.c \
 	src/misc/error.c \
+	src/extras/libc.c \
 	$(NULL)
 
 SOURCES_libvlc = \
@@ -426,7 +420,6 @@ SOURCES_libvlc = \
 	$(OPT_SOURCES_libvlc_win32) \
 	$(OPT_SOURCES_libvlc_dirent) \
 	$(OPT_SOURCES_libvlc_getopt) \
-	$(OPT_SOURCES_libvlc_libc) \
 	$(NULL)
 
 ###############################################################################
@@ -479,6 +472,12 @@ vlc.app: vlc $(PLUGIN_FILES)
 	fi ; done
 	$(INSTALL) -d vlc.app/Contents/MacOS/share
 	$(INSTALL) -m 644 share/*.psf vlc.app/Contents/MacOS/share
+	$(INSTALL) -d vlc.app/Contents/MacOS/locale
+	for i in $(CATALOGS); do \
+		mkdir -p vlc.app/Contents/MacOS/locale/$${i%.gmo}/LC_MESSAGES ; \
+		cp po/$$i vlc.app/Contents/MacOS/locale/$${i%.gmo}/LC_MESSAGES/vlc.mo ; \
+	done
+	echo -n "APPLVLC#" >| vlc.app/Contents/PkgInfo
 endif
 
 if HAVE_WIN32
@@ -489,6 +488,92 @@ share/vlc_win32_rc.$(OBJEXT): share/vlc_win32_rc.rc
 	$(WINDRES) --include-dir share -i $< -o $@
 endif
 
+###############################################################################
+# Building architecture-specific binary packages
+###############################################################################
+
+# XXX: this rule is probably only useful to you if you have exactly
+# the same setup as me. Contact sam@zoy.org if you need to use it.
+#
+# Check that tmp isn't in the way
+package-win32:
+	@if test -e tmp; then \
+		echo "Error: please remove ./tmp, it is in the way"; false; \
+	else \
+		echo "OK."; mkdir tmp; \
+	fi
+# Create installation script
+	cp install-win32 tmp/nsi
+# Copy relevant files
+	cp vlc.exe tmp/ 
+	$(STRIP) tmp/vlc.exe
+	cp INSTALL.win32 tmp/INSTALL.txt ; unix2dos tmp/INSTALL.txt
+	for file in AUTHORS COPYING ChangeLog README FAQ ; \
+			do cp $$file tmp/$${file}.txt ; \
+			unix2dos tmp/$${file}.txt ; done
+	mkdir tmp/plugins
+	for i in dummy $(PLUGIN_FILES) ; do if test "x$$i" != "xdummy" ; then \
+		$(INSTALL) $$i tmp/plugins/ ; \
+	fi ; done
+# don't include these two
+#rm -f tmp/plugins/gtk.so tmp/plugins/sdl.so
+	for i in dummy tmp/plugins/*$(LIBEXT) ; do if test $$i != tmp/plugins/intfwin.so -a $$i != dummy ; then $(STRIP) $$i ; fi ; done
+	mkdir tmp/share
+	for file in default8x16.psf default8x9.psf ; \
+		do cp share/$$file tmp/share/ ; done
+# Create package 
+	wine ~/.wine/fake_windows/Program\ Files/NSIS/makensis.exe -- /DVERSION=${VERSION} tmp/nsi
+# Clean up
+	rm -Rf tmp
+
+package-beos:
+# Check that tmp isn't in the way
+	@if test -e tmp; then \
+		echo "Error: please remove ./tmp, it is in the way"; false; \
+	else \
+		echo "OK."; mkdir tmp; \
+	fi
+	
+# Create dir
+	mkdir -p tmp/vlc/share
+# Copy relevant files
+	cp vlc tmp/vlc/
+	$(STRIP) tmp/vlc/vlc
+	xres -o tmp/vlc/vlc ./share/vlc_beos.rsrc
+	cp AUTHORS COPYING ChangeLog README FAQ tmp/vlc/
+	for file in default8x16.psf default8x9.psf ; \
+		do cp share/$$file tmp/vlc/share/ ; done
+	mkdir tmp/vlc/plugins
+	for i in dummy $(PLUGIN_FILES) ; do if test "x$$i" != "xdummy" ; then \
+		$(INSTALL) $$i tmp/vlc/plugins/ ; \
+	fi ; done
+	for i in dummy tmp/vlc/plugins/*$(LIBEXT) ; do if test $$i != dummy ; then $(STRIP) $$i ; fi ; done
+# Create package 
+	mv tmp/vlc tmp/vlc-${VERSION}
+	(cd tmp ; find vlc-${VERSION} | \
+	zip -9 -@ vlc-${VERSION}-BeOS-x86.zip )
+	mv tmp/vlc-${VERSION}-BeOS-x86.zip .
+# Clean up
+	rm -Rf tmp
+
+package-macosx:
+# Check that tmp isn't in the way
+	@if test -e tmp; then \
+		echo "Error: please remove ./tmp, it is in the way"; false; \
+	else \
+		echo "OK."; mkdir tmp; \
+	fi
+
+# Copy relevant files 
+	cp -R vlc.app tmp/
+	cp AUTHORS COPYING ChangeLog README README.MacOSX.rtf FAQ tmp/
+
+# Create disk image 
+	./macosx-dmg 18 "vlc-${VERSION}" tmp/* 
+
+# Clean up
+	rm -Rf tmp
+
 ###############################################################################
 # Building the Mozilla plugin
 ###############################################################################
@@ -529,7 +614,7 @@ if UNTRUE
 noinst_LIBRARIES_mozilla = mozilla/libplugin.a
 endif
 
-mozilla_libplugin_a_SOURCES = $(SOURCES_mozilla) $(BUILT_SOURCES_mozilla)
+mozilla_libplugin_a_SOURCES = $(SOURCES_mozilla)
 mozilla_libplugin_a_CFLAGS = $(CPPFLAGS_pic) $(CFLAGS_pic) \
                              $(CPPFLAGS_mozilla) $(CFLAGS_mozilla) \
                              $(CPPFLAGS_mozilla_EXTRA)