# which have makefiles with distribution information.
# - 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/bindings because the plugin needs libvlc_pic.a
+# - . should come before mozilla/bindings because the plugin needs libvlc.a
# - po should come before . because VLC.app needs the pofiles
# - loader should come before modules because some plugins need it
SUBDIRS = intl loader src modules po . mozilla bindings activex share m4 doc
-DIST_SUBDIRS = $(SUBDIRS) debian ipkg
+DIST_SUBDIRS = $(SUBDIRS) ipkg
EXTRA_DIST = \
HACKING \
toolbox \
vlc-api.pl \
vlc-config.in.in \
- vlc.spec \
- vlc.spec.mdk \
+ vlc.fedora.spec \
+ vlc.mandriva.spec \
+ vlc.altlinux.spec \
vlc.win32.nsi.in \
$(NULL)
SUFFIXES =
DISTCHECK_CONFIGURE_FLAGS = --disable-dvd --disable-mad --disable-libmpeg2 \
- --disable-ffmpeg --disable-faad --disable-skins2
-if USE_LIBTOOL
-DISTCHECK_CONFIGURE_FLAGS += --enable-libtool
-endif
+ --disable-ffmpeg --disable-faad --disable-wxwidgets --disable-skins2
# Tell aclocal to use -I m4. Wonder if it really works.
ACLOCAL_AMFLAGS = -I m4
-# XXX: these flags could be set in configure.ac, but we set them here
-# because old versions of automake don't support them in configure.ac.
-AUTOMAKE_OPTIONS = dist-bzip2
-
###############################################################################
# MacOS X project
###############################################################################
extras/MacOSX/Resources/English.lproj/Interaction.nib/classes.nib \
extras/MacOSX/Resources/English.lproj/Interaction.nib/info.nib \
extras/MacOSX/Resources/English.lproj/Interaction.nib/keyedobjects.nib \
+ extras/MacOSX/Resources/English.lproj/InteractionErrorPanel.nib/classes.nib \
+ extras/MacOSX/Resources/English.lproj/InteractionErrorPanel.nib/info.nib \
+ extras/MacOSX/Resources/English.lproj/InteractionErrorPanel.nib/keyedobjects.nib \
extras/MacOSX/Resources/English.lproj/InfoPlist.strings \
extras/MacOSX/Resources/a52.icns \
extras/MacOSX/Resources/aac.icns \
extras/MacOSX/Resources/vlc.scriptSuite \
extras/MacOSX/Resources/vlc.scriptTerminology \
extras/MacOSX/Resources/README \
+ extras/MacOSX/Resources/add_embedded.png \
+ extras/MacOSX/Resources/add_embedded_blue.png \
+ extras/MacOSX/Resources/repeat_embedded.png \
+ extras/MacOSX/Resources/repeat_embedded_blue.png \
+ extras/MacOSX/Resources/repeat_single_embedded_blue.png \
+ extras/MacOSX/Resources/shuffle_embedded.png \
+ extras/MacOSX/Resources/shuffle_embedded_blue.png \
+ extras/MacOSX/Resources/fs_volume_slider_knob_highlight.png \
+ extras/MacOSX/Resources/fs_volume_slider_knob.png \
+ extras/MacOSX/Resources/fs_volume_slider_bar.png \
+ extras/MacOSX/Resources/fs_volume_mute_highlight.png \
+ extras/MacOSX/Resources/fs_volume_mute.png \
+ extras/MacOSX/Resources/fs_volume_max_highlight.png \
+ extras/MacOSX/Resources/fs_volume_max.png \
+ extras/MacOSX/Resources/fs_time_slider_knob_highlight.png \
+ extras/MacOSX/Resources/fs_time_slider_knob.png \
+ extras/MacOSX/Resources/fs_time_slider.png \
+ extras/MacOSX/Resources/fs_stop_highlight.png \
+ extras/MacOSX/Resources/fs_stop.png \
+ extras/MacOSX/Resources/fs_skip_previous_highlight.png \
+ extras/MacOSX/Resources/fs_skip_previous.png \
+ extras/MacOSX/Resources/fs_skip_next_highlight.png \
+ extras/MacOSX/Resources/fs_skip_next.png \
+ extras/MacOSX/Resources/fs_rewind_highlight.png \
+ extras/MacOSX/Resources/fs_rewind.png \
+ extras/MacOSX/Resources/fs_play_highlight.png \
+ extras/MacOSX/Resources/fs_play.png \
+ extras/MacOSX/Resources/fs_pause_highlight.png \
+ extras/MacOSX/Resources/fs_pause.png \
+ extras/MacOSX/Resources/fs_forward_highlight.png \
+ extras/MacOSX/Resources/fs_forward.png \
+ extras/MacOSX/Resources/fs_exit_fullscreen_highlight.png \
+ extras/MacOSX/Resources/fs_exit_fullscreen.png \
+ extras/MacOSX/Resources/fs_background.png \
+ extras/MacOSX/fullscreen_panel.svg \
extras/MacOSX/vlc.pbproj/project.pbxproj \
extras/MacOSX/Delete_Preferences.app/Contents/Info.plist \
extras/MacOSX/Delete_Preferences.app/Contents/PkgInfo \
extras/MacOSX/Delete_Preferences.app/Contents/Resources/applet.icns \
extras/MacOSX/Delete_Preferences.app/Contents/Resources/applet.rsrc \
extras/MacOSX/Delete_Preferences.app/Contents/Resources/Scripts/main.scpt \
+ extras/MacOSX/plugin/Info.plist \
+ extras/MacOSX/plugin/InstallerInfo.plist \
+ extras/MacOSX/plugin/InstallerDescription.plist \
+ extras/MacOSX/plugin/pbdevelopment.plist \
+ extras/MacOSX/plugin/English.lproj/InfoPlist.strings \
$(NULL)
###############################################################################
-# Various utilities ( editor syntax files, ... )
+# Various utilities ( editor syntax files, D-Bus controller ... )
##############################################################################
EXTRA_DIST += \
extras/Makefile \
extras/vlc.vim \
extras/make.pl \
extras/valgrind.suppressions \
+ extras/m4/autoconf260.m4 \
+ extras/dbus-vlc.py \
+ extras/dbus-vlc.glade \
$(NULL)
###############################################################################
vlc-config: $(top_builddir)/config.status $(top_builddir)/vlc-config.in
$(SHELL) ./config.status --file=$@
chmod 0755 $@
+ touch $@
vlc-config.in: vlc-config.in.in
./config.status --recheck
+ touch $@
CLEANFILES = $(BUILT_SOURCES_clean) stamp-builtin
DISTCLEANFILES = $(BUILT_SOURCES_distclean) vlc-config.in compile
vlc_CFLAGS = `$(VLC_CONFIG) --cflags vlc`
if USE_LIBTOOL
-vlc_LDFLAGS = `$(VLC_CONFIG) --libs vlc`
LIB_libvlc = libvlc.la
LIBVLC = src/$(LIB_libvlc)
+vlc_LDFLAGS =
else
if BUILD_SHARED
vlc_LDFLAGS = `$(VLC_CONFIG) --libs vlc` -Wl,-rpath $(libdir) -L$(top_builddir)/src -lvlc
# Shortcut for developpers to rebuild the core (libvlc + vlc)
# Don't use it if you don't know what it is about.
# Don't complain if it doesn't work. -- Courmisch
-core:
- rm -f src/$(LIB_libvlc)
+libvlc:
+ cd src && $(MAKE) $(AM_MAKEFLAGS) $(LIB_libvlc)
+
+core: libvlc
$(MAKE) $(AM_MAKEFLAGS) vlc$(EXEEXT)
-.PHONY: core
+.PHONY: libvlc core
-src/$(LIB_libvlc):
- cd src && $(MAKE) $(AM_MAKEFLAGS) $(LIB_libvlc)
+src/$(LIB_libvlc): libvlc
vlc$(EXEEXT): $(vlc_OBJECTS) $(DEPENDENCIES_vlc)
@rm -f vlc$(EXEEXT)
endif
# Install the symlinks
-install-exec-local:
+install-exec-local: install-binPROGRAMS
for i in "" $(ALIASES) ; do if test -n "$$i" ; then \
rm -f "$(DESTDIR)$(bindir)/$$i" && \
ln -sf vlc "$(DESTDIR)$(bindir)/$$i" ; \
mkdir -p $(top_builddir)/tmp/modules/audio_output
mkdir -p $(top_builddir)/tmp/modules/gui/macosx
for i in \
+ AppleRemote.h \
+ AppleRemote.m \
about.h \
about.m \
applescript.h \
interaction.m \
embeddedwindow.h \
embeddedwindow.m \
+ fspanel.h \
+ fspanel.m \
vout.m; do \
cp "$(srcdir)/modules/gui/macosx/$$i" \
$(top_builddir)/tmp/modules/gui/macosx; \
done
- case $(target_triplet) in \
- *darwin6*) cd $(top_builddir)/tmp/extras/MacOSX && pbxbuild -target vlc | grep -v '^\([ \t]\|$$\)'; \
- cd ../../../; \
+ case $(host_os) in \
+ *darwin6*) cd $(top_builddir)/tmp/extras/MacOSX && pbxbuild -target vlc | grep -v '^\([ \t]\|$$\)' && \
+ cd ../../../ && \
cp -R $(top_builddir)/tmp/extras/MacOSX/build/VLC.bundle \
$(top_builddir)/VLC-release.app;; \
- *darwin7*) cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)'; \
- cd ../../../; \
+ *darwin7*) cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)' && \
+ cd ../../../ && \
cp -R $(top_builddir)/tmp/extras/MacOSX/build/VLC.bundle \
$(top_builddir)/VLC-release.app;; \
- *darwin8*) cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)'; \
- cd ../../../; \
+ *darwin8*) cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)' && \
+ cd ../../../ && \
cp -R $(top_builddir)/tmp/extras/MacOSX/build/Default/VLC.bundle \
$(top_builddir)/VLC-release.app;; \
esac
mkdir -p $(top_builddir)/tmp/modules/audio_output
mkdir -p $(top_builddir)/tmp/modules/gui/macosx
for i in \
+ AppleRemote.h \
+ AppleRemote.m \
about.h \
about.m \
applescript.h \
interaction.m \
embeddedwindow.h \
embeddedwindow.m \
+ fspanel.h \
+ fspanel.m \
vout.m; do \
cp "$(srcdir)/modules/gui/macosx/$$i" \
$(top_builddir)/tmp/modules/gui/macosx; \
done
- case $(target_triplet) in \
- *darwin6*) cd $(top_builddir)/tmp/extras/MacOSX && pbxbuild -target vlc | grep -v '^\([ \t]\|$$\)'; \
- cd ../../../; \
+ case $(host_os) in \
+ *darwin6*) cd $(top_builddir)/tmp/extras/MacOSX && pbxbuild -target vlc | grep -v '^\([ \t]\|$$\)'&& \
+ cd ../../../ && \
cp -R $(top_builddir)/tmp/extras/MacOSX/build/VLC.bundle \
$(top_builddir)/VLC.app;; \
- *darwin7*) cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)'; \
- cd ../../../; \
+ *darwin7*) cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)'&& \
+ cd ../../../ && \
cp -R $(top_builddir)/tmp/extras/MacOSX/build/VLC.bundle \
$(top_builddir)/VLC.app;; \
- *darwin8*) cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)'; \
- cd ../../../; \
+ *darwin8*) cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)' && \
+ cd ../../../ && \
cp -R $(top_builddir)/tmp/extras/MacOSX/build/Default/VLC.bundle \
$(top_builddir)/VLC.app;; \
esac
if BUILD_MOZILLA
mkdir -p "$(top_builddir)/vlc-${VERSION}/mozilla"
cp $(top_builddir)/mozilla/*$(LIBEXT) $(top_builddir)/vlc-${VERSION}/mozilla/ ;
- cp $(top_builddir)/mozilla/vlcintf.xpt $(top_builddir)/vlc-${VERSION}/mozilla/ ;
endif
if BUILD_ACTIVEX
package-win32-base-zip: package-win32-base
# Create package
- zip -r vlc-${VERSION}-win32.zip vlc-${VERSION}
+ zip -r -9 vlc-${VERSION}-win32.zip vlc-${VERSION}
package-win32-base-7zip: package-win32-base
# Create package
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-debug.zip vlc-${VERSION} )
+ (cd $(srcdir)/tmp && zip -9 -r vlc-${VERSION}-BeOS-debug.zip vlc-${VERSION} )
mv $(srcdir)/tmp/vlc-${VERSION}-BeOS-debug.zip $(srcdir)/ ;
mv $(srcdir)/tmp/vlc-${VERSION} $(srcdir)/tmp/vlc ;
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} )
+ (cd $(srcdir)/tmp && zip -9 -r vlc-${VERSION}-BeOS.zip vlc-${VERSION} )
mv $(srcdir)/tmp/vlc-${VERSION}-BeOS.zip $(srcdir)/ ;
# Clean up
mkdir -p "$(top_builddir)/vlc-${VERSION}/";
# Copy relevant files
- cp -R "$(top_builddir)/VLC-release.app" "$(top_builddir)/vlc-${VERSION}/VLC.app"
+ @if test -e "$(top_builddir)/VLC-release.app/"; then \
+ cp -R "$(top_builddir)/VLC-release.app" "$(top_builddir)/vlc-${VERSION}/VLC.app"; \
+ else \
+ cp -R "$(top_builddir)/VLC.app" "$(top_builddir)/vlc-${VERSION}/VLC.app"; \
+ fi
cd "$(srcdir)" && cp AUTHORS COPYING ChangeLog README README.MacOSX.rtf THANKS NEWS $(top_builddir)/vlc-${VERSION}/ && cp -R extras/MacOSX/Delete_Preferences.app $(top_builddir)/vlc-${VERSION}/
# Create disk image
# Clean up
rm -Rf "$(top_builddir)/vlc-${VERSION}" ;
+package-macosx-plugin:
+if BUILD_MOZILLA
+# Create Installer
+ rm -rf "$(top_builddir)/macosx-plugin-instdata/"; true
+ mkdir -p "$(top_builddir)/macosx-plugin-instdata"
+ cp -R "$(top_builddir)/mozilla/VLC Plugin.plugin" "$(top_builddir)/macosx-plugin-instdata"
+ rm -rf "$(top_builddir)/VLC Internet Plug-In.pkg"
+ /Developer/Tools/packagemaker -build -ds -p "$(top_builddir)/VLC Internet Plug-In.pkg" \
+ -f "$(top_builddir)/macosx-plugin-instdata" \
+ -i "$(srcdir)/extras/MacOSX/plugin/InstallerInfo.plist" \
+ -d "$(srcdir)/extras/MacOSX/plugin/InstallerDescription.plist"; true
+ rm -rf "$(top_builddir)/macosx-plugin-instdata/"
+
+# Create disk image
+ rm -f "$(top_builddir)/vlc-plugin-${VERSION}.dmg"; true
+ rm -rf "$(top_builddir)/vlc-plugin-${VERSION}/"; true
+ mkdir -p "$(top_builddir)/vlc-plugin-${VERSION}/"
+ mv "$(top_builddir)/VLC Internet Plug-In.pkg" "$(top_builddir)/vlc-plugin-${VERSION}/"
+ hdiutil create -srcfolder "$(top_builddir)/vlc-plugin-${VERSION}" \
+ "$(top_builddir)/vlc-plugin-${VERSION}.dmg" -format UDZO \
+ -scrub -imagekey zlib-level=9 ;
+ echo "Disk image creation completed:"
+ rm -rf "$(top_builddir)/vlc-plugin-${VERSION}"
+endif
+
package-translations:
@if test -e "$(srcdir)/vlc-translations-${VERSION}"; then \
echo "Error: please remove $(srcdir)/vlc-translations-${VERSION}, it is in the way"; \
update-po:
rm -f $(top_srcdir)/po/POTFILES.in
{ \
- cd $(top_srcdir) ; \
+ cd $(top_srcdir) && \
echo "# automatically created by make update-po" ; \
echo "" ; \
echo "# main sources" ; \
| sort ; \
echo "" ; \
echo "# modules" ; \
- find modules -name '*.[chm]' -o -name '*.[ch]pp' \
+ find modules -name '*.[chm]' -o -name '*.[ch]pp' -o -wholename 'modules/gui/qt4/ui/*.ui'\
| grep -v '\(\.moc\.\|gui/gtk2/\)' \
+ | grep -vE 'qt4/ui/.*.h' |grep -v qt4/resources.cpp \
| sort ; \
} > $(top_srcdir)/po/POTFILES.in
rm -f $(top_srcdir)/po/vlc.pot