]> git.sesse.net Git - vlc/blobdiff - Makefile.am
projects / vlc / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Android configure: actually use NEON in NEON build
[vlc] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index dc2831ce78e75f1cdf6f5308dd14d96cfac5d2f1..e2815c4e2236d27b89bb7b1fa2a0bd361dbc645c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,27 +7,12 @@
 # which have makefiles with distribution information.
 #  - src (libvlc) is nedeed by modules
 #  - libs/* are needed by modules
-BASE_SUBDIRS = po compat src bin modules share doc test
-EXTRA_SUBDIRS = m4 \
-       libs/loader libs/srtp libs/unzip
-DIST_SUBDIRS = $(BASE_SUBDIRS) $(EXTRA_SUBDIRS)
-
-SUBDIRS = po compat src
-if LOADER
-SUBDIRS += libs/loader
-endif
-if HAVE_GCRYPT
-SUBDIRS += libs/srtp
-endif
-if HAVE_ZLIB
-if !HAVE_MINIZIP
-SUBDIRS += libs/unzip
-endif
-endif
+DIST_SUBDIRS = m4 compat doc po share src modules lib bin test
+SUBDIRS = compat doc po share src modules lib
 if BUILD_VLC
 SUBDIRS += bin
 endif
-SUBDIRS += modules share doc test
+SUBDIRS += test
 
 EXTRA_DIST = \
        HACKING \
@@ -35,7 +20,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 +54,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 +106,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 +170,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 \
@@ -362,18 +335,8 @@ EXTRA_DIST += \
 # 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)
@@ -382,8 +345,11 @@ MAINTAINERCLEANFILES = ChangeLog
 libcompat:
        cd compat && $(MAKE) $(AM_MAKEFLAGS)
 
-libvlc: libcompat
-       cd src && $(MAKE) $(AM_MAKEFLAGS) libvlc.la
+libvlccore: libcompat
+       cd src && $(MAKE) $(AM_MAKEFLAGS) libvlccore.la
+
+libvlc: libvlccore
+       cd lib && $(MAKE) $(AM_MAKEFLAGS) libvlc.la
 
 core: libvlc vlc$(EXEEXT)
        cd bin && $(MAKE) $(AM_MAKEFLAGS) vlc$(EXEEXT) vlc-static$(EXEEXT)
@@ -425,7 +391,7 @@ mvlc: make-alias Makefile
        $(AM_V_GEN)$(MKALIAS) maemo
 
 if BUILD_VLC
-noinst_SCRIPTS += vlc$(EXEEXT)
+noinst_SCRIPTS = vlc$(EXEEXT)
 endif
 
 vlc$(EXEEXT):
@@ -567,12 +533,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 '{}' \;
 
@@ -665,7 +630,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
@@ -1040,5 +1005,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.