cmake: FindX11.

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 3aba9330d4b65d3a5e7e061bc945e0ca0de9ab49..4eecbcf239150d22aed61747934c96d40afb854a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,7 +9,7 @@
 #  - libs/* are needed by modules
 SUBDIRS = po libs/loader libs/srtp src modules \
                projects/mozilla bindings projects/activex share doc
-DIST_SUBDIRS = $(SUBDIRS)  extras/package/ipkg
+DIST_SUBDIRS = $(SUBDIRS) m4  extras/package/ipkg
 
 EXTRA_DIST = \
        HACKING \
@@ -45,9 +45,9 @@ AUTOMAKE_OPTIONS = \
        1.9 \
        -Wall \
        check-news \
-       std-options \
        dist-bzip2 \
        no-dist-gzip
+#      std-options
 
 ###############################################################################
 # MacOS X project
@@ -322,6 +322,7 @@ endif
 
 ALL_ALIASES = cvlc rvlc svlc wxvlc qvlc nvlc
 bin_SCRIPTS += $(ALIASES)
+CLEANFILES += $(ALIASES)
 EXTRA_SCRIPTS = $(ALL_ALIASES)
 
 dist_noinst_SCRIPTS += make-alias
@@ -355,9 +356,10 @@ VLC-release.app: vlc
        rm -Rf "$(top_builddir)/tmp"
        mkdir -p "$(top_builddir)/tmp/extras/package/macosx"
        rm -Rf $(top_builddir)/VLC-release.app
-       cp -R $(srcdir)/extras/package/macosx/vlc.xcodeproj $(top_builddir)/tmp/extras/package/macosx/
-       cp -R $(srcdir)/extras/package/macosx/Resources $(top_builddir)/tmp/extras/package/macosx
-       for i in AUTHORS COPYING extras/package/macosx/README.MacOSX.rtf THANKS; do \
+       for i in vlc.xcodeproj Resources README.MacOSX.rtf; do \
+         cp -R $(srcdir)/extras/package/macosx/$$i $(top_builddir)/tmp/extras/package/macosx/; \
+       done
+       for i in AUTHORS COPYING THANKS; do \
          cp "$(srcdir)/$$i" $(top_builddir)/tmp; \
        done
        mkdir -p $(top_builddir)/tmp/modules/audio_output
@@ -390,6 +392,8 @@ VLC-release.app: vlc
            prefs_widgets.m \
            prefs.h \
            prefs.m \
+           simple_prefs.h \
+           simple_prefs.m \
            vout.h \
            voutqt.m \
            voutgl.m \
@@ -419,7 +423,7 @@ VLC-release.app: vlc
                  $(top_builddir)/VLC-release.app; \
        rm -Rf $(top_builddir)/tmp
        $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS
-       ACTION="VLC-release.app" src_dir=$(srcdir) build_dir=$(top_builddir) sh $(srcdir)/extras/package/macosx/Framework/Pre-Compile.sh
+       ACTION="VLC-release.app" src_dir=$(srcdir) build_dir=$(top_builddir) sh $(srcdir)/projects/macosx/framework/Pre-Compile.sh
        $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/luaplaylist
        for i in $(srcdir)/share/luaplaylist/*.* ; do \
          $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/luaplaylist/`basename $${i}` ; \
@@ -522,9 +526,10 @@ VLC.app: vlc
        rm -Rf $(top_builddir)/tmp
        mkdir -p "$(top_builddir)/tmp/extras/package/macosx"
        rm -Rf $(top_builddir)/VLC.app
-       cp -R $(srcdir)/extras/package/macosx/vlc.xcodeproj $(top_builddir)/tmp/extras/package/macosx/
-       cp -R $(srcdir)/extras/package/macosx/Resources $(top_builddir)/tmp/extras/package/macosx
-       for i in AUTHORS COPYING extras/package/macosx/README.MacOSX.rtf THANKS; do \
+       for i in vlc.xcodeproj Resources README.MacOSX.rtf; do \
+         cp -R $(srcdir)/extras/package/macosx/$$i $(top_builddir)/tmp/extras/package/macosx/; \
+       done
+       for i in AUTHORS COPYING THANKS; do \
          cp "$(srcdir)/$$i" $(top_builddir)/tmp; \
        done
        mkdir -p $(top_builddir)/tmp/modules/audio_output
@@ -557,6 +562,8 @@ VLC.app: vlc
            prefs_widgets.m \
            prefs.h \
            prefs.m \
+           simple_prefs.h \
+           simple_prefs.m \
            vout.h \
            voutqt.m \
            voutgl.m \