Keep -O2 in --disable-optimizations mode, cause it can't harm...

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 46e8da86f982bca400e5fba68f6705a2e77ed53c..227baaff148817b21f128a79ef0a3ca6d80a5981 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -117,6 +117,9 @@ CFLAGS_nodebug = @CFLAGS_OPTIM_NODEBUG@
 endif
 endif
 endif
+else
+# !OPTIM
+CFLAGS_optim = @CFLAGS_NOOPTIM@
 endif
 
 CPPFLAGS_default += $(CPPFLAGS_release) \
@@ -160,6 +163,7 @@ HEADERS_include = \
        include/darwin_specific.h \
        include/codecs.h \
        include/error.h \
+       include/encoder.h \
        include/input_ext-dec.h \
        include/input_ext-intf.h \
        include/input_ext-plugins.h \
@@ -260,11 +264,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)
 
@@ -277,14 +286,14 @@ EXTRA_DIST += \
        msvc/libvlc.dsp.in \
        msvc/plugins.dsp.in \
        msvc/vlc.dsp.in \
-       msvc/config.h \
+       msvc/config.h.in \
        msvc/modules_builtin_msvc.h \
        evc/vlc.vcw \
        evc/libvlc.vcp.in \
        evc/vlc.vcp.in \
        evc/plugins.vcp.in \
        evc/vlc.c \
-       evc/config.h \
+       evc/config.h.in \
        evc/modules_builtin_evc.h \
        $(NULL)
 
@@ -308,10 +317,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)
@@ -345,7 +356,7 @@ SOURCES_libvlc_beos = \
        $(NULL)
 
 SOURCES_libvlc_darwin = \
-       src/misc/darwin_specific.c \
+       src/misc/darwin_specific.m \
        $(NULL)
 
 SOURCES_libvlc_win32 = \
@@ -464,12 +475,13 @@ vlc.app: vlc $(PLUGIN_FILES)
                $(INSTALL) $$i vlc.app/Contents/MacOS/modules/ ; \
        fi ; done
        $(INSTALL) -d vlc.app/Contents/MacOS/share
-       $(INSTALL) -m 644 share/*.psf vlc.app/Contents/MacOS/share
+       $(INSTALL) -m 644 share/*.psf share/*.rle 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
@@ -509,12 +521,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
 
@@ -539,7 +551,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} | \