]> git.sesse.net Git - vlc/blobdiff - Makefile.am
projects / vlc / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Goom: specify the speed integer range
[vlc] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index 67d16f0ea8bb34352b10d62225cf666833037b7b..cff608998179f7f587280ad84811f03920d0acc1 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -35,7 +35,6 @@ EXTRA_DIST = \
        extras/package/win32/vlc.exe.manifest \
        extras/package/win32/libvlc.dll.manifest \
        extras/package/macosx/README.MacOSX.rtf \
-       vlc-config.in.in \
        extras/package/rpm/vlc.fedora.spec \
        extras/package/rpm/vlc.altlinux.spec \
        extras/package/win32/vlc.win32.nsi.in \
@@ -70,7 +69,7 @@ EXTRA_DIST = \
 dist_noinst_SCRIPTS = bootstrap
 nodist_noinst_SCRIPTS = compile
 
-BUILT_SOURCES_distclean = vlc-config
+BUILT_SOURCES_distclean =
 if HAVE_WIN32
 BUILT_SOURCES_distclean += \
        extras/package/win32/vlc.win32.nsi extras/package/win32/spad.nsi
@@ -122,31 +121,18 @@ EXTRA_DIST += \
        extras/package/macosx/Resources/add_embedded_graphite.png \
        extras/package/macosx/Resources/dsa_pub.pem \
        extras/package/macosx/Resources/embedded_vout.png \
-       extras/package/macosx/Resources/English.lproj/About.nib/designable.nib \
-       extras/package/macosx/Resources/English.lproj/About.nib/keyedobjects.nib \
-       extras/package/macosx/Resources/English.lproj/AudioEffects.nib/designable.nib \
-       extras/package/macosx/Resources/English.lproj/AudioEffects.nib/keyedobjects.nib \
-       extras/package/macosx/Resources/English.lproj/Bookmarks.nib/designable.nib \
-       extras/package/macosx/Resources/English.lproj/Bookmarks.nib/keyedobjects.nib \
-       extras/package/macosx/Resources/English.lproj/CoreDialogs.nib/designable.nib \
-       extras/package/macosx/Resources/English.lproj/CoreDialogs.nib/keyedobjects.nib \
-       extras/package/macosx/Resources/English.lproj/ErrorPanel.nib/designable.nib \
-       extras/package/macosx/Resources/English.lproj/ErrorPanel.nib/keyedobjects.nib \
-       extras/package/macosx/Resources/English.lproj/InfoPlist.strings.in \
-       extras/package/macosx/Resources/English.lproj/MainMenu.nib/designable.nib \
-       extras/package/macosx/Resources/English.lproj/MainMenu.nib/keyedobjects.nib \
-       extras/package/macosx/Resources/English.lproj/MediaInfo.nib/designable.nib \
-       extras/package/macosx/Resources/English.lproj/MediaInfo.nib/keyedobjects.nib \
-       extras/package/macosx/Resources/English.lproj/Open.nib/designable.nib \
-       extras/package/macosx/Resources/English.lproj/Open.nib/keyedobjects.nib \
-       extras/package/macosx/Resources/English.lproj/Preferences.nib/designable.nib \
-       extras/package/macosx/Resources/English.lproj/Preferences.nib/keyedobjects.nib \
-       extras/package/macosx/Resources/English.lproj/SyncTracks.nib/designable.nib \
-       extras/package/macosx/Resources/English.lproj/SyncTracks.nib/keyedobjects.nib \
-       extras/package/macosx/Resources/English.lproj/VideoEffects.nib/designable.nib \
-       extras/package/macosx/Resources/English.lproj/VideoEffects.nib/keyedobjects.nib \
-       extras/package/macosx/Resources/English.lproj/Wizard.nib/designable.nib \
-       extras/package/macosx/Resources/English.lproj/Wizard.nib/keyedobjects.nib \
+       extras/package/macosx/Resources/English.lproj/About.xib \
+       extras/package/macosx/Resources/English.lproj/AudioEffects.xib \
+       extras/package/macosx/Resources/English.lproj/Bookmarks.xib \
+       extras/package/macosx/Resources/English.lproj/CoreDialogs.xib \
+       extras/package/macosx/Resources/English.lproj/ErrorPanel.xib \
+       extras/package/macosx/Resources/English.lproj/MainMenu.xib \
+       extras/package/macosx/Resources/English.lproj/MediaInfo.xib \
+       extras/package/macosx/Resources/English.lproj/Open.xib \
+       extras/package/macosx/Resources/English.lproj/Preferences.xib \
+       extras/package/macosx/Resources/English.lproj/SyncTracks.xib \
+       extras/package/macosx/Resources/English.lproj/VideoEffects.xib \
+       extras/package/macosx/Resources/English.lproj/Wizard.xib \
        extras/package/macosx/Resources/fspanel/fs_background.png \
        extras/package/macosx/Resources/fspanel/fs_exit_fullscreen.png \
        extras/package/macosx/Resources/fspanel/fs_exit_fullscreen_highlight.png \
