X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.am;h=2d8b005ec9d35d7d00e04e3c939c7b9ebbe8e194;hb=4f86b958a07865f443eef419a6e609f75568492a;hp=e4b0d962a34ea33d778209a12841e7e42263c4c4;hpb=d015ddc74a4e517c15e8236887b76bc9675101b1;p=vlc

diff --git a/Makefile.am b/Makefile.am
index e4b0d962a3..2d8b005ec9 100644
--- 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)
@@ -115,6 +118,7 @@ HEADERS_include = \
 	include/vlc_md5.h \
 	include/vlc_image.h \
 	include/vlc_input.h \
+	include/vlc_interaction.h \
 	include/vlc_interface.h \
 	include/vlc_keys.h \
 	include/vlc_messages.h \
@@ -133,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
@@ -250,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 \
@@ -300,7 +305,7 @@ vlc-config.in: vlc-config.in.in
 
 MOSTLYCLEANFILES = $(DATA_noinst_libvlc)
 CLEANFILES = $(BUILT_SOURCES_clean) stamp-builtin
-DISTCLEANFILES = $(BUILT_SOURCES_distclean) vlc-config.in
+DISTCLEANFILES = $(BUILT_SOURCES_distclean) vlc-config.in compile
 
 if HAVE_WIN32
 lib_LIBRARIES = lib/libvlc.a
@@ -444,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 \
@@ -451,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 \
@@ -466,10 +473,16 @@ 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/mediacontrol_init.c src/control/mediacontrol_plugin.c
+
 SOURCES_libvlc = \
 	$(SOURCES_libvlc_common) \
 	$(OPT_SOURCES_libvlc_beos) \
@@ -551,7 +564,7 @@ endif
 install-exec-local:
 	for i in "" $(ALIASES) ; do if test -n "$$i" ; then \
 	  rm -f "$(DESTDIR)$(bindir)/$$i" && \
-	  ln -s vlc "$(DESTDIR)$(bindir)/$$i" ; \
+	  ln -sf vlc "$(DESTDIR)$(bindir)/$$i" ; \
 	fi ; done
 	test -z "$(DATA_noinst_libvlc)" || $(INSTALL_PROGRAM) "$(DATA_noinst_libvlc)" "$(DESTDIR)$(libdir)"
 
@@ -580,8 +593,6 @@ VLC-release.app: vlc
 	  cp "$(srcdir)/$$i" $(top_builddir)/tmp; \
 	done
 	mkdir -p $(top_builddir)/tmp/modules/audio_output
-	cp $(srcdir)/modules/audio_output/coreaudio.c \
-	   $(top_builddir)/tmp/modules/audio_output/coreaudio.c
 	mkdir -p $(top_builddir)/tmp/modules/gui/macosx
 	for i in \
 	    about.h \
