]> git.sesse.net Git - vlc/blobdiff - Makefile.am
projects / vlc / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Fix compilation. We can't use config_* in mozilla so use the -DDATAPATH
[vlc] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index b26f70fce3a938ec1acfeb4389fb2cded2c2d54a..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/buildsystem/autotools/m4 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
@@ -216,7 +216,7 @@ EXTRA_DIST += \
        extras/analyser/emacs.init \
        extras/analyser/vlc.vim \
        extras/analyser/valgrind.suppressions \
-       extras/buildsystem/autotools/make.pl \
+       extras/buildsystem/make.pl \
        extras/buildsystem/autotools/m4/autoconf260.m4 \
        extras/misc/mpris.py \
        extras/misc/mpris.glade
@@ -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
@@ -351,17 +352,14 @@ 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/package/macosx"; \
-       fi
+       ( cd src && make install )
+       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
@@ -394,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 \
@@ -418,12 +418,12 @@ VLC-release.app: vlc
              $(top_builddir)/tmp/modules/gui/macosx; \
        done
        cd $(top_builddir)/tmp/extras/package/macosx && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)' && \
-           cd ../../../ && \
+           cd ../../../../ && \
            cp -R $(top_builddir)/tmp/extras/package/macosx/build/Default/VLC.bundle \
                  $(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}` ; \
@@ -450,28 +450,28 @@ VLC-release.app: vlc
        $(INSTALL) -m 644 $(srcdir)/share/http-lua/.hosts $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/.hosts
        for i in $(srcdir)/share/http-lua/*.* ; do \
          $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/`basename $${i}` ; \
-       done ; \
+       done
        for i in $(srcdir)/share/http-lua/dialogs/* ; do \
          $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/dialogs/`basename $${i}` ; \
-       done ; \
+       done
        for i in $(srcdir)/share/http-lua/js/*.* ; do \
          $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/js/`basename $${i}` ; \
-       done ; \
+       done
        for i in $(srcdir)/share/http-lua/old/*.* ; do \
          $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/old/`basename $${i}` ; \
-       done ; \
+       done
        for i in $(srcdir)/share/http-lua/old/admin/*.* ; do \
          $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/old/admin/`basename $${i}` ; \
-       done ; \
+       done
        for i in $(srcdir)/share/http-lua/old/vlm/*.* ; do \
          $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/old/vlm/`basename $${i}` ; \
-       done ; \
+       done
        for i in $(srcdir)/share/http-lua/images/*.* ; do \
          $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/images/`basename $${i}` ; \
-       done ; \
+       done
        for i in $(srcdir)/share/http-lua/requests/*.* ; do \
          $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/requests/`basename $${i}` ; \
-       done ; \
+       done
        $(INSTALL) -m 644 $(srcdir)/share/http-lua/requests/readme $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/requests/readme.txt
        $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/dialogs
        $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/js
@@ -484,28 +484,28 @@ VLC-release.app: vlc
        $(INSTALL) -m 644 $(srcdir)/share/http/old/.hosts $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/old/.hosts
        for i in $(srcdir)/share/http/*.* ; do \
          $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/`basename $${i}` ; \
-       done ; \
+       done
        for i in $(srcdir)/share/http/dialogs/* ; do \
          $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/dialogs/`basename $${i}` ; \
-       done ; \
+       done
        for i in $(srcdir)/share/http/js/*.* ; do \
          $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/js/`basename $${i}` ; \
-       done ; \
+       done
        for i in $(srcdir)/share/http/old/*.* ; do \
          $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/old/`basename $${i}` ; \
-       done ; \
+       done
        for i in $(srcdir)/share/http/old/admin/*.* ; do \
          $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/old/admin/`basename $${i}` ; \
-       done ; \
+       done
        for i in $(srcdir)/share/http/old/vlm/*.* ; do \
          $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/old/vlm/`basename $${i}` ; \
-       done ; \
+       done
        for i in $(srcdir)/share/http/images/*.* ; do \
          $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/images/`basename $${i}` ; \
-       done ; \
+       done
        for i in $(srcdir)/share/http/requests/*.* ; do \
          $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/requests/`basename $${i}` ; \
-       done ; \
+       done
        $(INSTALL) -m 644 $(srcdir)/share/http/requests/readme $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/requests/readme.txt
        $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/locale
        cat $(top_srcdir)/po/LINGUAS | while read i; do \
@@ -523,16 +523,13 @@ 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/package/macosx"; \
-       fi
+       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
@@ -565,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 \
@@ -589,9 +588,9 @@ VLC.app: vlc
              $(top_builddir)/tmp/modules/gui/macosx; \
        done
        cd $(top_builddir)/tmp/extras/package/macosx && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)' && \
-           cd ../../../ && \
+           cd ../../../../ && \
            cp -R $(top_builddir)/tmp/extras/package/macosx/build/Default/VLC.bundle \
-                 $(top_builddir)/VLC.app; \
+                 $(top_builddir)/VLC.app
        rm -Rf $(top_builddir)/tmp
        $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS
        $(INSTALL) $(top_builddir)/.libs/vlc \
@@ -607,7 +606,7 @@ VLC.app: vlc
        $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/locale
        cat $(top_srcdir)/po/LINGUAS | while read i; do \
          mkdir -p $(top_builddir)/VLC.app/Contents/MacOS/locale/$${i}/LC_MESSAGES ; \
-         ln -sfn `pwd`/po/$${i}.gmo $(top_builddir)/VLC.app/Contents/MacOS/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \
+         ln -sfn `pwd`/$(srcdir)/po/$${i}.gmo $(top_builddir)/VLC.app/Contents/MacOS/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \
          mkdir -p $(top_builddir)/VLC.app/Contents/Resources/$${i}.lproj ; \
          ln -sf ../English.lproj/InfoPlist.strings \
              $(top_builddir)/VLC.app/Contents/Resources/$${i}.lproj ; \
@@ -750,7 +749,7 @@ if BUILD_ACTIVEX
        cp $(srcdir)/projects/activex/test.html  $(top_builddir)/vlc-$(VERSION)/activex/ ;
        unix2dos $(top_builddir)/vlc-$(VERSION)/activex/* ;
 
-       cp $(top_builddir)/activex/.libs/axvlc$(LIBEXT) $(top_builddir)/vlc-$(VERSION)/activex/ ;
+       cp $(top_builddir)/projects/activex/.libs/axvlc$(LIBEXT) $(top_builddir)/vlc-$(VERSION)/activex/ ;
 endif
 # Rebase all those DLLs to speed up loading (need cygwin rebase)
        if rebase -b 0x42 /dev/null >/dev/null 2>&1; then \
Unnamed repository; edit this file 'description' to name the repository.