1.0.0-pre2: RC1 shouldn't be far away, is it?

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 378b34affe9e17f18e6c67c49b2ebb97945f2209..4224ba7a2ada87592c26685ccca7a959eeff288f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,13 +7,13 @@
 # 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
@@ -120,12 +120,12 @@ EXTRA_DIST += \
        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 \
@@ -466,8 +466,8 @@ VLC-release.app: vlc
            bookmarks.m \
            update.h \
            update.m \
-           interaction.h \
-           interaction.m \
+           coredialogs.h \
+           coredialogs.m \
            embeddedwindow.h \
            embeddedwindow.m \
            fspanel.h \
@@ -575,7 +575,7 @@ VLC-release.app: vlc
        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
@@ -633,8 +633,8 @@ VLC.app: vlc $(top_builddir)/src/.libs/libvlccore.dylib $(top_builddir)/src/.lib
            bookmarks.m \
            update.h \
            update.m \
-           interaction.h \
-           interaction.m \
+           coredialogs.h \
+           coredialogs.m \
            embeddedwindow.h \
            embeddedwindow.m \
            fspanel.h \
@@ -1208,37 +1208,12 @@ package-translations:
 
 ###############################################################################
 # 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