Do not forget to register aout_ChannelsRestart as the callback for

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 506884d1646afbc8c9a0aaf05cb20f5d209c959e..8e29cf94d5befd23b57bb5c96c14d0cd71da412e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -260,11 +260,16 @@ EXTRA_DIST += \
        extras/MacOSX/Resources/mpeg2.icns \
        extras/MacOSX/Resources/mpeg4.icns \
        extras/MacOSX/Resources/vlc.icns \
+       extras/MacOSX/Resources/back.png \
+       extras/MacOSX/Resources/begin.png \
+       extras/MacOSX/Resources/end.png \
+       extras/MacOSX/Resources/forw.png \
+       extras/MacOSX/Resources/list.png \
        extras/MacOSX/Resources/pause.png \
        extras/MacOSX/Resources/play.png \
+       extras/MacOSX/Resources/prefs.png \
        extras/MacOSX/Resources/stop.png \
-       extras/MacOSX/Resources/stepf.png \
-       extras/MacOSX/Resources/stepr.png \
+       extras/MacOSX/Resources/vlc_hg.png \
        extras/MacOSX/vlc.pbproj/project.pbxproj \
        $(NULL)
 
@@ -289,7 +294,7 @@ EXTRA_DIST += \
        $(NULL)
 
 show-libvlc-sources: FORCE
-       @echo X: $(SOURCES_libvlc_common) $(SOURCES_libvlc_win32) $(SOURCES_libvlc_dirent) $(SOURCES_libvlc_getopt) $(SOURCES_libvlc_libc)
+       @echo X: $(SOURCES_libvlc_common) $(SOURCES_libvlc_win32) $(SOURCES_libvlc_dirent) $(SOURCES_libvlc_getopt)
 
 show-libvlc-headers: FORCE
        @echo X: $(HEADERS_include) $(HEADERS_include_built)
@@ -308,10 +313,12 @@ lib_LIBRARIES += lib/libvlc.a $(LIBRARIES_libvlc_pic)
 lib_libvlc_a_SOURCES = $(SOURCES_libvlc)
 lib_libvlc_a_CFLAGS = $(CPPFLAGS_default) -D__VLC__ $(CFLAGS_default) @CFLAGS_vlc@
 lib_libvlc_a_CXXFLAGS = $(CPPFLAGS_default) -D__VLC__ $(CXXFLAGS_default)
+lib_libvlc_a_OBJCFLAGS = $(CPPFLAGS_default) -D__VLC__ $(OBJCFLAGS_default)
 
 lib_libvlc_pic_a_SOURCES = $(SOURCES_libvlc)
 lib_libvlc_pic_a_CFLAGS = $(CPPFLAGS_pic) -D__VLC__ $(CFLAGS_pic) @CFLAGS_vlc@
 lib_libvlc_pic_a_CXXFLAGS = $(CPPFLAGS_pic) -D__VLC__ $(CXXFLAGS_pic)
+lib_libvlc_pic_a_OBJCFLAGS = $(CPPFLAGS_pic) -D__VLC__ $(OBJCFLAGS_pic)
 
 if HAVE_BEOS
 OPT_SOURCES_libvlc_beos = $(SOURCES_libvlc_beos)
@@ -328,9 +335,6 @@ endif
 if BUILD_GETOPT
 OPT_SOURCES_libvlc_getopt = $(SOURCES_libvlc_getopt)
 endif
-if BUILD_LIBC
-OPT_SOURCES_libvlc_libc = $(SOURCES_libvlc_libc)
-endif
 if BUILD_MOZILLA
 LIBRARIES_libvlc_pic = lib/libvlc_pic.a
 endif
@@ -341,7 +345,6 @@ EXTRA_DIST += \
        $(SOURCES_libvlc_win32) \
        $(SOURCES_libvlc_dirent) \
        $(SOURCES_libvlc_getopt) \
-       $(SOURCES_libvlc_libc) \
        $(NULL)
 
 SOURCES_libvlc_beos = \