@@ -660,15 +671,6 @@ VLC-release.app: vlc
 	for i in $(srcdir)/share/http/* ; do \
 	  $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/`basename $${i}` ; \
 	done ; \
-	$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/vlm
-	for i in $(srcdir)/share/http/vlm/* ; do \
-	  $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/vlm/`basename $${i}` ; \
-	done ; \
-	$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/admin
-	for i in $(srcdir)/share/http/admin/* ; do \
-	  $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/admin/`basename $${i}` ; \
-	done ; \
-	$(INSTALL) -m 644 $(srcdir)/share/http/admin/.access $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/admin/.access
 	$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/locale
 	for i in $(ALL_LINGUAS); do \
 	  mkdir -p $(top_builddir)/VLC-release.app/Contents/MacOS/locale/$${i}/LC_MESSAGES ; \
@@ -696,8 +698,6 @@ VLC.app: vlc
 	  cp "$(srcdir)/$$i" $(top_builddir)/tmp; \
 	done
 	mkdir -p $(top_builddir)/tmp/modules/audio_output
-	cp $(srcdir)/modules/audio_output/coreaudio.c \
-	   $(top_builddir)/tmp/modules/audio_output/coreaudio.c
 	mkdir -p $(top_builddir)/tmp/modules/gui/macosx
 	for i in \
 	    about.h \
@@ -876,25 +876,18 @@ package-win32-base:
 	sed -i 's%share/osdmenu%osdmenu%g' $(top_builddir)/vlc-${VERSION}/osdmenu/*.cfg
 	sed -i 's%/%\\%g' $(top_builddir)/vlc-${VERSION}/osdmenu/*.cfg 
 
-	mkdir -p "$(top_builddir)/vlc-${VERSION}/http/admin"
-	mkdir -p "$(top_builddir)/vlc-${VERSION}/http/vlm"
+	mkdir -p "$(top_builddir)/vlc-${VERSION}/http/images"
+	mkdir -p "$(top_builddir)/vlc-${VERSION}/http/requests"
 	cp $(srcdir)/share/http/*.html $(top_builddir)/vlc-${VERSION}/http/ ;
-	unix2dos $(top_builddir)/vlc-${VERSION}/http/*.html ;:
+	unix2dos $(top_builddir)/vlc-${VERSION}/http/*.html ;
 	cp $(srcdir)/share/http/*.css $(top_builddir)/vlc-${VERSION}/http/ ;
 	unix2dos $(top_builddir)/vlc-${VERSION}/http/*.css ;
-	cp $(srcdir)/share/http/*.png $(top_builddir)/vlc-${VERSION}/http/
+	cp $(srcdir)/share/http/*.js $(top_builddir)/vlc-${VERSION}/http/ ;
+	unix2dos $(top_builddir)/vlc-${VERSION}/http/*.js ;
 	cp $(srcdir)/share/http/*.ico $(top_builddir)/vlc-${VERSION}/http/ ;
-	cp $(srcdir)/share/http/admin/*.html \
-           $(top_builddir)/vlc-${VERSION}/http/admin/ ;
-	unix2dos $(top_builddir)/vlc-${VERSION}/http/admin/*.html ;
-	cp $(srcdir)/share/http/admin/dboxfiles.html \
-           $(top_builddir)/vlc-${VERSION}/http/admin/ ;
-	cp $(srcdir)/share/http/admin/.access \
-           $(top_builddir)/vlc-${VERSION}/http/admin/ ;
-	unix2dos $(top_builddir)/vlc-${VERSION}/http/admin/.access ;
-	cp $(srcdir)/share/http/vlm/*.html \
-           $(top_builddir)/vlc-${VERSION}/http/vlm/ ;
-	unix2dos $(top_builddir)/vlc-${VERSION}/http/vlm/*.html ;
+	cp $(srcdir)/share/http/images/*.png $(top_builddir)/vlc-${VERSION}/http/images/
+	cp $(srcdir)/share/http/requests/*.xml $(top_builddir)/vlc-${VERSION}/http/requests/ ;
+	unix2dos $(top_builddir)/vlc-${VERSION}/http/requests/*.xml ;
 
 	cp $(srcdir)/share/vlc48x48.ico $(top_builddir)/vlc-${VERSION}/ ;
 
@@ -921,13 +914,19 @@ endif
 
 package-win32-base-exe:
 # Create package
-	wine C:/Program\ Files/NSIS/makensis.exe \
-             /DVERSION=${VERSION} $(top_builddir)/vlc-${VERSION}/vlc.win32.nsi
+	if [ -x makensis ]; then \
+	    MAKENSIS=makensis; \
+	elif [ -x "/cygdrive/c/Program Files/NSIS/makensis" ]; then \
+	    MAKENSIS="/cygdrive/c/Program\ Files/NSIS/makensis"; \
+	elif [ -x wine ]; then \
+	    MAKENSIS="wine C:/Program\ Files/NSIS/makensis.exe"; \
+	else \
+	    echo 'Error: cannot locate makensis tool'; exit 1; \
+	fi; \
+	eval "$$MAKENSIS /DVERSION=${VERSION} $(top_builddir)/vlc-${VERSION}/vlc.win32.nsi"
 
-package-win32-base-exe-cygwin:
+package-win32-base-exe-cygwin: package-win32-base-exe
 # Create package
-	C:/Program\ Files/NSIS/makensis.exe \
-             /DVERSION=${VERSION} $(top_builddir)/vlc-${VERSION}/vlc.win32.nsi
 
 package-win32-base-exe-linux:
 # Create package
@@ -980,25 +979,18 @@ package-wince-base:
 	done
 
 
-	mkdir -p "$(top_builddir)/vlc-${VERSION}/http/admin"
-	mkdir -p "$(top_builddir)/vlc-${VERSION}/http/vlm"
+	mkdir -p "$(top_builddir)/vlc-${VERSION}/http/images"
+	mkdir -p "$(top_builddir)/vlc-${VERSION}/http/requests"
 	cp $(srcdir)/share/http/*.html $(top_builddir)/vlc-${VERSION}/http/ ;
 	unix2dos $(top_builddir)/vlc-${VERSION}/http/*.html ;
 	cp $(srcdir)/share/http/*.css $(top_builddir)/vlc-${VERSION}/http/ ;
 	unix2dos $(top_builddir)/vlc-${VERSION}/http/*.css ;
-	cp $(srcdir)/share/http/*.png $(top_builddir)/vlc-${VERSION}/http/
+	cp $(srcdir)/share/http/*.js $(top_builddir)/vlc-${VERSION}/http/ ;
+	unix2dos $(top_builddir)/vlc-${VERSION}/http/*.js ;
 	cp $(srcdir)/share/http/*.ico $(top_builddir)/vlc-${VERSION}/http/ ;
-	cp $(srcdir)/share/http/admin/*.html \
-           $(top_builddir)/vlc-${VERSION}/http/admin/ ;
-	unix2dos $(top_builddir)/vlc-${VERSION}/http/admin/*.html ;
-	cp $(srcdir)/share/http/admin/dboxfiles.html \
-           $(top_builddir)/vlc-${VERSION}/http/admin/ ;
-	cp $(srcdir)/share/http/admin/.access \
-           $(top_builddir)/vlc-${VERSION}/http/admin/ ;
-	unix2dos $(top_builddir)/vlc-${VERSION}/http/admin/.access ;
-	cp $(srcdir)/share/http/vlm/*.html \
-           $(top_builddir)/vlc-${VERSION}/http/vlm/ ;
-	unix2dos $(top_builddir)/vlc-${VERSION}/http/vlm/*.html ;
+	cp $(srcdir)/share/http/images/*.png $(top_builddir)/vlc-${VERSION}/http/images/
+	cp $(srcdir)/share/http/requests/*.xml $(top_builddir)/vlc-${VERSION}/http/requests/ ;
+	unix2dos $(top_builddir)/vlc-${VERSION}/http/requests/*.xml ;
 
 	cp $(srcdir)/share/vlc48x48.ico $(top_builddir)/vlc-${VERSION}/ ;
 
@@ -1068,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 \
@@ -1157,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
 ###############################################################################