Makefile.am: Yet an other attempt to fix this Makefile.am on Mac OS X.

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index dfebe77c97b0f96cba361d61b48f905979e7c6e9..88b252953b8416d360d4768ef0c0fd8137330a6c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,7 +17,7 @@ EXTRA_DIST = \
        INSTALL.wince \
        extras/package/win32/vlc.exe.manifest \
        MAINTAINERS \
-       README.MacOSX.rtf \
+       extras/package/macosx/README.MacOSX.rtf \
        vlc-config.in.in \
        extras/package/rpm/vlc.fedora.spec \
        extras/package/rpm/vlc.mandriva.spec \
@@ -26,7 +26,7 @@ EXTRA_DIST = \
 
 dist_noinst_SCRIPTS = bootstrap toolbox
 
-BUILT_SOURCES_distclean = vlc-config compile vlc.win32.nsi
+BUILT_SOURCES_distclean = vlc-config compile extras/package/win32/vlc.win32.nsi
 if HAVE_DARWIN
 BUILT_SOURCES_clean = macosx-sdk
 else
@@ -211,15 +211,15 @@ EXTRA_DIST += \
 # Various utilities ( editor syntax files, D-Bus controller ... )
 ##############################################################################
 EXTRA_DIST += \
-       extras/Makefile \
-       extras/zsh.cpp \
-       extras/emacs.init \
-       extras/vlc.vim \
-       extras/make.pl \
-       extras/valgrind.suppressions \
-       extras/m4/autoconf260.m4 \
-       extras/mpris.py \
-       extras/mpris.glade
+       extras/analyser/Makefile \
+       extras/analyser/zsh.cpp \
+       extras/analyser/emacs.init \
+       extras/analyser/vlc.vim \
+       extras/analyser/valgrind.suppressions \
+       extras/buildsystem/autotools/make.pl \
+       extras/buildsystem/autotools/m4/autoconf260.m4 \
+       extras/misc/mpris.py \
+       extras/misc/mpris.glade
 
 dist-hook:
        distdir=$(distdir) srcdir=$(srcdir) $(SHELL) $(srcdir)/toolbox --dist-contrib
@@ -257,7 +257,7 @@ bin_PROGRAMS = vlc
 
 vlc_SOURCES = src/vlc.c
 # Ugly kludge so that automake defines $(CXXLINK)
-nodist_EXTRA_vlc_SOURCES = extras/zsh.cpp src/misc/darwin_specific.m
+nodist_EXTRA_vlc_SOURCES = extras/analyser/zsh.cpp src/misc/darwin_specific.c
 
 vlc_DEPENDENCIES = $(DATA_win32_rc)
 
@@ -351,17 +351,15 @@ if HAVE_DARWIN
 noinst_DATA = VLC.app
 # VLC-release.app is the old VLC.app target
 VLC-release.app: vlc
-       ( cd  src && make  )
-       @if test -e "$(top_builddir)/tmp"; then \
-         echo "Error: please remove $(top_builddir)/tmp, it is in the way"; \
-         false; \
-       else \
-         echo "OK."; mkdir -p "$(top_builddir)/tmp/extras/MacOSX"; \
+       ( cd src && make install )
+       if test -e $(top_builddir)/tmp ; then
+         rm -Rf $(top_builddir)/tmp
        fi
+       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/MacOSX/
-       cp -R $(srcdir)/extras/package/macosx/Resources $(top_builddir)/tmp/extras/MacOSX
-       for i in AUTHORS COPYING README.MacOSX.rtf THANKS; do \
+       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 \
          cp "$(srcdir)/$$i" $(top_builddir)/tmp; \
        done
        mkdir -p $(top_builddir)/tmp/modules/audio_output
@@ -423,7 +421,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/MacOSX/Framework/Pre-Compile.sh
+       ACTION="VLC-release.app" src_dir=$(srcdir) build_dir=$(top_builddir) sh $(srcdir)/extras/package/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}` ; \
@@ -523,16 +521,14 @@ VLC-release.app: vlc
 
 VLC.app: vlc 
        ( cd src && make install )
-       @if test -e "$(top_builddir)/tmp"; then \
-         echo "Error: please remove $(top_builddir)/tmp, it is in the way"; \
-         false; \
-       else \
-         echo "OK."; mkdir -p "$(top_builddir)/tmp/extras/MacOSX"; \
+       if test -e $(top_builddir)/tmp ; then
+         rm -Rf $(top_builddir)/tmp
        fi
+       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/MacOSX/
-       cp -R $(srcdir)/extras/package/macosx/Resources $(top_builddir)/tmp/extras/MacOSX
-       for i in AUTHORS COPYING README.MacOSX.rtf THANKS; do \
+       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 \
          cp "$(srcdir)/$$i" $(top_builddir)/tmp; \
        done
        mkdir -p $(top_builddir)/tmp/modules/audio_output
@@ -770,7 +766,7 @@ endif
 
 package-win32-base-debug: package-win-common
 # Copy relevant files
-       cp "$(top_builddir)/vlc.win32.nsi" "$(top_builddir)/vlc-$(VERSION)/"
+       cp "$(top_builddir)/extras/package/win32/vlc.win32.nsi" "$(top_builddir)/vlc-$(VERSION)/"
 
        mkdir -p "$(top_builddir)/vlc-$(VERSION)/plugins"
        for i in "" `$(VLC_CONFIG) --target plugin` ; do \
@@ -941,7 +937,7 @@ package-macosx:
           mkdir -p $(top_builddir)/vlc-$(VERSION)/.background/ && \
           cp AUTHORS COPYING ChangeLog README THANKS NEWS $(top_builddir)/vlc-$(VERSION)/Goodies/ && \
           cp -R  extras/package/macosx/Delete_Preferences.app $(top_builddir)/vlc-$(VERSION)/Goodies/Delete\ VLC\ Preferences.app && \
-         cp README.MacOSX.rtf $(top_builddir)/vlc-$(VERSION)/Read\ Me.rtf && \
+         cp extras/package/macosx/README.MacOSX.rtf $(top_builddir)/vlc-$(VERSION)/Read\ Me.rtf && \
          cp extras/package/macosx/Resources/about_bg.png $(top_builddir)/vlc-$(VERSION)/.background/background.png ;
 
 # Place a link to the application folder