Handle VLM events in libvlc

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 8e8907c878e3d06c188deec4e6a318c14aae3460..fa3a571c88978eb1d335800f875a0127b0be65f8 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
@@ -93,8 +93,7 @@ ChangeLog: Makefile.am
 ###############################################################################
 
 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 \
@@ -123,37 +122,29 @@ EXTRA_DIST += \
        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/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/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 \
@@ -251,6 +242,28 @@ EXTRA_DIST += \
        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 \
@@ -313,12 +326,16 @@ vlc-config.in: vlc-config.in.in
        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.
 # Don't complain if it doesn't work. -- Courmisch
-libvlc:
+libcompat:
+       cd compat && $(MAKE) $(AM_MAKEFLAGS)
+
+libvlc: libcompat
        cd src && $(MAKE) $(AM_MAKEFLAGS) libvlc.la
 
 core: libvlc
@@ -466,8 +483,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 \
@@ -633,8 +650,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 \