# - modules should come before . because vlc needs the builtins
# - . should come before mozilla because the plugin needs libvlc_pic.a
# - po should come before . because VLC.app needs the pofiles
-SUBDIRS = intl modules po . mozilla share m4
-DIST_SUBDIRS = $(SUBDIRS) src debian doc ipkg lib autotools
+SUBDIRS = intl modules po . mozilla share m4 doc
+DIST_SUBDIRS = $(SUBDIRS) src debian ipkg lib autotools
EXTRA_DIST = \
HACKING \
include/darwin_specific.h \
include/charset.h \
include/codecs.h \
- include/encoder.h \
include/ninput.h \
include/input_ext-dec.h \
include/input_ext-intf.h \
include/stream_output.h \
include/variables.h \
include/video_output.h \
+ include/vlc_bits.h \
include/vlc_block.h \
+ include/vlc_block_helper.h \
+ include/vlc_codec.h \
include/vlc_common.h \
include/vlc_config.h \
include/vlc_cpu.h \
include/vlc_error.h \
+ include/vlc_es.h \
+ include/vlc_help.h \
include/vlc_interface.h \
+ include/vlc_keys.h \
include/vlc_messages.h \
include/vlc_objects.h \
include/vlc_playlist.h \
extras/MacOSX/Resources/vob.icns \
extras/MacOSX/Resources/wma.icns \
extras/MacOSX/Resources/wmv.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/pause_blue.png \
extras/MacOSX/Resources/play.png \
- extras/MacOSX/Resources/prefs.png \
- extras/MacOSX/Resources/slow.png \
+ extras/MacOSX/Resources/play_blue.png \
extras/MacOSX/Resources/stop.png \
- extras/MacOSX/Resources/vlc_hg.png \
+ extras/MacOSX/Resources/stop_blue.png \
+ extras/MacOSX/Resources/display.png \
+ extras/MacOSX/Resources/display_slider.png \
+ extras/MacOSX/Resources/display_track.png \
+ extras/MacOSX/Resources/fullscreen_active.png \
+ extras/MacOSX/Resources/fullscreen_blue.png \
+ extras/MacOSX/Resources/next_active.png \
+ extras/MacOSX/Resources/next_blue.png \
+ extras/MacOSX/Resources/playlistdrawer_active.png \
+ extras/MacOSX/Resources/playlistdrawer_blue.png \
+ extras/MacOSX/Resources/previous_active.png \
+ extras/MacOSX/Resources/previous_blue.png \
+ extras/MacOSX/Resources/skip_forward_active.png \
+ extras/MacOSX/Resources/skip_forward_blue.png \
+ extras/MacOSX/Resources/skip_previous_active.png \
+ extras/MacOSX/Resources/skip_previous_blue.png \
+ extras/MacOSX/Resources/volume_high.png \
+ extras/MacOSX/Resources/volume_low.png \
+ extras/MacOSX/Resources/volumeslider_blue.png \
+ extras/MacOSX/Resources/volumeslider_normal.png \
+ extras/MacOSX/Resources/volumetrack.png \
extras/MacOSX/Resources/about_bg.png \
extras/MacOSX/Resources/vlc.scriptSuite \
extras/MacOSX/Resources/README \
OPT_SOURCES_libvlc_getopt = $(SOURCES_libvlc_getopt)
endif
if BUILD_MOZILLA
+if !HAVE_WIN32
LIBRARIES_libvlc_pic = lib/libvlc_pic.a
endif
+endif
EXTRA_DIST += \
$(SOURCES_libvlc_beos) \
src/interface/interface.c \
src/interface/intf_eject.c \
src/playlist/playlist.c \
+ src/playlist/sort.c \
+ src/playlist/loadsave.c \
+ src/playlist/group.c \
+ src/playlist/item.c \
src/input/input.c \
+ src/input/es_out.c \
src/input/stream.c \
src/input/demux.c \
+ src/input/subtitles.c \
src/input/input_ext-plugins.c \
- src/input/input_ext-dec.c \
src/input/input_ext-intf.c \
src/input/input_dec.c \
src/input/input_programs.c \
src/video_output/vout_pictures.c \
src/video_output/vout_pictures.h \
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 \
cp "$(srcdir)/modules/gui/macosx/$$i" \
$(top_builddir)/tmp/modules/gui/macosx; \
done
- cd $(top_builddir)/tmp/extras/MacOSX && pbxbuild -target vlc | grep -v '^\([ \t]\|$$\)'
+ cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)'
cp -r $(top_builddir)/tmp/extras/MacOSX/build/vlc.bundle \
$(top_builddir)/VLC.app
rm -Rf $(top_builddir)/tmp
then $(INSTALL) "$$i$(LIBEXT)" \
"$(top_builddir)/VLC.app/Contents/MacOS/modules" ; \
fi ; done
+ if test -d $(top_builddir)/extras/contrib/vlc-lib; then \
+ mkdir -p $(top_builddir)/VLC.app/Contents/MacOS/lib ; \
+ for i in $(top_builddir)/extras/contrib/vlc-lib/*.dylib ; do \
+ $(INSTALL) -m 644 $${i} $(top_builddir)/VLC.app/Contents/MacOS/lib/vlc_`basename $${i}` ; \
+ done ; \
+ fi
$(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/share
$(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/share/http
- $(INSTALL) -m 644 $(srcdir)/share/http/*.html \
- $(top_builddir)/VLC.app/Contents/MacOS/share/http
+ for i in $(srcdir)/share/http/* ; do \
+ $(INSTALL) -m 644 $${i} $(top_builddir)/VLC.app/Contents/MacOS/share/http/`basename $${i}` ; \
+ done ; \
$(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/share/http/admin
- $(INSTALL) -m 644 $(srcdir)/share/http/admin/*.html \
- $(top_builddir)/VLC.app/Contents/MacOS/share/http/admin
+ for i in $(srcdir)/share/http/admin/* ; do \
+ $(INSTALL) -m 644 $${i} $(top_builddir)/VLC.app/Contents/MacOS/share/http/admin/`basename $${i}` ; \
+ done ; \
$(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/locale
for i in $(ALL_LINGUAS); do \
mkdir -p $(top_builddir)/VLC.app/Contents/MacOS/locale/$${i}/LC_MESSAGES ; \
cp "$(srcdir)/install-win32" "$(srcdir)/vlc-${VERSION}/nsi"
# Copy relevant files
cp "$(top_builddir)/vlc$(EXEEXT)" "$(srcdir)/vlc-${VERSION}/"
+ cp "$(top_builddir)/vlc$(EXEEXT).manifest" "$(srcdir)/vlc-${VERSION}/"
$(STRIP) "$(srcdir)/vlc-${VERSION}/vlc$(EXEEXT)"
for file in AUTHORS MAINTAINERS THANKS NEWS COPYING README ; \
do cp "$(srcdir)/$$file" "$(srcdir)/vlc-${VERSION}/$${file}.txt" ; \
mkdir -p "$(srcdir)/vlc-${VERSION}/http/admin"
cp $(srcdir)/share/http/*.html $(srcdir)/vlc-${VERSION}/http/ ;
+ cp $(srcdir)/share/http/*.css $(srcdir)/vlc-${VERSION}/http/ ;
cp $(srcdir)/share/http/admin/*.html \
$(srcdir)/vlc-${VERSION}/http/admin/ ;
cp $(srcdir)/share/http/admin/.access \
$(srcdir)/vlc-${VERSION}/http/admin/ ;
+ mkdir -p "$(srcdir)/vlc-${VERSION}/mozilla"
+if BUILD_MOZILLA
+ cp $(srcdir)/mozilla/*$(LIBEXT) $(srcdir)/vlc-${VERSION}/mozilla/ ;
+ $(STRIP) $(srcdir)/vlc-${VERSION}/mozilla/*$(LIBEXT);
+ cp $(srcdir)/mozilla/vlcintf.xpt $(srcdir)/vlc-${VERSION}/mozilla/ ;
+endif
+
package-win32-base-exe:
# Create package
wine ~/.wine/fake_windows/Program\ Files/NSIS/makensis.exe \
# Check that tmp isn't in the way
@if test -e $(srcdir)/tmp; then \
echo "Error: please remove $(srcdir)/tmp, it is in the way"; \
- false; \
+ false ; \
else \
- echo "OK."; mkdir $(srcdir)/tmp; \
+ echo "OK." ; mkdir $(srcdir)/tmp ; \
fi
# Copy relevant files
- mkdir -p $(srcdir)/tmp/vlc
+ mkdir -p $(srcdir)/tmp/vlc ;
cd $(srcdir) && \
- cp vlc AUTHORS COPYING ChangeLog README THANKS NEWS tmp/vlc/
+ cp vlc AUTHORS COPYING ChangeLog README THANKS NEWS tmp/vlc/ ;
# We cannot use ${PLUGIN_FILES} as it looks like it is too "long" for the BeOS shell...
if [ `find $(srcdir)/modules -name "lib*_plugin.so" | wc -l` -gt 0 ]; then \
- mkdir -p $(srcdir)/tmp/vlc/plugins; \
- find $(srcdir)/modules -name "lib*_plugin.so" | xargs -i{} cp {} $(srcdir)/tmp/vlc/plugins/; \
+ mkdir -p $(srcdir)/tmp/vlc/plugins ; \
+ find $(srcdir)/modules -name "lib*_plugin.so" -exec cp {} $(srcdir)/tmp/vlc/plugins/ \; ; \
fi
for i in $(ALL_LINGUAS); do \
mkdir -p $(srcdir)/tmp/vlc/locale/$${i}/LC_MESSAGES ; \
cp $(srcdir)/po/$${i}.gmo $(srcdir)/tmp/vlc/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \
done
-# Create package with debug symbols
- mimeset -f $(srcdir)/tmp/vlc/* $(srcdir)/tmp/vlc/*/*
- mv $(srcdir)/tmp/vlc $(srcdir)/tmp/vlc-${VERSION}
- (cd $(srcdir)/tmp ; zip -9 -r vlc-${VERSION}-BeOS-debug.zip vlc-${VERSION} )
- mv $(srcdir)/tmp/vlc-${VERSION}-BeOS-debug.zip $(srcdir)/
-
-# Create package without debug symbols
- mv $(srcdir)/tmp/vlc-${VERSION} $(srcdir)/tmp/vlc
- strip $(srcdir)/tmp/vlc/vlc
+# Strip files and create package
+ strip --strip-debug --strip-unneeded $(srcdir)/tmp/vlc/vlc ;
if [ -d $(srcdir)/tmp/vlc/plugins ]; then \
- strip $(srcdir)/tmp/vlc/plugins/lib*_plugin.so; \
+ strip --strip-debug --strip-unneeded $(srcdir)/tmp/vlc/plugins/lib*_plugin.so ; \
fi
- xres -o $(srcdir)/tmp/vlc/vlc $(srcdir)/share/vlc_beos.rsrc
- mimeset -f $(srcdir)/tmp/vlc/* $(srcdir)/tmp/vlc/*/*
- mv $(srcdir)/tmp/vlc $(srcdir)/tmp/vlc-${VERSION}
+ xres -o $(srcdir)/tmp/vlc/vlc $(srcdir)/share/vlc_beos.rsrc ;
+ find $(srcdir)/tmp/vlc -exec mimeset -f {} \; ;
+ mv $(srcdir)/tmp/vlc $(srcdir)/tmp/vlc-${VERSION} ;
(cd $(srcdir)/tmp ; zip -9 -r vlc-${VERSION}-BeOS.zip vlc-${VERSION} )
- mv $(srcdir)/tmp/vlc-${VERSION}-BeOS.zip $(srcdir)/
+ mv $(srcdir)/tmp/vlc-${VERSION}-BeOS.zip $(srcdir)/ ;
# Clean up
- rm -Rf $(srcdir)/tmp
+ rm -Rf $(srcdir)/tmp ;
package-macosx:
# Check that tmp isn't in the way
cd "$(srcdir)" && cp AUTHORS COPYING ChangeLog README README.MacOSX.rtf THANKS NEWS $(top_builddir)/tmp/
# Create disk image
- $(srcdir)/extras/MacOSX/macosx-dmg 18 "vlc-${VERSION}" $(top_builddir)/tmp/*
+ $(srcdir)/extras/MacOSX/macosx-dmg 25 "vlc-${VERSION}" $(top_builddir)/tmp/*
# Clean up
rm -Rf $(top_builddir)/tmp
projects / vlc / blobdiff