@@ -349,7 +352,7 @@ SOURCES_libvlc_beos = \
        $(NULL)
 
 SOURCES_libvlc_darwin = \
-       src/misc/darwin_specific.c \
+       src/misc/darwin_specific.m \
        $(NULL)
 
 SOURCES_libvlc_win32 = \
@@ -367,10 +370,6 @@ SOURCES_libvlc_getopt = \
        src/extras/getopt1.c \
        $(NULL)
 
-SOURCES_libvlc_libc = \
-       src/extras/libc.c
-       $(NULL)
-
 SOURCES_libvlc_common = \
        src/libvlc.c \
        src/libvlc.h \
@@ -411,6 +410,7 @@ SOURCES_libvlc_common = \
        src/misc/objects.c \
        src/misc/variables.c \
        src/misc/error.c \
+       src/extras/libc.c \
        $(NULL)
 
 SOURCES_libvlc = \
@@ -420,7 +420,6 @@ SOURCES_libvlc = \
        $(OPT_SOURCES_libvlc_win32) \
        $(OPT_SOURCES_libvlc_dirent) \
        $(OPT_SOURCES_libvlc_getopt) \
-       $(OPT_SOURCES_libvlc_libc) \
        $(NULL)
 
 ###############################################################################
@@ -474,10 +473,11 @@ vlc.app: vlc $(PLUGIN_FILES)
        $(INSTALL) -d vlc.app/Contents/MacOS/share
        $(INSTALL) -m 644 share/*.psf vlc.app/Contents/MacOS/share
        $(INSTALL) -d vlc.app/Contents/MacOS/locale
-       for i in $(CATALOGS); do
-               mkdir -p vlc.app/Contents/MacOS/locale/$${i%.gmo}/LC_MESSAGES
-               cp po/$$i vlc.app/Contents/MacOS/locale/$${i%.gmo}/LC_MESSAGES/vlc.mo
+       for i in $(CATALOGS); do \
+               mkdir -p vlc.app/Contents/MacOS/locale/$${i%.gmo}/LC_MESSAGES ; \
+               cp po/$$i vlc.app/Contents/MacOS/locale/$${i%.gmo}/LC_MESSAGES/vlc.mo || true ; \
        done
+       echo -n "APPLVLC#" >| vlc.app/Contents/PkgInfo
 endif
 
 if HAVE_WIN32
@@ -517,12 +517,12 @@ package-win32:
        fi ; done
 # don't include these two
 #rm -f tmp/plugins/gtk.so tmp/plugins/sdl.so
-       for i in dummy tmp/plugins/*.so ; do if test $$i != tmp/plugins/intfwin.so -a $$i != dummy ; then $(STRIP) $$i ; fi ; done
+       for i in dummy tmp/plugins/*$(LIBEXT) ; do if test $$i != tmp/plugins/intfwin.so -a $$i != dummy ; then $(STRIP) $$i ; fi ; done
        mkdir tmp/share
        for file in default8x16.psf default8x9.psf ; \
                do cp share/$$file tmp/share/ ; done
 # Create package 
-       wine ~/.wine/fake_windows/Program\ Files/NSIS/makensis.exe -- /DVERSION=${VERSION} /CD tmp/nsi
+       wine ~/.wine/fake_windows/Program\ Files/NSIS/makensis.exe -- /DVERSION=${VERSION} tmp/nsi
 # Clean up
        rm -Rf tmp
 
@@ -547,7 +547,7 @@ package-beos:
        for i in dummy $(PLUGIN_FILES) ; do if test "x$$i" != "xdummy" ; then \
                $(INSTALL) $$i tmp/vlc/plugins/ ; \
        fi ; done
-       for i in dummy tmp/vlc/plugins/*.so ; do if test $$i != dummy ; then $(STRIP) $$i ; fi ; done
+       for i in dummy tmp/vlc/plugins/*$(LIBEXT) ; do if test $$i != dummy ; then $(STRIP) $$i ; fi ; done
 # Create package 
        mv tmp/vlc tmp/vlc-${VERSION}
        (cd tmp ; find vlc-${VERSION} | \