]> git.sesse.net Git - vlc/blobdiff - Makefile.am
projects / vlc / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
* modules/gui/wxwidgets: display and resizing of the embedded playlist should behave...
[vlc] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index dab015ae2f9e2010f66d62e61b425b7c2fb04dd1..70d213ab70a220de0076df0907dae53144ea671f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,10 +9,10 @@ NULL =
 # 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 because the plugin needs libvlc_pic.a
+#  - . should come before mozilla/bindings because the plugin needs libvlc_pic.a
 #  - po should come before . because VLC.app needs the pofiles
 #  - loader should come before modules because some plugins need it
-SUBDIRS = intl loader modules po . mozilla activex share m4 doc
+SUBDIRS = intl loader modules po . mozilla bindings activex share m4 doc
 DIST_SUBDIRS = $(SUBDIRS) debian ipkg lib
 
 EXTRA_DIST = \
@@ -181,9 +181,9 @@ EXTRA_DIST += \
        extras/MacOSX/Resources/English.lproj/Extended.nib/classes.nib \
        extras/MacOSX/Resources/English.lproj/Extended.nib/info.nib \
        extras/MacOSX/Resources/English.lproj/Extended.nib/keyedobjects.nib \
-       extras/MacOSX/Resources/English.lproj/Update.nib/classes.nib \
-       extras/MacOSX/Resources/English.lproj/Update.nib/info.nib \
-       extras/MacOSX/Resources/English.lproj/Update.nib/keyedobjects.nib \
+       extras/MacOSX/Resources/English.lproj/SFilters.nib/classes.nib \
+       extras/MacOSX/Resources/English.lproj/SFilters.nib/info.nib \
+       extras/MacOSX/Resources/English.lproj/SFilters.nib/keyedobjects.nib \
        extras/MacOSX/Resources/English.lproj/InfoPlist.strings \
        extras/MacOSX/Resources/a52.icns \
        extras/MacOSX/Resources/aac.icns \
@@ -248,7 +248,13 @@ EXTRA_DIST += \
        extras/MacOSX/Resources/README \
        extras/MacOSX/vlc.pbproj/project.pbxproj \
        extras/MacOSX/macosx-dmg \
-       \
+       extras/MacOSX/Delete_Preferences.app/Contents/Info.plist \
+       extras/MacOSX/Delete_Preferences.app/Contents/PkgInfo \
+       extras/MacOSX/Delete_Preferences.app/Contents/MacOS/applet \
+       extras/MacOSX/Delete_Preferences.app/Contents/Resources/description.rtfd/TXT.rtf \
+       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/Makefile \
        extras/zsh.cpp \
        $(NULL)
@@ -296,13 +302,10 @@ DISTCLEANFILES = $(BUILT_SOURCES_distclean) vlc-config.in
 if HAVE_WIN32
 lib_LIBRARIES = lib/libvlc.a
 else
-if BUILD_SHARED
-lib_LIBRARIES = lib/libvlc_pic.a
-else
 lib_LIBRARIES = lib/libvlc.a
-if BUILD_MOZILLA
+if BUILD_PIC
 lib_LIBRARIES += lib/libvlc_pic.a
-endif
+else
 endif
 endif
 
@@ -566,7 +569,7 @@ VLC-release.app: vlc
          echo "OK."; mkdir -p "$(top_builddir)/tmp/extras"; \
        fi
        rm -Rf $(top_builddir)/VLC-release.app
-       cp -r $(srcdir)/extras/MacOSX $(top_builddir)/tmp/extras
+       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
@@ -609,8 +612,8 @@ VLC-release.app: vlc
            extended.m \
            bookmarks.h \
            bookmarks.m \
-           update.h \
-           update.m \
+           sfilters.h \
+           sfilters.m \
            vout.m; do \
          cp "$(srcdir)/modules/gui/macosx/$$i" \
              $(top_builddir)/tmp/modules/gui/macosx; \
@@ -618,15 +621,15 @@ VLC-release.app: vlc
        case $(target_triplet) 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 \
