]> git.sesse.net Git - vlc/blobdiff - Makefile.am
Create a modules-like directory for libraries
[vlc] / Makefile.am
index 2bd2b19c22b91e8dadfa56bf68811034995e9049..5790052068d97cabce610aa9944ef5daddc64c23 100644 (file)
@@ -12,7 +12,7 @@ NULL =
 #  - . should come before mozilla/bindings because the plugin needs libvlc.a
 #  - po should come before . because VLC.app needs the pofiles
 #  - loader should come before modules because some plugins need it
-SUBDIRS = intl loader src modules po . mozilla bindings activex share m4 doc
+SUBDIRS = intl libs src modules po . mozilla bindings activex share m4 doc
 DIST_SUBDIRS = $(SUBDIRS)  ipkg
 
 EXTRA_DIST = \
@@ -187,7 +187,9 @@ EXTRA_DIST += \
        extras/MacOSX/Resources/fs_exit_fullscreen_highlight.png \
        extras/MacOSX/Resources/fs_exit_fullscreen.png \
        extras/MacOSX/Resources/fs_background.png \
-       extras/MacOSX/vlc.pbproj/project.pbxproj \
+       extras/MacOSX/fullscreen_panel.svg \
+       extras/MacOSX/ub.sh \
+       extras/MacOSX/vlc.xcodeproj/project.pbxproj \
        extras/MacOSX/Delete_Preferences.app/Contents/Info.plist \
        extras/MacOSX/Delete_Preferences.app/Contents/PkgInfo \
        extras/MacOSX/Delete_Preferences.app/Contents/MacOS/applet \
@@ -203,7 +205,7 @@ EXTRA_DIST += \
        $(NULL)
 
 ###############################################################################
-# Various utilities ( editor syntax files, ... )
+# Various utilities ( editor syntax files, D-Bus controller ... )
 ##############################################################################
 EXTRA_DIST += \
        extras/Makefile \
@@ -213,6 +215,8 @@ EXTRA_DIST += \
        extras/make.pl \
        extras/valgrind.suppressions \
        extras/m4/autoconf260.m4 \
+       extras/dbus-vlc.py \
+       extras/dbus-vlc.glade \
        $(NULL)
 
 ###############################################################################
@@ -264,7 +268,7 @@ bin_PROGRAMS = vlc
 
 vlc_SOURCES = src/vlc.c
 # Ugly kludge so that automake defines $(CXXLINK)
-EXTRA_vlc_SOURCES = extras/zsh.cpp
+nodist_EXTRA_vlc_SOURCES = extras/zsh.cpp src/misc/darwin_specific.m
 
 # Work around a bug in the arm-wince-pe linker
 if HAVE_WINCE
@@ -283,13 +287,9 @@ LIB_libvlc = libvlc.la
 LIBVLC = src/$(LIB_libvlc)
 vlc_LDFLAGS =
 else
-if BUILD_SHARED
-vlc_LDFLAGS = `$(VLC_CONFIG) --libs vlc` -Wl,-rpath $(libdir) -L$(top_builddir)/src -lvlc
 if HAVE_WIN32
+vlc_LDFLAGS = -L$(top_builddir)/src -lvlc `$(VLC_CONFIG) --libs vlc`
 LIB_libvlc = libvlc.dll.a
-else
-LIB_libvlc = libvlc$(LIBEXT)
-endif
 LIBVLC =
 else
 vlc_LDFLAGS = $(vlc_WORKAROUNDLFDLAGS) `$(VLC_CONFIG) --libs vlc builtin`
@@ -306,7 +306,8 @@ endif
 libvlc:
        cd src && $(MAKE) $(AM_MAKEFLAGS) $(LIB_libvlc)
 
-core: libvlc vlc$(EXEEXT)
+core: libvlc
+       $(MAKE) $(AM_MAKEFLAGS) vlc$(EXEEXT)
 
 .PHONY: libvlc core
 
