* Makefile.am: fixed 'make package-beos'

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 9ba069be99d7c81ac06d216090748cb78c392c22..0abbc846fa73a1273c8691b0b1f5ed851935f5fd 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -203,6 +203,7 @@ HEADERS_include = \
        include/vlc_playlist.h \
        include/vlc_threads.h \
        include/vlc_threads_funcs.h \
+       include/vout_synchro.h \
        include/win32_specific.h \
        include/osd.h \
        $(NULL)
@@ -263,6 +264,7 @@ EXTRA_DIST += \
        extras/MacOSX/Resources/slow.png \
        extras/MacOSX/Resources/stop.png \
        extras/MacOSX/Resources/vlc_hg.png \
+       extras/MacOSX/Resources/about_bg.png \
        extras/MacOSX/Resources/vlc.scriptSuite \
        extras/MacOSX/Resources/README \
        extras/MacOSX/vlc.pbproj/project.pbxproj \
@@ -386,6 +388,7 @@ SOURCES_libvlc_common = \
        src/video_output/video_text.c \
        src/video_output/video_text.h \
        src/video_output/vout_subpictures.c \
+       src/video_output/vout_synchro.c \
        src/audio_output/common.c \
        src/audio_output/dec.c \
        src/audio_output/filters.c \
@@ -440,9 +443,15 @@ DEPENDENCIES_vlc = lib/libvlc.a $(L_builtin) $(DATA_win32_rc) $(LIB_intl)
 vlc$(EXEEXT): $(vlc_OBJECTS) $(DEPENDENCIES_vlc)
        @rm -f vlc$(EXEEXT)
        $(LINK) $(vlc_LDFLAGS) $(vlc_OBJECTS) $(vlc_LDADD) $(LIBS)
+
 if HAVE_BEOS
        xres -o $@ ./share/vlc_beos.rsrc
        mimeset -f $@
+       rm -Rf locale ; mkdir locale
+       for i in $(ALL_LINGUAS); do \
+               mkdir -p locale/$${i}/LC_MESSAGES ; \
+               cp po/$${i}.gmo locale/$${i}/LC_MESSAGES/vlc.mo || true ; \
+       done
 endif
 
 # Install the symlinks
@@ -458,7 +467,7 @@ vlc_app_DATA = VLC.app
 vlc_appdir = $(bindir)
 VLC.app: vlc $(PLUGIN_FILES)
        rm -Rf VLC.app
-       cd extras/MacOSX ; pbxbuild | grep -v '^[ \t]' | grep -v "^$$"
+       cd extras/MacOSX ; pbxbuild -target vlc | grep -v '^\([ \t]\|$$\)'
        cp -r extras/MacOSX/build/vlc.bundle ./VLC.app
        $(INSTALL) -d VLC.app/Contents/MacOS
        $(INSTALL) vlc VLC.app/Contents/MacOS/VLC
@@ -520,6 +529,7 @@ package-win32:
        for i in dummy tmp/plugins/*$(LIBEXT) ; \
                do if test $$i != tmp/plugins/libwin32_plugin$(LIBEXT) \
                -a $$i != dummy ; then $(STRIP) $$i ; fi ; done
+
        mkdir tmp/share
        cp share/*.rle tmp/share/ ;
 
@@ -529,6 +539,14 @@ package-win32:
                cp po/$${i}.gmo tmp/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \
        done
 
+       mkdir -p tmp/skins/default
+       for i in share/skins/default/*.*; do \
+               cp $$i tmp/skins/default/ || true ; \
+       done
+       for i in doc/skins/*.txt; do \
+               cp $$i tmp/skins/ || true ; \
+       done
+
        cd doc/faq ; $(MAKE) html ; cd ../.. ;
        cp doc/faq/index.html tmp/FAQ.htm ;
 
@@ -544,26 +562,35 @@ package-beos:
        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 THANKS NEWS 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 
+       mkdir -p tmp/vlc
+       cp vlc AUTHORS COPYING ChangeLog README THANKS NEWS tmp/vlc/
+# We cannot use ${PLUGIN_FILES}, it looks like it is too long for the BeOS shell...
+       if [ `find modules -name "lib*_plugin.so" | wc -l` -gt 0 ]; then \
+               mkdir -p tmp/vlc/plugins; \
+               find modules -name "lib*_plugin.so" | xargs -i{} cp {} tmp/vlc/plugins/; \
+       fi
+       for i in $(ALL_LINGUAS); do \
+               mkdir -p tmp/vlc/locale/$${i}/LC_MESSAGES ; \
+               cp po/$${i}.gmo tmp/vlc/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \
+       done
+       mkdir -p tmp/vlc/share
+       cp share/*.rle tmp/vlc/share/
+
+# Create package with debug symbols
+       mimeset -f tmp/vlc/* tmp/vlc/*/*
        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 .
+       (cd tmp ; zip -9 -r vlc-${VERSION}-BeOS.zip vlc-${VERSION} )
+       mv tmp/vlc-${VERSION}-BeOS.zip .
+
+# Create package without debug symbols
+       strip tmp/vlc-${VERSION}/vlc tmp/vlc-${VERSION}/plugins/lib*_plugin.so
+       xres -o tmp/vlc-${VERSION}/vlc share/vlc_beos.rsrc
+       mimeset -f tmp/vlc-${VERSION}/* tmp/vlc-${VERSION}/*/*
+       (cd tmp ; zip -9 -r vlc-${VERSION}-BeOS-stripped.zip vlc-${VERSION} )
+       mv tmp/vlc-${VERSION}-BeOS-stripped.zip .
+
 # Clean up
        rm -Rf tmp
 
@@ -603,8 +630,9 @@ SOURCES_mozilla = \
        mozilla/vlcplugin.h \
        mozilla/vlcpeer.cpp \
        mozilla/vlcpeer.h \
-       mozilla/classinfo.h \
+       mozilla/support/classinfo.h \
        $(SOURCES_mozilla_win32) \
+       $(SOURCES_mozilla_macosx) \
        $(SOURCES_mozilla_unix) \
        $(NULL)
 
@@ -613,11 +641,16 @@ SOURCES_mozilla = \
 # under Win32 and npunix.c under Unix.
 if HAVE_WIN32
 LIBRARIES_mozilla = mozilla/npvlc$(LIBEXT)
-SOURCES_mozilla_win32 = mozilla/npwin.cpp
+SOURCES_mozilla_win32 = mozilla/support/npwin.cpp
 CPPFLAGS_mozilla_EXTRA = -DXP_WIN -DXP_WIN32
 else
+if HAVE_DARWIN
+# We don't define LIBRARIES_mozilla because we'll be using project builder
+SOURCES_mozilla_macosx = mozilla/support/npmac.cpp
+else
 LIBRARIES_mozilla = mozilla/libvlcplugin$(LIBEXT)
-SOURCES_mozilla_unix = mozilla/npunix.c
+SOURCES_mozilla_unix = mozilla/support/npunix.c
+endif
 endif
 
 if BUILD_MOZILLA