+           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 ../../../; \
-           cp -r $(top_builddir)/tmp/extras/MacOSX/build/VLC.bundle \
+           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 ../../../; \
-           cp -r $(top_builddir)/tmp/extras/MacOSX/build/Default/VLC.bundle \
+           cp -R $(top_builddir)/tmp/extras/MacOSX/build/Default/VLC.bundle \
                  $(top_builddir)/VLC-release.app;; \
        esac
        rm -Rf $(top_builddir)/tmp
@@ -682,7 +685,7 @@ VLC.app: vlc
          echo "OK."; mkdir -p "$(top_builddir)/tmp/extras"; \
        fi
        rm -Rf $(top_builddir)/VLC.app
-       cp -r $(srcdir)/extras/MacOSX $(top_builddir)/tmp/extras
+       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
@@ -725,8 +728,8 @@ VLC.app: vlc
            extended.m \
            bookmarks.h \
            bookmarks.m \
-           update.h \
-           update.m \
+           sfilters.h \
+           sfilters.m \
            vout.m; do \
          cp "$(srcdir)/modules/gui/macosx/$$i" \
              $(top_builddir)/tmp/modules/gui/macosx; \
@@ -734,15 +737,15 @@ VLC.app: vlc
        case $(target_triplet) 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 \
+           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 ../../../; \
-           cp -r $(top_builddir)/tmp/extras/MacOSX/build/VLC.bundle \
+           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 ../../../; \
-           cp -r $(top_builddir)/tmp/extras/MacOSX/build/Default/VLC.bundle \
+           cp -R $(top_builddir)/tmp/extras/MacOSX/build/Default/VLC.bundle \
                  $(top_builddir)/VLC.app;; \
        esac
        rm -Rf $(top_builddir)/tmp
@@ -887,7 +890,7 @@ package-win32-base:
            $(top_builddir)/vlc-${VERSION}/http/vlm/ ;
        unix2dos $(top_builddir)/vlc-${VERSION}/http/vlm/*.html ;
 
-       cp $(srcdir)/share/vlc48x48new.ico $(top_builddir)/vlc-${VERSION}/ ;
+       cp $(srcdir)/share/vlc48x48.ico $(top_builddir)/vlc-${VERSION}/ ;
 
        mkdir -p "$(top_builddir)/vlc-${VERSION}/mozilla"
 if BUILD_MOZILLA
@@ -991,7 +994,7 @@ package-wince-base:
            $(top_builddir)/vlc-${VERSION}/http/vlm/ ;
        unix2dos $(top_builddir)/vlc-${VERSION}/http/vlm/*.html ;
 
-       cp $(srcdir)/share/vlc48x48new.ico $(top_builddir)/vlc-${VERSION}/ ;
+       cp $(srcdir)/share/vlc48x48.ico $(top_builddir)/vlc-${VERSION}/ ;
 
 if BUILD_MOZILLA
        mkdir -p "$(top_builddir)/vlc-${VERSION}/mozilla"
@@ -1069,7 +1072,7 @@ package-macosx:
 
 # Copy relevant files 
        cp -R "$(top_builddir)/VLC-release.app" "$(top_builddir)/tmp/VLC.app"
-       cd "$(srcdir)" && cp AUTHORS COPYING ChangeLog README README.MacOSX.rtf THANKS NEWS $(top_builddir)/tmp/
+       cd "$(srcdir)" && cp AUTHORS COPYING ChangeLog README README.MacOSX.rtf THANKS NEWS $(top_builddir)/tmp/ && cp -R extras/MacOSX/Delete_Preferences.app $(top_builddir)/tmp/
 
 # Create disk image 
        $(srcdir)/extras/MacOSX/macosx-dmg "vlc-${VERSION}" $(top_builddir)/tmp
@@ -1118,7 +1121,7 @@ update-po:
          echo "" ; \
          echo "# main sources" ; \
          find include src -name '*.[chm]' -o -name '*.[ch]pp' \
-           | grep -v '\(vlc_symbols\|misc/modules_\)' \
+           | grep -v '\(vlc_symbols\|misc/modules_\|src/misc/version.c\)' \
            | sort ; \
          echo "" ; \
          echo "# modules" ; \
Unnamed repository; edit this file 'description' to name the repository.