@@ -350,10 +351,11 @@ vlc-bundle: vlc
 endif
 
 # Install the symlinks
-install-exec-local:
+install-exec-local: install-binPROGRAMS
+       inst="`echo vlc | sed -e '$(transform)'`" ; \
        for i in "" $(ALIASES) ; do if test -n "$$i" ; then \
          rm -f "$(DESTDIR)$(bindir)/$$i" && \
-         ln -sf vlc "$(DESTDIR)$(bindir)/$$i" ; \
+         ln -sf "$${inst}" "$(DESTDIR)$(bindir)/$$i" ; \
        fi ; done
 
 # the opposite of install-{data,exec}-local
@@ -432,20 +434,10 @@ VLC-release.app: vlc
          cp "$(srcdir)/modules/gui/macosx/$$i" \
              $(top_builddir)/tmp/modules/gui/macosx; \
        done
-       case $(host_os) in \
-         *darwin6*) cd $(top_builddir)/tmp/extras/MacOSX && pbxbuild -target vlc | grep -v '^\([ \t]\|$$\)' && \
-           cd ../../../ && \
-           cp -R $(top_builddir)/tmp/extras/MacOSX/build/VLC.bundle \
-                 $(top_builddir)/VLC-release.app;; \
-         *darwin7*) cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)' && \
-           cd ../../../ && \
-           cp -R $(top_builddir)/tmp/extras/MacOSX/build/VLC.bundle \
-                 $(top_builddir)/VLC-release.app;; \
-         *darwin8*) cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)' && \
+       cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)' && \
            cd ../../../ && \
            cp -R $(top_builddir)/tmp/extras/MacOSX/build/Default/VLC.bundle \
-                 $(top_builddir)/VLC-release.app;; \
-       esac
+                 $(top_builddir)/VLC-release.app; \
        rm -Rf $(top_builddir)/tmp
        $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS
        $(INSTALL) $(top_builddir)/vlc \
@@ -574,20 +566,10 @@ VLC.app: vlc
          cp "$(srcdir)/modules/gui/macosx/$$i" \
              $(top_builddir)/tmp/modules/gui/macosx; \
        done
-       case $(host_os) in \
-         *darwin6*) cd $(top_builddir)/tmp/extras/MacOSX && pbxbuild -target vlc | grep -v '^\([ \t]\|$$\)'&& \
-           cd ../../../ && \
-           cp -R $(top_builddir)/tmp/extras/MacOSX/build/VLC.bundle \
-                 $(top_builddir)/VLC.app;; \
-         *darwin7*) cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)'&& \
-           cd ../../../ && \
-           cp -R $(top_builddir)/tmp/extras/MacOSX/build/VLC.bundle \
-                 $(top_builddir)/VLC.app;; \
-         *darwin8*) cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)' && \
+       cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)' && \
            cd ../../../ && \
            cp -R $(top_builddir)/tmp/extras/MacOSX/build/Default/VLC.bundle \
-                 $(top_builddir)/VLC.app;; \
-       esac
+                 $(top_builddir)/VLC.app; \
        rm -Rf $(top_builddir)/tmp
        $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS
        $(INSTALL) $(top_builddir)/vlc \
@@ -666,9 +648,7 @@ package-win-common:
 # Copy relevant files
        cp "$(top_builddir)/vlc$(EXEEXT)" "$(top_builddir)/vlc-${VERSION}/"
        cp "$(top_srcdir)/vlc.exe.manifest" "$(top_builddir)/vlc-${VERSION}/"
-if BUILD_SHARED
        cp "src/libvlc$(LIBEXT)" "vlc-${VERSION}/"
-endif
 
        for file in AUTHORS MAINTAINERS THANKS NEWS COPYING README ; \
          do sed 's/@/_AT_/' < "$(srcdir)/$$file" > "$(top_builddir)/vlc-${VERSION}/$${file}.txt" ; \
