# which have makefiles with distribution information.
# - src (libvlc) is nedeed by modules, mozilla and bindings
# - libs/* are needed by modules
-BASE_SUBDIRS = po src bin modules share doc test
+BASE_SUBDIRS = po compat src bin modules share doc test
EXTRA_SUBDIRS = m4 extras/package/ipkg \
libs/loader libs/srtp libs/unzip \
projects/mozilla projects/activex
DIST_SUBDIRS = $(BASE_SUBDIRS) $(EXTRA_SUBDIRS)
-SUBDIRS = po src
+SUBDIRS = po compat src
if LOADER
SUBDIRS += libs/loader
endif
SUBDIRS += libs/srtp
endif
if HAVE_ZLIB
+if !HAVE_MINIZIP
SUBDIRS += libs/unzip
endif
+endif
if BUILD_VLC
SUBDIRS += bin
endif
ChangeLog: Makefile.am
rm -f -- "$@"
cd doc && $(MAKE) $(AM_MAKEFLAGS) changelogs
- ln -sf doc/ChangeLog-2008 "$@"
+ ln -sf doc/ChangeLog-2009 "$@"
###############################################################################
# MacOS X project
###############################################################################
EXTRA_DIST += \
- extras/package/macosx/Resources/English.lproj/MainMenu.nib/classes.nib \
- extras/package/macosx/Resources/English.lproj/MainMenu.nib/info.nib \
+ extras/package/macosx/Resources/English.lproj/MainMenu.nib/designable.nib \
extras/package/macosx/Resources/English.lproj/MainMenu.nib/keyedobjects.nib \
extras/package/macosx/Resources/English.lproj/MediaInfo.nib/classes.nib \
extras/package/macosx/Resources/English.lproj/MediaInfo.nib/info.nib \
extras/package/macosx/Resources/English.lproj/Update.nib/classes.nib \
extras/package/macosx/Resources/English.lproj/Update.nib/info.nib \
extras/package/macosx/Resources/English.lproj/Update.nib/keyedobjects.nib \
- extras/package/macosx/Resources/English.lproj/Interaction.nib/classes.nib \
- extras/package/macosx/Resources/English.lproj/Interaction.nib/info.nib \
- extras/package/macosx/Resources/English.lproj/Interaction.nib/keyedobjects.nib \
- extras/package/macosx/Resources/English.lproj/InteractionErrorPanel.nib/classes.nib \
- extras/package/macosx/Resources/English.lproj/InteractionErrorPanel.nib/info.nib \
- extras/package/macosx/Resources/English.lproj/InteractionErrorPanel.nib/keyedobjects.nib \
+ extras/package/macosx/Resources/English.lproj/CoreDialogs.nib/classes.nib \
+ extras/package/macosx/Resources/English.lproj/CoreDialogs.nib/info.nib \
+ extras/package/macosx/Resources/English.lproj/CoreDialogs.nib/keyedobjects.nib \
+ extras/package/macosx/Resources/English.lproj/ErrorPanel.nib/classes.nib \
+ extras/package/macosx/Resources/English.lproj/ErrorPanel.nib/info.nib \
+ extras/package/macosx/Resources/English.lproj/ErrorPanel.nib/keyedobjects.nib \
extras/package/macosx/Resources/English.lproj/InfoPlist.strings.in \
- extras/package/macosx/Resources/a52.icns \
- extras/package/macosx/Resources/aac.icns \
- extras/package/macosx/Resources/asf.icns \
- extras/package/macosx/Resources/asx.icns \
+ extras/package/macosx/Resources/aiff.icns \
+ extras/package/macosx/Resources/audio.icns \
extras/package/macosx/Resources/avi.icns \
- extras/package/macosx/Resources/bin.icns \
- extras/package/macosx/Resources/cue.icns \
- extras/package/macosx/Resources/dat.icns \
- extras/package/macosx/Resources/divx.icns \
- extras/package/macosx/Resources/dv.icns \
+ extras/package/macosx/Resources/flv.icns \
extras/package/macosx/Resources/generic.icns \
- extras/package/macosx/Resources/m3u.icns \
+ extras/package/macosx/Resources/m4a.icns \
+ extras/package/macosx/Resources/m4v.icns \
+ extras/package/macosx/Resources/mkv.icns \
extras/package/macosx/Resources/mov.icns \
+ extras/package/macosx/Resources/movie.icns \
extras/package/macosx/Resources/mp3.icns \
- extras/package/macosx/Resources/mp4.icns \
extras/package/macosx/Resources/mpeg.icns \
- extras/package/macosx/Resources/mpeg1.icns \
- extras/package/macosx/Resources/mpeg2.icns \
- extras/package/macosx/Resources/mpeg4.icns \
- extras/package/macosx/Resources/mpg.icns \
extras/package/macosx/Resources/ogg.icns \
- extras/package/macosx/Resources/ogm.icns \
- extras/package/macosx/Resources/pls.icns \
- extras/package/macosx/Resources/srt.icns \
- extras/package/macosx/Resources/sub.icns \
- extras/package/macosx/Resources/vlc.icns \
+ extras/package/macosx/Resources/playlist.icns \
+ extras/package/macosx/Resources/rm.icns \
+ extras/package/macosx/Resources/subtitle.icns \
extras/package/macosx/Resources/vob.icns \
+ extras/package/macosx/Resources/wav.icns \
+ extras/package/macosx/Resources/vlc.icns \
extras/package/macosx/Resources/wma.icns \
extras/package/macosx/Resources/wmv.icns \
extras/package/macosx/Resources/pause.png \
extras/package/macosx/Resources/skip_previous_graphite.png \
extras/package/macosx/Resources/stop_graphite.png \
extras/package/macosx/Resources/volumeslider_graphite.png \
+ extras/package/macosx/Resources/backward_big_down.png \
+ extras/package/macosx/Resources/backward_big.png \
+ extras/package/macosx/Resources/eq_sm.pdf \
+ extras/package/macosx/Resources/forward_big_down.png \
+ extras/package/macosx/Resources/forward_big.png \
+ extras/package/macosx/Resources/fs_sm.pdf \
+ extras/package/macosx/Resources/list_sm.pdf \
+ extras/package/macosx/Resources/next_sm.pdf \
+ extras/package/macosx/Resources/pause_big_down.png \
+ extras/package/macosx/Resources/pause_big.png \
+ extras/package/macosx/Resources/play_big_down.png \
+ extras/package/macosx/Resources/play_big.png \
+ extras/package/macosx/Resources/prev_sm.pdf \
+ extras/package/macosx/Resources/sidebarAdd.png \
+ extras/package/macosx/Resources/sidebarRepeat.png \
+ extras/package/macosx/Resources/sidebarRepeatOn.png \
+ extras/package/macosx/Resources/sidebarRepeatOneOn.png \
+ extras/package/macosx/Resources/sidebarResizeWidget.png \
+ extras/package/macosx/Resources/sidebarShuffle.png \
+ extras/package/macosx/Resources/sidebarShuffleOn.png \
+ extras/package/macosx/Resources/sidebarStatusAreaBackground.png \
+ extras/package/macosx/Resources/stop_sm.pdf \
extras/package/macosx/Resources/noart.png \
extras/package/macosx/Resources/spref_cone_Audio_64.png \
extras/package/macosx/Resources/spref_cone_Hotkeys_64.png \
extras/package/macosx/plugin/InstallerInfo.plist.in \
extras/package/macosx/plugin/InstallerDescription.plist \
extras/package/macosx/plugin/pbdevelopment.plist \
- extras/package/macosx/plugin/English.lproj/InfoPlist.strings.in \
extras/package/macosx/eyetvplugin/EyeTVPluginDefs.h \
extras/package/macosx/eyetvplugin/Info.plist \
extras/package/macosx/eyetvplugin/eyetvplugin.c \
touch $@
CLEANFILES = $(BUILT_SOURCES_clean)
-DISTCLEANFILES = $(BUILT_SOURCES_distclean) vlc-config.in compile ChangeLog
+DISTCLEANFILES = $(BUILT_SOURCES_distclean) vlc-config.in compile
+MAINTAINERCLEANFILES = ChangeLog
# Shortcut for developpers to rebuild the core (libvlc + vlc)
# Don't use it if you don't know what it is about.
noinst_SCRIPTS += vlc$(EXEEXT)
endif
-vlc$(EXEEXT): Makefile.am
- rm -f -- vlc vlc.tmp
- echo '#! /bin/sh' > vlc.tmp
- echo 'exec "$$(dirname "$$0")/bin/vlc-static$(EXEEXT)" "--plugin-path=$$(dirname "$$0")/modules" "$$@"' >> vlc.tmp
- chmod +x vlc.tmp
- mv -f -- vlc.tmp vlc
+vlc$(EXEEXT):
+ ln -sf bin/vlc-static$(EXEEXT) vlc$(EXEEXT)
if HAVE_DARWIN
if BUILD_VLC
bookmarks.m \
update.h \
update.m \
- interaction.h \
- interaction.m \
+ coredialogs.h \
+ coredialogs.m \
embeddedwindow.h \
embeddedwindow.m \
fspanel.h \
find $(top_builddir)/VLC-release.app -type f -exec chmod ugo+r '{}' \;
# This is just for development purposes.
-# The resulting VLC.app will only in this tree.
+# The resulting VLC.app will only run in this tree.
VLC.app: vlc $(top_builddir)/src/.libs/libvlccore.dylib $(top_builddir)/src/.libs/libvlc.dylib
(cd src && make install)
rm -Rf $(top_builddir)/tmp
bookmarks.m \
update.h \
update.m \
- interaction.h \
- interaction.m \
+ coredialogs.h \
+ coredialogs.m \
embeddedwindow.h \
embeddedwindow.m \
fspanel.h \
## Win ##
############################################################################
win32_destdir=$(top_builddir)/vlc-$(VERSION)
+win32_debugdir=$(top_builddir)/symbols-$(VERSION)
+npvlc=vlc-$(VERSION)/mozilla/npvlc$(LIBEXT)
+axvlc=vlc-$(VERSION)/activex/axvlc$(LIBEXT)
win32_lua_destdir=$(win32_destdir)/lua
win32_http_destdir=$(win32_destdir)/http
for i in $(top_builddir)/share/skins2/*.*; do \
cp -- "$$i" $(win32_destdir)/skins/ || true ; \
done
+ cp -- $(srcdir)/share/skins2/skin.catalog $(win32_destdir)/skins/ || true ;
+ cp -- $(srcdir)/share/skins2/skin.dtd $(win32_destdir)/skins/ || true ;
endif
if BUILD_OSDMENU
#strip exe and main dll
package-win-common-strip: package-win32-base-debug
+ @if test -e "$(win32_debugdir)"; then \
+ echo "Error: please remove $(win32_debugdir), it is in the way"; \
+ false; \
+ else \
+ echo "OK."; mkdir -p "$(win32_debugdir)"; \
+ fi
for i in "" vlc-$(VERSION)/*$(LIBEXT) ; \
- do if test -n "$$i" ; then $(STRIP) "$$i" ; fi; done
+ do if test -n "$$i" ; then \
+ $(OBJCOPY) --only-keep-debug "$$i" "$$i.dbg"; \
+ $(OBJCOPY) --strip-debug "$$i" ; \
+ $(OBJCOPY) --add-gnu-debuglink="$$i.dbg" "$$i" ; \
+ mv "$$i.dbg" "$(win32_debugdir)"; \
+ fi; done
+
if BUILD_MOZILLA
- $(STRIP) "vlc-$(VERSION)/mozilla/npvlc$(LIBEXT)"
+ $(OBJCOPY) --only-keep-debug "$(npvlc)" "$(npvlc).dbg"
+ $(OBJCOPY) --strip-debug "$(npvlc)"
+ $(OBJCOPY) --add-gnu-debuglink="$(npvlc).dbg" "$(npvlc)"
+ mv "$(npvlc).dbg" "$(win32_debugdir)"
endif
if BUILD_ACTIVEX
- $(STRIP) "vlc-$(VERSION)/activex/axvlc$(LIBEXT)"
+ $(OBJCOPY) --only-keep-debug "$(axvlc)" "$(axvlc).dbg"
+ $(OBJCOPY) --strip-debug "$(axvlc)"
+ $(OBJCOPY) --add-gnu-debuglink="$(axvlc).dbg" "$(axvlc)"
+ mv "$(axvlc).dbg" "$(win32_debugdir)"
endif
#strip all plugins dll
package-win32-base: package-win-common-strip
for i in "" $(win32_destdir)/plugins/*$(LIBEXT) ; \
- do if test -n "$$i" ; then $(STRIP) "$$i" ; fi ; done
+ do if test -n "$$i" ; then \
+ $(OBJCOPY) --only-keep-debug "$$i" "$$i.dbg"; \
+ $(OBJCOPY) --strip-debug "$$i" ; \
+ $(OBJCOPY) --add-gnu-debuglink="$$i.dbg" "$$i" ; \
+ mv "$$i.dbg" "$(win32_debugdir)"; \
+ fi ; done
package-win32-base-exe: package-win32-base
# Create package
###############################################################################
# PO translation files update
-# Generate po/POTFILES.in which lists all the files containing translatable
-# strings. Find all source files and remove the generated files
###############################################################################
.PHONY: update-po
update-po:
- rm -f $(top_srcdir)/po/POTFILES.in
- { \
- cd $(top_srcdir) && \
- echo "# automatically created by make update-po" ; \
- echo "" ; \
- echo "# main sources" ; \
- find include src -name '*.[chm]' -o -name '*.[ch]pp' \
- | grep -v '\(misc/modules_\|src/misc/revision.c\|modules/builtin.h\|include/vlc_about.h\)' \
- | sort ; \
- echo "" ; \
- echo "# modules" ; \
- find modules -name '*.[chm]' -o -name '*.[ch]pp' -o -name '*.ui' \
- | grep -v '\(\.moc\.\|gui/gtk2/\)' \
- | grep -vE 'qt4/ui/.*.h' \
- | grep -v 'qt4/resources.cpp\|qt4/dialogs/about.hpp' \
- | grep -v 'gui/opie' \
- | grep -v 'wxwidgets' \
- | grep -v 'mux/rtp/' \
- | grep -v 'demux/rtpxiph.c' \
- | sort ; \
- } > $(top_srcdir)/po/POTFILES.in
- rm -f $(top_srcdir)/po/vlc.pot
cd po && $(MAKE) POTFILES vlc.pot update-po
-#cd po && $(MAKE) update-po
###############################################################################
# Enforce Mac OS X deployment target environment variable