.hosts: Provide a template .hosts.

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 1f9d5c84a0767a2b1e2ab4bebf20003314054a41..2d8b005ec9d35d7d00e04e3c939c7b9ebbe8e194 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -33,9 +33,10 @@ EXTRA_DIST = \
        src/misc/modules_builtin.h.in \
        $(NULL)
 
-BUILT_SOURCES_distclean = vlc-config
+BUILT_SOURCES_distclean = vlc-config compile
 BUILT_SOURCES_clean = \
        stamp-api \
+       macosx-sdk \
        src/misc/modules_builtin.h \
        src/misc/version.c \
        $(NULL)
@@ -62,13 +63,15 @@ pkgincludedir = $(includedir)/vlc
 
 dist_pkginclude_HEADERS = \
        include/vlc/vlc.h \
+       include/vlc/libvlc.h \
        include/vlc/aout.h \
        include/vlc/vout.h \
        include/vlc/sout.h \
        include/vlc/decoder.h \
        include/vlc/input.h \
        include/vlc/intf.h \
-       include/vlc/control.h \
+       include/vlc/mediacontrol.h \
+       include/vlc/mediacontrol_structures.h \
        $(NULL)
 
 noinst_HEADERS = $(HEADERS_include)
@@ -134,6 +137,8 @@ HEADERS_include = \
        include/vlc_xml.h \
        include/vout_synchro.h \
        include/win32_specific.h \
+       include/libvlc_internal.h \
+       include/mediacontrol_internal.h
        $(NULL)
 
 src/misc/modules_builtin.h: Makefile src/misc/modules_builtin.h.in vlc-config
@@ -251,7 +256,6 @@ EXTRA_DIST += \
        extras/MacOSX/Resources/vlc.scriptTerminology \
        extras/MacOSX/Resources/README \
        extras/MacOSX/vlc.pbproj/project.pbxproj \
-       extras/MacOSX/macosx-dmg \
        extras/MacOSX/Delete_Preferences.app/Contents/Info.plist \
        extras/MacOSX/Delete_Preferences.app/Contents/PkgInfo \
        extras/MacOSX/Delete_Preferences.app/Contents/MacOS/applet \
@@ -445,6 +449,7 @@ SOURCES_libvlc_common = \
        src/network/tcp.c \
        src/network/udp.c \
        src/network/httpd.c \
+       src/network/rootwrap.c \
        src/network/tls.c \
        src/misc/charset.c \
        src/misc/md5.c \
@@ -452,6 +457,7 @@ SOURCES_libvlc_common = \
        src/misc/block.c \
        src/misc/modules.c \
        src/misc/threads.c \
+       src/misc/stats.c \
        src/misc/unicode.c \
        src/misc/cpu.c \
        src/misc/configuration.c \
@@ -467,12 +473,15 @@ SOURCES_libvlc_common = \
        src/misc/version.c \
        src/extras/libc.c \
        src/control/core.c \
-       src/control/util.c \
-       src/control/audio_video.c \
+       src/control/playlist.c \
+       src/control/input.c \
+       src/control/mediacontrol_core.c \
+       src/control/mediacontrol_util.c \
+       src/control/mediacontrol_audio_video.c \
        $(NULL)
 
 # These should be distributed, but not compiled
-EXTRA_DIST += src/control/init.c src/control/plugin.c
+EXTRA_DIST += src/control/mediacontrol_init.c src/control/mediacontrol_plugin.c
 
 SOURCES_libvlc = \
        $(SOURCES_libvlc_common) \
@@ -1051,23 +1060,28 @@ package-beos:
        rm -Rf $(srcdir)/tmp ;
 
 package-macosx:
-# Check that tmp isn't in the way
-       @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"; \
+# Check that the temporary location isn't in the way
+       @if test -e "$(top_builddir)/vlc-${VERSION}/"; then \
+         rm -Rf "$(top_builddir)/vlc-${VERSION}/" ; \
        fi
 
+       echo "Create package directory: vlc-${VERSION}/";
+       mkdir -p "$(top_builddir)/vlc-${VERSION}/";
+
 # Copy relevant files 
-       cp -R "$(top_builddir)/VLC-release.app" "$(top_builddir)/tmp/VLC.app"
-       cd "$(srcdir)" && cp AUTHORS COPYING ChangeLog README README.MacOSX.rtf THANKS NEWS $(top_builddir)/tmp/ && cp -R extras/MacOSX/Delete_Preferences.app $(top_builddir)/tmp/
+       cp -R "$(top_builddir)/VLC-release.app" "$(top_builddir)/vlc-${VERSION}/VLC.app"
+       cd "$(srcdir)" && cp AUTHORS COPYING ChangeLog README README.MacOSX.rtf THANKS NEWS $(top_builddir)/vlc-${VERSION}/ && cp -R extras/MacOSX/Delete_Preferences.app $(top_builddir)/vlc-${VERSION}/
 
 # Create disk image 
-       $(srcdir)/extras/MacOSX/macosx-dmg "vlc-${VERSION}" $(top_builddir)/tmp
+       echo "Creating disk image" ;
+       rm -f "$(top_builddir)/vlc-${VERSION}.dmg" ;
+       hdiutil create -srcfolder "$(top_builddir)/vlc-${VERSION}" \
+         "$(top_builddir)/vlc-${VERSION}.dmg" -format UDZO -quiet ;
+       echo; echo "Disk image creation completed:" ;
+       ls -la "$(top_builddir)/vlc-${VERSION}.dmg" ; echo ;
 
 # Clean up
-       rm -Rf $(top_builddir)/tmp
+       rm -Rf "$(top_builddir)/vlc-${VERSION}" ;
 
 package-translations:
        @if test -e "$(srcdir)/vlc-translations-${VERSION}"; then \
@@ -1140,6 +1154,12 @@ stamp-api: Makefile.in $(HEADERS_include) vlc-config vlc-api.pl
          top_srcdir="$(top_srcdir)" perl $(top_srcdir)/vlc-api.pl
        touch stamp-api
 
+###############################################################################
+# Enforce Mac OS X deployment target environment variable
+###############################################################################
+macosx-sdk: Makefile.in $(HEADERS_include) vlc-config vlc-api.pl
+       export MACOSX_DEPLOYMENT_TARGET=$(MACOSX_DEPLOYMENT_TARGET)
+
 ###############################################################################
 # Force rule
 ###############################################################################