@@ -691,12 +671,16 @@ endif
        mkdir -p "$(top_builddir)/vlc-${VERSION}/http/old/admin"
        cp $(srcdir)/share/http/*.html $(top_builddir)/vlc-${VERSION}/http/ ;
        unix2dos $(top_builddir)/vlc-${VERSION}/http/*.html ;
+       cp $(srcdir)/share/http/.hosts $(top_builddir)/vlc-${VERSION}/http/ ;
+       unix2dos $(top_builddir)/vlc-${VERSION}/http/.hosts ;
        cp $(srcdir)/share/http/*.css $(top_builddir)/vlc-${VERSION}/http/ ;
        unix2dos $(top_builddir)/vlc-${VERSION}/http/*.css ;
        cp $(srcdir)/share/http/js/*.js $(top_builddir)/vlc-${VERSION}/http/js/ ;
        unix2dos $(top_builddir)/vlc-${VERSION}/http/js/*.js ;
        cp $(srcdir)/share/http/dialogs/* $(top_builddir)/vlc-${VERSION}/http/dialogs/ ;
        unix2dos $(top_builddir)/vlc-${VERSION}/http/dialogs/* ;
+       cp $(srcdir)/share/http/dialogs/.hosts $(top_builddir)/vlc-${VERSION}/http/dialogs/ ;
+       unix2dos $(top_builddir)/vlc-${VERSION}/http/dialogs/.hosts ;
        cp $(srcdir)/share/http/*.ico $(top_builddir)/vlc-${VERSION}/http/ ;
        cp $(srcdir)/share/http/images/*.png $(top_builddir)/vlc-${VERSION}/http/images/
        cp $(srcdir)/share/http/requests/*.xml $(top_builddir)/vlc-${VERSION}/http/requests/ ;
@@ -707,11 +691,13 @@ endif
        cp $(srcdir)/share/http/old/*.html $(top_builddir)/vlc-${VERSION}/http/old/ ;
        unix2dos $(top_builddir)/vlc-${VERSION}/http/old/*.html ;
        cp $(srcdir)/share/http/old/*.css $(top_builddir)/vlc-${VERSION}/http/old/ ;
+       cp $(srcdir)/share/http/old/.hosts $(top_builddir)/vlc-${VERSION}/http/old/ ;
        cp $(srcdir)/share/http/old/*.png $(top_builddir)/vlc-${VERSION}/http/old/ ;
        cp $(srcdir)/share/http/old/vlm/*.html $(top_builddir)/vlc-${VERSION}/http/old/vlm/ ;
        unix2dos $(top_builddir)/vlc-${VERSION}/http/old/vlm/*.html ;
        cp $(srcdir)/share/http/old/admin/*.html $(top_builddir)/vlc-${VERSION}/http/old/admin/ ;
        unix2dos $(top_builddir)/vlc-${VERSION}/http/old/admin/*.html ;
+       cp $(srcdir)/share/http/old/admin/.access $(top_builddir)/vlc-${VERSION}/http/old/admin/ ;
 
        cp $(srcdir)/share/vlc48x48.ico $(top_builddir)/vlc-${VERSION}/ ;
 
@@ -735,9 +721,7 @@ endif
 
 package-win-common-strip:
        $(STRIP) "$(top_builddir)/vlc-${VERSION}/vlc$(EXEEXT)"
-if BUILD_SHARED
        $(STRIP) "vlc-${VERSION}/libvlc$(LIBEXT)"
-endif
 if BUILD_MOZILLA
        $(STRIP) $(top_builddir)/vlc-${VERSION}/mozilla/*$(LIBEXT);
 endif
@@ -825,7 +809,9 @@ package-win32-7zip: package-win32-base-7zip
 # Clean up
        rm -Rf $(top_builddir)/vlc-${VERSION}
 
-package-win32: package-win32-base-exe package-win32-base-zip
+package-win32-no-clean: package-win32-base-exe package-win32-base-zip package-win32-base-7zip
+
+package-win32: package-win32-no-clean
 # Clean up
        rm -Rf $(top_builddir)/vlc-${VERSION}