@@ -199,6 +185,8 @@ EXTRA_DIST += \
        extras/package/macosx/Resources/mainwindow/back.png \
        extras/package/macosx/Resources/mainwindow/bottom-background.png \
        extras/package/macosx/Resources/mainwindow/bottom-bar-mini.png \
+       extras/package/macosx/Resources/mainwindow/dropzone-background.png \
+       extras/package/macosx/Resources/mainwindow/dropzone.png \
        extras/package/macosx/Resources/mainwindow/effects-double-buttons-blue.png \
        extras/package/macosx/Resources/mainwindow/effects-double-buttons-pressed.png \
        extras/package/macosx/Resources/mainwindow/effects-double-buttons.png \
@@ -245,7 +233,6 @@ EXTRA_DIST += \
        extras/package/macosx/Resources/mainwindow/volume-low.png \
        extras/package/macosx/Resources/mainwindow/volume-slider-knob.png \
        extras/package/macosx/Resources/mainwindow/volume-slider-track.png \
-       extras/package/macosx/Resources/mainwindow/volumetrack.png \
        extras/package/macosx/Resources/mainwindow_dark/back-pressed_dark.png \
        extras/package/macosx/Resources/mainwindow_dark/back_dark.png \
        extras/package/macosx/Resources/mainwindow_dark/bottom-background_dark.png \
@@ -306,6 +293,13 @@ EXTRA_DIST += \
        extras/package/macosx/Resources/repeat_single_embedded_graphite.png \
        extras/package/macosx/Resources/shuffle_embedded.png \
        extras/package/macosx/Resources/shuffle_embedded_graphite.png \
+       extras/package/macosx/Resources/sidebar-icons/document-music-playlist.png \
+       extras/package/macosx/Resources/sidebar-icons/film-cast.png \
+       extras/package/macosx/Resources/sidebar-icons/film.png \
+       extras/package/macosx/Resources/sidebar-icons/music-beam.png \
+       extras/package/macosx/Resources/sidebar-icons/network-cloud.png \
+       extras/package/macosx/Resources/sidebar-icons/picture.png \
+       extras/package/macosx/Resources/sidebar-icons/README \
        extras/package/macosx/Resources/skip_forward_active_embedded.png \
        extras/package/macosx/Resources/skip_forward_embedded_graphite.png \
        extras/package/macosx/Resources/skip_previous_active_embedded.png \
@@ -345,22 +339,19 @@ EXTRA_DIST += \
        extras/misc/mpris.py \
        extras/misc/mpris.xml
 
+###############################################################################
+# Scripts for building dependencies.
+##############################################################################
+EXTRA_DIST += \
+       contrib/bootstrap \
+       contrib/src/
+
 ###############################################################################
 # Building libvlc
 ###############################################################################
 
-noinst_SCRIPTS = vlc-config
-vlc-config: $(top_builddir)/config.status $(top_builddir)/vlc-config.in
-       $(SHELL) ./config.status --file=$@
-       chmod 0755 $@
-       touch $@
-
-vlc-config.in: vlc-config.in.in
-       ./config.status --recheck
-       touch $@
-
 CLEANFILES = $(BUILT_SOURCES_clean)
-DISTCLEANFILES = $(BUILT_SOURCES_distclean) vlc-config.in compile
+DISTCLEANFILES = $(BUILT_SOURCES_distclean) compile
 MAINTAINERCLEANFILES = ChangeLog
 
 # Shortcut for developers to rebuild the core (libvlc + vlc)
@@ -412,7 +403,7 @@ mvlc: make-alias Makefile
        $(AM_V_GEN)$(MKALIAS) maemo
 
 if BUILD_VLC
-noinst_SCRIPTS += vlc$(EXEEXT)
+noinst_SCRIPTS = vlc$(EXEEXT)
 endif
 
 vlc$(EXEEXT):
@@ -463,8 +454,6 @@ VLC-release.app: vlc
            applescript.m \
            controls.h \
            controls.m \
-           equalizer.h \
-           equalizer.m \
            intf.h \
            intf.m \
            macosx.m \
@@ -556,12 +545,11 @@ VLC-release.app: vlc
          mkdir -p $(top_builddir)/VLC-release.app/Contents/Resources/$${i}.lproj ; \
          $(LN_S) -f ../English.lproj/InfoPlist.strings \
              $(top_builddir)/VLC-release.app/Contents/Resources/$${i}.lproj ; \
