# SUBDIRS stores the directories where a "make" is required when building
# something. DIST_SUBDIRS stores the directories where nothing is built but
# which have makefiles with distribution information.
-SUBDIRS = intl modules . share po m4
-DIST_SUBDIRS = $(SUBDIRS) src debian doc ipkg lib autotools
+# - intl should come before modules and . because all the code uses gettext
+# - 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 doc
+DIST_SUBDIRS = $(SUBDIRS) src debian ipkg lib autotools
EXTRA_DIST = \
HACKING \
INSTALL.win32 \
+ vlc.exe.manifest \
MAINTAINERS \
README.MacOSX.rtf \
bootstrap \
vlc-config.in.in \
vlc.ebuild \
vlc.spec \
- vlc.spec.redhat \
+ vlc.spec.mdk \
$(NULL)
BUILT_SOURCES =
include/beos_specific.h \
include/configuration.h \
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/input_ext-plugins.h \
include/intf_eject.h \
include/iso_lang.h \
- include/httpd.h \
+ include/vlc_httpd.h \
include/main.h \
include/mmx.h \
include/modules.h \
include/os_specific.h \
include/stream_control.h \
include/stream_output.h \
- include/announce.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_meta.h \
+ include/vlc_vlm.h \
include/vlc_objects.h \
include/vlc_playlist.h \
include/vlc_threads.h \
$(NULL)
include/vlc_symbols.h: Makefile $(HEADERS_include)
- $(srcdir)/toolbox --update-includes
+ srcdir=$(srcdir) $(srcdir)/toolbox --update-includes
src/misc/modules_plugin.h: Makefile src/misc/modules_plugin.h.in $(HEADERS_include)
- $(srcdir)/toolbox --update-includes
+ srcdir=$(srcdir) $(srcdir)/toolbox --update-includes
src/misc/modules_builtin.h: Makefile src/misc/modules_builtin.h.in
- $(srcdir)/toolbox --update-includes
+ srcdir=$(srcdir) $(srcdir)/toolbox --update-includes
# These dependencies are mandatory
$(SOURCES): include/vlc_symbols.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 \
dist-hook:
mv $(distdir)/vlc.ebuild $(distdir)/vlc-${VERSION}.ebuild
- cd $(distdir) && $(srcdir)/toolbox --update-vc
+ cd $(distdir) && srcdir=$(srcdir) $(srcdir)/toolbox --update-vc
###############################################################################
# Building libvlc
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/playlist/item-ext.c \
+ src/playlist/info.c \
src/input/input.c \
+ src/input/control.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/input/input_clock.c \
- src/input/input_info.c \
src/video_output/video_output.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/video_output/vout_intf.c \
src/audio_output/common.c \
src/audio_output/dec.c \
src/audio_output/filters.c \
src/audio_output/intf.c \
src/stream_output/stream_output.c \
src/stream_output/announce.c \
+ src/stream_output/sap.c \
+ src/misc/charset.c \
+ src/misc/httpd.c \
src/misc/mtime.c \
+ src/misc/block.c \
src/misc/modules.c \
src/misc/threads.c \
src/misc/cpu.c \
src/misc/objects.c \
src/misc/variables.c \
src/misc/error.c \
+ src/misc/net.c \
+ src/misc/vlm.c \
src/extras/libc.c \
$(NULL)
# old automake-1.5 bug (automake/279).
DEPENDENCIES_vlc = lib/libvlc.a $(DATA_win32_rc) $(LIB_intl)
-vlc$(EXEEXT): $(vlc_OBJECTS) $(DEPENDENCIES_vlc)
- @rm -f $(srcdir)/vlc$(EXEEXT)
- case `$(VLC_CONFIG) --linkage vlc builtin` in \
- c++) $(CXXLINK) $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS) $(LIBS) ;; \
- objc) $(OBJCLINK) $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS) $(LIBS) ;; \
- c|*) $(LINK) $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS) $(LIBS) ;; \
+vlc$(EXEEXT): $(vlc_OBJECTS) $(DEPENDENCIES_vlc) stamp-builtin
+ @rm -f $(top_builddir)/vlc$(EXEEXT)
+ @case `$(VLC_CONFIG) --linkage vlc builtin` in \
+ c++) echo $(CXXLINK) $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS) $(LIBS) ; $(CXXLINK) $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS) $(LIBS) ;; \
+ objc) echo $(OBJCLINK) $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS) $(LIBS) ; $(OBJCLINK) $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS) $(LIBS) ;; \
+ c|*) echo $(LINK) $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS) $(LIBS) ; $(LINK) $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS) $(LIBS) ;; \
esac
if HAVE_BEOS
# Install the modules and the symlinks
install-exec-local:
for i in "" `$(VLC_CONFIG) --target plugin` ; do if test -n "$$i" ; then \
- $(INSTALL) -m 755 "modules/$$i$(LIBEXT)" "$(DESTDIR)$(libdir)/vlc/`echo $$i | cut -f1 -d/`" ; \
+ echo $(INSTALL) -m 755 "$$i$(LIBEXT)" "$(DESTDIR)$(libdir)/vlc/`echo $$i | sed -e 's,.*modules/\([^/]*\).*,\1,'`" ; \
+ $(INSTALL) -m 755 "$$i$(LIBEXT)" "$(DESTDIR)$(libdir)/vlc/`echo $$i | sed -e 's,.*modules/\([^/]*\).*,\1,'`" ; \
+ fi ; done
+ for i in "" `$(VLC_CONFIG) --target builtin` ; do if test -n "$$i" ; then \
+ echo $(INSTALL) -m 644 "$$i" "$(DESTDIR)$(libdir)/vlc" ; \
+ $(INSTALL) -m 644 "$$i" "$(DESTDIR)$(libdir)/vlc" ; \
fi ; done
- for i in "" `$(VLC_CONFIG) --target builtin` `$(VLC_CONFIG) --target builtin pic` ; do if test -n "$$i" ; then \
- $(INSTALL) -m 644 "modules/$$i" "$(DESTDIR)$(libdir)/vlc" ; \
+if BUILD_MOZILLA
+ for i in "" `$(VLC_CONFIG) --target builtin pic` ; do if test -n "$$i" ; then \
+ echo $(INSTALL) -m 644 "$$i" "$(DESTDIR)$(libdir)/vlc" ; \
+ $(INSTALL) -m 644 "$$i" "$(DESTDIR)$(libdir)/vlc" ; \
fi ; done
+endif
for i in "" $(ALIASES) ; do if test -n "$$i" ; then \
rm -f "$(DESTDIR)$(bindir)/$$i" && \
ln -s vlc "$(DESTDIR)$(bindir)/$$i" ; \
vlc_app_DATA = VLC.app
vlc_appdir = $(bindir)
VLC.app: vlc
- rm -Rf VLC.app
- cd $(srcdir)/extras/MacOSX && pbxbuild -target vlc | grep -v '^\([ \t]\|$$\)'
- cp -r $(srcdir)/extras/MacOSX/build/vlc.bundle $(srcdir)/VLC.app
- $(INSTALL) -d $(srcdir)/VLC.app/Contents/MacOS
- $(INSTALL) vlc $(srcdir)/VLC.app/Contents/MacOS/VLC
- $(INSTALL) -d $(srcdir)/VLC.app/Contents/MacOS/modules
+ @if test -e "$(top_builddir)/tmp"; then \
+ echo "Error: please remove $(top_builddir)/tmp, it is in the way"; \
+ false; \
+ else \
+ echo "OK."; mkdir -p "$(top_builddir)/tmp/extras"; \
+ fi
+ rm -Rf $(top_builddir)/VLC.app
+ cp -r $(srcdir)/extras/MacOSX $(top_builddir)/tmp/extras
+ for i in AUTHORS COPYING README.MacOSX.rtf THANKS; do \
+ cp "$(srcdir)/$$i" $(top_builddir)/tmp; \
+ done
+ mkdir -p $(top_builddir)/tmp/modules/audio_output
+ cp $(srcdir)/modules/audio_output/coreaudio.c \
+ $(top_builddir)/tmp/modules/audio_output/coreaudio.c
+ mkdir -p $(top_builddir)/tmp/modules/gui/macosx
+ for i in \
+ about.h \
+ about.m \
+ applescript.h \
+ applescript.m \
+ controls.h \
+ controls.m \
+ info.h \
+ info.m \
+ intf.h \
+ intf.m \
+ macosx.m \
+ misc.h \
+ misc.m \
+ open.h \
+ open.m \
+ output.h \
+ output.m \
+ playlist.h \
+ playlist.m \
+ prefs_widgets.h \
+ prefs_widgets.m \
+ prefs.h \
+ prefs.m \
+ vout.h \
+ vout.m; do \
+ cp "$(srcdir)/modules/gui/macosx/$$i" \
+ $(top_builddir)/tmp/modules/gui/macosx; \
+ done
+ 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
+ $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS
+ $(INSTALL) $(top_builddir)/vlc \
+ $(top_builddir)/VLC.app/Contents/MacOS/VLC
+ $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/modules
for i in "" `$(VLC_CONFIG) --target plugin` ; do \
- if test -n "$$i" ; then $(INSTALL) "$(srcdir)/modules/$$i$(LIBEXT)" \
- "$(srcdir)/VLC.app/Contents/MacOS/modules" ; \
+ if test -n "$$i" ; \
+ then $(INSTALL) "$$i$(LIBEXT)" \
+ "$(top_builddir)/VLC.app/Contents/MacOS/modules" ; \
fi ; done
- $(INSTALL) -d $(srcdir)/VLC.app/Contents/MacOS/share
- $(INSTALL) -m 644 $(srcdir)/share/*.psf $(srcdir)/share/*.rle \
- $(srcdir)/VLC.app/Contents/MacOS/share
- $(INSTALL) -d $(srcdir)/VLC.app/Contents/MacOS/locale
+ 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
+ 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
+ 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 $(srcdir)/VLC.app/Contents/MacOS/locale/$${i}/LC_MESSAGES ; \
- cp $(srcdir)/po/$${i}.gmo $(srcdir)/VLC.app/Contents/MacOS/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \
- mkdir -p $(srcdir)/VLC.app/Contents/Resources/$${i}.lproj ; \
- ln -sf ../English.lproj/InfoPlist.strings $(srcdir)/VLC.app/Contents/Resources/$${i}.lproj ; \
- ln -sf ../English.lproj/MainMenu.nib $(srcdir)/VLC.app/Contents/Resources/$${i}.lproj ; \
- ln -sf ../English.lproj/vlc.scriptTerminology $(srcdir)/VLC.app/Contents/Resources/$${i}.lproj ; \
+ mkdir -p $(top_builddir)/VLC.app/Contents/MacOS/locale/$${i}/LC_MESSAGES ; \
+ cp $(srcdir)/po/$${i}.gmo $(top_builddir)/VLC.app/Contents/MacOS/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \
+ mkdir -p $(top_builddir)/VLC.app/Contents/Resources/$${i}.lproj ; \
+ ln -sf ../English.lproj/InfoPlist.strings \
+ $(top_builddir)/VLC.app/Contents/Resources/$${i}.lproj ; \
+ ln -sf ../English.lproj/MainMenu.nib \
+ $(top_builddir)/VLC.app/Contents/Resources/$${i}.lproj ; \
+ ln -sf ../English.lproj/vlc.scriptTerminology \
+ $(top_builddir)/VLC.app/Contents/Resources/$${i}.lproj ; \
done
- printf "APPLVLC#" >| $(srcdir)/VLC.app/Contents/PkgInfo
+ printf "APPLVLC#" >| $(top_builddir)/VLC.app/Contents/PkgInfo
endif
if HAVE_WIN32
noinst_share_vlc_win32_rc_DATA = share/vlc_win32_rc.$(OBJEXT)
noinst_share_vlc_win32_rcdir = $(libdir)
share/vlc_win32_rc.$(OBJEXT): share/vlc_win32_rc.rc
- $(WINDRES) --include-dir $(srcdir)/share -i $< -o $@
+ $(WINDRES) -DVERSION=$(VERSION) -DVERSION_NUMBER=`echo $(VERSION).0.0.0 | sed 's/\([0-9]*\)[^.]*\.*\([0-9]*\)[^.]*\.*\([0-9]*\)[^.]*\.*\([0-9]*\).*/\1,\2,\3,\4/'` --include-dir $(srcdir)/share -i $< -o $@
endif
+###############################################################################
+# Building specific source packages
+###############################################################################
+
+dist-woody: distdir
+ $(remove_distdir_woody)
+ mv $(distdir) $(PACKAGE)-woody-$(VERSION)
+ $(srcdir)/toolbox --make-woody $(PACKAGE)-woody-$(VERSION)
+ $(AMTAR) chof - $(PACKAGE)-woody-$(VERSION) \
+ | GZIP=$(GZIP_ENV) gzip -c >$(PACKAGE)-woody-$(VERSION).tar.gz
+ $(remove_distdir_woody)
+
+remove_distdir_woody = \
+ { test ! -d $(PACKAGE)-woody-$(VERSION) \
+ || { find $(PACKAGE)-woody-$(VERSION) -type d ! -perm -200 \
+ -exec chmod u+w {} ';' \
+ && rm -fr $(PACKAGE)-woody-$(VERSION); }; }
+
###############################################################################
# Building architecture-specific binary packages
###############################################################################
# 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 "$(srcdir)/tmp"; then \
- echo "Error: please remove $(srcdir)/tmp, it is in the way"; \
+package-win32-base:
+ @if test -e "$(srcdir)/vlc-${VERSION}"; then \
+ echo "Error: please remove $(srcdir)/vlc-${VERSION}, it is in the way"; \
false; \
else \
- echo "OK."; mkdir -p "$(srcdir)/tmp"; \
+ echo "OK."; mkdir -p "$(srcdir)/vlc-${VERSION}"; \
fi
# Create installation script
- cp "$(srcdir)/install-win32" "$(srcdir)/tmp/nsi"
+ cp "$(srcdir)/install-win32" "$(srcdir)/vlc-${VERSION}/nsi"
# Copy relevant files
- cp "$(srcdir)/vlc$(EXEEXT)" "$(srcdir)/tmp/"
- $(STRIP) "$(srcdir)/tmp/vlc$(EXEEXT)"
- cp "$(srcdir)/INSTALL.win32" "$(srcdir)/tmp/INSTALL.txt"
- unix2dos "$(srcdir)/tmp/INSTALL.txt"
+ 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)/tmp/$${file}.txt" ; \
- unix2dos "$(srcdir)/tmp/$${file}.txt" ; done
+ do cp "$(srcdir)/$$file" "$(srcdir)/vlc-${VERSION}/$${file}.txt" ; \
+ unix2dos "$(srcdir)/vlc-${VERSION}/$${file}.txt" ; done
- mkdir -p "$(srcdir)/tmp/plugins"
+ mkdir -p "$(srcdir)/vlc-${VERSION}/plugins"
for i in "" `$(VLC_CONFIG) --target plugin` ; do \
if test -n "$$i" ; then \
- $(INSTALL) "$(srcdir)/modules/$$i$(LIBEXT)" "$(srcdir)/tmp/plugins/" ; \
+ $(INSTALL) "$(srcdir)/$$i$(LIBEXT)" \
+ "$(srcdir)/vlc-${VERSION}/plugins/" ; \
fi ; done
- for i in "" $(srcdir)/tmp/plugins/*$(LIBEXT) ; \
+ for i in "" $(srcdir)/vlc-${VERSION}/plugins/*$(LIBEXT) ; \
do if test -n "$$i" ; then $(STRIP) "$$i" ; fi ; done
- mkdir -p "$(srcdir)/tmp/share"
- cp $(srcdir)/share/*.rle $(srcdir)/tmp/share/ ;
-
- mkdir $(srcdir)/tmp/locale
+ mkdir $(srcdir)/vlc-${VERSION}/locale
for i in $(ALL_LINGUAS); do \
- mkdir -p "$(srcdir)/tmp/locale/$${i}/LC_MESSAGES" ; \
+ mkdir -p "$(srcdir)/vlc-${VERSION}/locale/$${i}/LC_MESSAGES" ; \
cp "$(srcdir)/po/$${i}.gmo" \
- "$(srcdir)/tmp/locale/$${i}/LC_MESSAGES/vlc.mo" || true ; \
+ "$(srcdir)/vlc-${VERSION}/locale/$${i}/LC_MESSAGES/vlc.mo" \
+ || true ; \
done
- mkdir -p $(srcdir)/tmp/skins/default
+ mkdir -p $(srcdir)/vlc-${VERSION}/skins/default
for i in $(srcdir)/share/skins/default/*.*; do \
- cp $$i $(srcdir)/tmp/skins/default/ || true ; \
+ cp $$i $(srcdir)/vlc-${VERSION}/skins/default/ || true ; \
done
for i in $(srcdir)/doc/skins/*.txt; do \
- cp $$i $(srcdir)/tmp/skins/ || true ; \
+ cp $$i $(srcdir)/vlc-${VERSION}/skins/ || true ; \
+ done
+ mkdir -p $(srcdir)/vlc-${VERSION}/skins2/fonts
+ for i in $(srcdir)/share/skins2/fonts/*.*; do \
+ cp $$i $(srcdir)/vlc-${VERSION}/skins2/fonts/ || true ; \
+ done
+ mkdir -p $(srcdir)/vlc-${VERSION}/skins2/default
+ for i in $(srcdir)/share/skins2/default/*.*; do \
+ cp $$i $(srcdir)/vlc-${VERSION}/skins2/default/ || true ; \
done
+ 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 -- /DVERSION=${VERSION} $(srcdir)/tmp/nsi
+ wine ~/.wine/fake_windows/Program\ Files/NSIS/makensis.exe \
+ -- /DVERSION=${VERSION} $(srcdir)/vlc-${VERSION}/nsi
+
+package-win32-base-zip:
+# Create package
+ zip -r vlc-${VERSION}-win32.zip vlc-${VERSION}
+
+package-win32-exe: package-win32-base package-win32-base-exe
+# Clean up
+ rm -Rf $(srcdir)/vlc-${VERSION}
+
+package-win32-zip: package-win32-base package-win32-base-zip
+# Clean up
+ rm -Rf $(srcdir)/vlc-${VERSION}
+
+package-win32: package-win32-base package-win32-base-exe package-win32-base-zip
# Clean up
- rm -Rf $(srcdir)/tmp
+ rm -Rf $(srcdir)/vlc-${VERSION}
package-beos:
# 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/
-# We cannot use ${PLUGIN_FILES}, it looks like it is too long for the BeOS shell...
+ 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
- mkdir -p $(srcdir)/tmp/vlc/share
- cp $(srcdir)/share/*.rle $(srcdir)/tmp/vlc/share/
-
-# 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
- strip $(srcdir)/tmp/vlc-${VERSION}/vlc
- if [ -d $(srcdir)/tmp/vlc-${VERSION}/plugins ]; then \
- strip $(srcdir)/tmp/vlc-${VERSION}/plugins/lib*_plugin.so; \
+
+# Strip files and create package
+ strip --strip-debug --strip-unneeded $(srcdir)/tmp/vlc/vlc ;
+ if [ -d $(srcdir)/tmp/vlc/plugins ]; then \
+ strip --strip-debug --strip-unneeded $(srcdir)/tmp/vlc/plugins/lib*_plugin.so ; \
fi
- xres -o $(srcdir)/tmp/vlc-${VERSION}/vlc $(srcdir)/share/vlc_beos.rsrc
- mimeset -f $(srcdir)/tmp/vlc-${VERSION}/* $(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
- @if test -e "$(srcdir)/tmp"; then \
- echo "Error: please remove $(srcdir)/tmp, it is in the way"; \
+ @if test -e "$(top_builddir)/tmp"; then \
+ echo "Error: please remove $(top_builddir)/tmp, it is in the way"; \
false; \
else \
- echo "OK."; mkdir -p "$(srcdir)/tmp"; \
+ echo "OK."; mkdir -p "$(top_builddir)/tmp"; \
fi
# Copy relevant files
- cp -R "$(srcdir)/VLC.app" "$(srcdir)/tmp/"
- cd "$(srcdir)" && cp AUTHORS COPYING ChangeLog README README.MacOSX.rtf THANKS NEWS tmp/
+ cp -R "$(top_builddir)/VLC.app" "$(top_builddir)/tmp/"
+ 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}" $(srcdir)/tmp/*
+ $(srcdir)/extras/MacOSX/macosx-dmg 25 "vlc-${VERSION}" $(top_builddir)/tmp/*
# Clean up
- rm -Rf $(srcdir)/tmp
-
-###############################################################################
-# Building the Mozilla plugin
-###############################################################################
-
-noinst_LIBRARIES = $(noinst_LIBRARIES_mozilla)
-
-MOSTLYCLEANFILES = $(LIBRARIES_mozilla)
+ rm -Rf $(top_builddir)/tmp
-EXTRA_DIST += $(SOURCES_mozilla) mozilla/vlcintf.idl
-
-BUILT_SOURCES += $(BUILT_SOURCES_mozilla)
-
-SOURCES_mozilla = \
- mozilla/vlcshell.cpp \
- mozilla/vlcplugin.cpp \
- mozilla/vlcplugin.h \
- mozilla/vlcpeer.cpp \
- mozilla/vlcpeer.h \
- mozilla/support/classinfo.h \
- $(SOURCES_mozilla_win32) \
- $(SOURCES_mozilla_macosx) \
- $(SOURCES_mozilla_unix) \
- $(NULL)
-
-# Under Win32, Mozilla plugins need to be named NP******.DLL, but under Unix
-# the common naming scheme is lib******plugin.so. Also, we need npwin.cpp
-# under Win32 and npunix.c under Unix.
-if HAVE_WIN32
-LIBRARIES_mozilla = mozilla/npvlc$(LIBEXT)
-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/support/npunix.c
-endif
-endif
+package-translations:
+ @if test -e "$(srcdir)/vlc-translations-${VERSION}"; then \
+ echo "Error: please remove $(srcdir)/vlc-translations-${VERSION}, it is in the way"; \
+ false; \
+ else \
+ echo "OK."; mkdir -p "$(srcdir)/vlc-translations-${VERSION}"; \
+ fi
+# Copy translations
+ for i in $(ALL_LINGUAS); do \
+ cp "$(srcdir)/po/$${i}.po" \
+ "$(srcdir)/vlc-translations-${VERSION}/$${i}.po" \
+ || true ; \
+ done
+ cp "$(srcdir)/doc/translations.txt" \
+ "$(srcdir)/vlc-translations-${VERSION}/README.txt"
-if BUILD_MOZILLA
-if UNTRUE
-noinst_LIBRARIES_mozilla = mozilla/libplugin.a
-endif
+ echo "#!/bin/sh" >>"$(srcdir)/vlc-translations-$(VERSION)/convert.po.sh"
+ echo "" >>"$(srcdir)/vlc-translations-$(VERSION)/convert.po.sh"
+ echo 'if test $$# != 1; then' >>"$(srcdir)/vlc-translations-$(VERSION)/convert.po.sh"
+ echo " echo \"Usage: convert-po.sh <.po file>\"" >>"$(srcdir)/vlc-translations-$(VERSION)/convert.po.sh"
+ echo " exit 1" >>"$(srcdir)/vlc-translations-$(VERSION)/convert.po.sh"
+ echo "fi" >>"$(srcdir)/vlc-translations-$(VERSION)/convert.po.sh"
+ echo "" >>"$(srcdir)/vlc-translations-$(VERSION)/convert.po.sh"
+ echo 'msgfmt --statistics -o vlc.mo $$1' >>"$(srcdir)/vlc-translations-$(VERSION)/convert.po.sh"
-mozilla_libplugin_a_SOURCES = $(SOURCES_mozilla)
-mozilla_libplugin_a_CFLAGS = `$(VLC_CONFIG) --cflags mozilla pic` \
- $(CPPFLAGS_mozilla_EXTRA) -Imozilla
-mozilla_libplugin_a_CXXFLAGS = `$(VLC_CONFIG) --cxxflags mozilla pic` \
- $(CPPFLAGS_mozilla_EXTRA) -Imozilla
-mozilla_libplugin_a_DEPENDENCIES = lib/libvlc_pic.a $(DATA_npvlc_rc) builtins_pic
-
-BUILT_SOURCES_mozilla = mozilla/vlcintf.h
-$(SOURCES_mozilla): mozilla/vlcintf.h
-
-mozilla_plugin_DATA = $(LIBRARIES_mozilla)
-mozilla_plugindir = $(libdir)/mozilla/plugins
-$(LIBRARIES_mozilla): $(mozilla_libplugin_a_OBJECTS) \
- $(mozilla_libplugin_a_DEPENDENCIES)
- $(CXXLINK) $(mozilla_libplugin_a_OBJECTS) $(DATA_npvlc_rc) \
- lib/libvlc_pic.a -shared \
- `$(VLC_CONFIG) --libs vlc mozilla builtin pic`
-
-mozilla_vlcintf_xpt_DATA = mozilla/vlcintf.xpt
-mozilla_vlcintf_xptdir = $(libdir)/mozilla/components
-mozilla/vlcintf.xpt: Makefile mozilla/vlcintf.idl
- $(XPIDL) -I/usr/share/idl/mozilla -m typelib \
- -o mozilla/vlcintf $(srcdir)/mozilla/vlcintf.idl
-
-mozilla/vlcintf.h: Makefile mozilla/vlcintf.idl
- $(XPIDL) -I/usr/share/idl/mozilla -m header \
- -o mozilla/vlcintf $(srcdir)/mozilla/vlcintf.idl
+ $(AMTAR) chof - $(srcdir)/vlc-translations-$(VERSION) \
+ | GZIP=$(GZIP_ENV) gzip -c >$(srcdir)/vlc-translations-$(VERSION).tar.gz
-if HAVE_WIN32
-DATA_npvlc_rc = $(noinst_mozilla_npvlc_rc_DATA)
-noinst_mozilla_npvlc_rc_DATA = mozilla/npvlc_rc.$(OBJEXT)
-noinst_mozilla_npvlc_rcdir = $(libdir)
-mozilla/npvlc_rc.$(OBJEXT): mozilla/npvlc_rc.rc
- $(WINDRES) --include-dir $(srcdir)/mozilla -i $< -o $@
-endif
-endif
+###############################################################################
+# Stamp rules
+###############################################################################
+clean: clean-stamp
+clean-stamp:
+ rm -f stamp-builtin
+
+stamp-builtin: FORCE
+ @for dep in "" `$(VLC_CONFIG) --target builtin`; do \
+ if test "$${dep}" -nt "$(top_builddir)/vlc$(EXEEXT)"; then \
+ rm -f $@; \
+ break; \
+ fi; \
+ done
+ @if test ! -f $@; then printf "" > $@; fi
###############################################################################
# Force rule
projects / vlc / blobdiff