Very beginning of the interaction framework (Refs:#27)

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index c50cc1608d99dd080980981237ee0e2d05b3bdad..3ff67dc24783e839a24e55b2395de090606ab365 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
 
@@ -390,6 +393,7 @@ SOURCES_libvlc_common = \
        src/libvlc.h \
        src/interface/interface.c \
        src/interface/intf_eject.c \
+       src/interface/interaction.c \
        src/playlist/playlist.c \
        src/playlist/sort.c \
        src/playlist/loadsave.c \
@@ -432,9 +436,13 @@ SOURCES_libvlc_common = \
        src/osd/osd_parser.c \
        src/osd/osd_text.c \
        src/osd/osd_widgets.c \
+       src/network/getaddrinfo.c \
+       src/network/io.c \
+       src/network/tcp.c \
+       src/network/udp.c \
+       src/network/httpd.c \
+       src/network/tls.c \
        src/misc/charset.c \
-       src/misc/httpd.c \
-       src/misc/tls.c \
        src/misc/md5.c \
        src/misc/mtime.c \
        src/misc/block.c \
@@ -450,8 +458,6 @@ SOURCES_libvlc_common = \
        src/misc/objects.c \
        src/misc/variables.c \
        src/misc/error.c \
-       src/misc/net.c \
-       src/misc/getaddrinfo.c \
        src/misc/vlm.c \
        src/misc/xml.c \
        src/misc/version.c \
@@ -609,6 +615,8 @@ VLC-release.app: vlc
            extended.m \
            bookmarks.h \
            bookmarks.m \
+           sfilters.h \
+           sfilters.m \
            vout.m; do \
          cp "$(srcdir)/modules/gui/macosx/$$i" \
              $(top_builddir)/tmp/modules/gui/macosx; \
@@ -723,6 +731,8 @@ VLC.app: vlc
            extended.m \
            bookmarks.h \
            bookmarks.m \
+           sfilters.h \
+           sfilters.m \
            vout.m; do \
          cp "$(srcdir)/modules/gui/macosx/$$i" \
              $(top_builddir)/tmp/modules/gui/macosx; \
@@ -883,7 +893,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
@@ -987,7 +997,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"
@@ -1065,7 +1075,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/ && cp -R extras/MacOSX/Delete\ Preferences.app $(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
@@ -1114,7 +1124,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" ; \