-         $(LN_S) -f ../English.lproj/MainMenu.nib \
+         $(LN_S) -f ../English.lproj/MainMenu.xib \
              $(top_builddir)/VLC-release.app/Contents/Resources/$${i}.lproj ; \
        done
        printf "APPLVLC#" >| $(top_builddir)/VLC-release.app/Contents/PkgInfo
        rm -Rf $(top_builddir)/VLC-release.app/Contents/Frameworks/BGHUDAppKit.framework/Resources/
-       find $(top_builddir)/VLC-release.app/Contents/Resources/English.lproj -name designable.nib -delete;
        find $(top_builddir)/VLC-release.app -type d -exec chmod ugo+rx '{}' \;
        find $(top_builddir)/VLC-release.app -type f -exec chmod ugo+r '{}' \;
 
@@ -599,8 +587,6 @@ VLC.app: vlc $(top_builddir)/src/.libs/libvlccore.dylib $(top_builddir)/src/.lib
            applescript.m \
            controls.h \
            controls.m \
-           equalizer.h \
-           equalizer.m \
            intf.h \
            intf.m \
            macosx.m \
@@ -656,7 +642,7 @@ VLC.app: vlc $(top_builddir)/src/.libs/libvlccore.dylib $(top_builddir)/src/.lib
          mkdir -p $(top_builddir)/VLC.app/Contents/Resources/$${i}.lproj ; \
          $(LN_S) -f ../English.lproj/InfoPlist.strings \
              $(top_builddir)/VLC.app/Contents/Resources/$${i}.lproj ; \
-         $(LN_S) -f ../English.lproj/MainMenu.nib \
+         $(LN_S) -f ../English.lproj/MainMenu.xib \
              $(top_builddir)/VLC.app/Contents/Resources/$${i}.lproj ; \
        done
        printf "APPLVLC#" >| $(top_builddir)/VLC.app/Contents/PkgInfo
@@ -754,7 +740,7 @@ if !HAVE_WIN64
 if !HAVE_WINCE
        cp "$(top_builddir)/activex-vlc/src/axvlc.dll.manifest" "$(win32_destdir)/"
        cp "$(top_builddir)/activex-vlc/installed/lib/axvlc.dll" "$(win32_destdir)/"
-       cp "$(top_builddir)/npapi-vlc/src/npvlc.dll.manifest" "$(win32_destdir)/"
+       cp "$(top_builddir)/npapi-vlc/npapi/npvlc.dll.manifest" "$(win32_destdir)/"
        cp "$(top_builddir)/npapi-vlc/installed/lib/npvlc.dll" "$(win32_destdir)/"
 endif
 endif
@@ -795,7 +781,7 @@ package-win32-webplugin-common: package-win-base
        mkdir -p "$(win32_xpi_destdir)/plugins"
        find $(destdir) -maxdepth 4 -name "*$(LIBEXT)" -exec cp {} "$(win32_xpi_destdir)/" \;
 if !HAVE_WIN64
-       cp $(top_builddir)/npapi-vlc/src/npvlc.dll.manifest "$(win32_xpi_destdir)/plugins"
+       cp $(top_builddir)/npapi-vlc/npapi/npvlc.dll.manifest "$(win32_xpi_destdir)/plugins"
 endif
        cp "$(top_srcdir)/extras/package/win32/libvlc.dll.manifest" "$(win32_xpi_destdir)/plugins"
        cp -r $(win32_destdir)/plugins/ "$(win32_xpi_destdir)/plugins"
@@ -804,13 +790,13 @@ endif
 
 package-win32-xpi: package-win32-webplugin-common
 if !HAVE_WIN64
-       cp $(top_builddir)/npapi-vlc/src/install.rdf "$(win32_xpi_destdir)"
+       cp $(top_builddir)/npapi-vlc/npapi/install.rdf "$(win32_xpi_destdir)"
        cd $(win32_xpi_destdir) && zip -r "../vlc-$(VERSION).xpi" install.rdf plugins
 endif
 
 package-win32-crx: package-win32-webplugin-common
 if !HAVE_WIN64
-       cp $(top_builddir)/npapi-vlc/src/manifest.json "$(win32_xpi_destdir)"
+       cp $(top_builddir)/npapi-vlc/npapi/manifest.json "$(win32_xpi_destdir)"
        crxmake --pack-extension "$(win32_xpi_destdir)" \
                --extension-output "$(win32_destdir)/vlc-$(VERSION).crx" --ignore-file install.rdf
 endif
@@ -1031,5 +1017,5 @@ update-po:
 ###############################################################################
 # Enforce Mac OS X deployment target environment variable
 ###############################################################################
-macosx-sdk: Makefile.in $(HEADERS_include) vlc-config
+macosx-sdk: Makefile.in $(HEADERS_include)
        export MACOSX_DEPLOYMENT_TARGET=$(MACOSX_DEPLOYMENT_TARGET)
Unnamed repository; edit this file 'description' to name the repository.