X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.am;h=498d5cd776bff64b8d422229877d5c74c0c77525;hb=1fd0545efbdf4aef65714d6abee9b10832361ba0;hp=b87dd9949fbc5421339a48199accc4b2f341a51c;hpb=3e3af458459aa67a5073831866e2f18c341942e8;p=vlc

diff --git a/Makefile.am b/Makefile.am
index b87dd9949f..498d5cd776 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,7 +9,7 @@
 #  - libs/* are needed by modules
 SUBDIRS = po libs/loader libs/srtp src modules \
 		projects/mozilla bindings projects/activex share doc
-DIST_SUBDIRS = $(SUBDIRS) extras/buildsystem/autotools/m4 extras/package/ipkg
+DIST_SUBDIRS = $(SUBDIRS) m4  extras/package/ipkg
 
 EXTRA_DIST = \
 	HACKING \
@@ -26,7 +26,7 @@ EXTRA_DIST = \
 
 dist_noinst_SCRIPTS = bootstrap toolbox
 
-BUILT_SOURCES_distclean = vlc-config compile vlc.win32.nsi
+BUILT_SOURCES_distclean = vlc-config compile extras/package/win32/vlc.win32.nsi
 if HAVE_DARWIN
 BUILT_SOURCES_clean = macosx-sdk
 else
@@ -45,9 +45,9 @@ AUTOMAKE_OPTIONS = \
 	1.9 \
 	-Wall \
 	check-news \
-	std-options \
 	dist-bzip2 \
 	no-dist-gzip
+#	std-options
 
 ###############################################################################
 # MacOS X project
@@ -211,15 +211,15 @@ EXTRA_DIST += \
 # Various utilities ( editor syntax files, D-Bus controller ... )
 ##############################################################################
 EXTRA_DIST += \
-	extras/Makefile \
-	extras/zsh.cpp \
-	extras/emacs.init \
-	extras/vlc.vim \
-	extras/make.pl \
-	extras/valgrind.suppressions \
-	extras/m4/autoconf260.m4 \
-	extras/mpris.py \
-	extras/mpris.glade
+	extras/analyser/zsh_completion.sh \
+	extras/analyser/zsh.cpp \
+	extras/analyser/emacs.init \
+	extras/analyser/vlc.vim \
+	extras/analyser/valgrind.suppressions \
+	extras/buildsystem/make.pl \
+	extras/buildsystem/autotools/m4/autoconf260.m4 \
+	extras/misc/mpris.py \
+	extras/misc/mpris.glade
 
 dist-hook:
 	distdir=$(distdir) srcdir=$(srcdir) $(SHELL) $(srcdir)/toolbox --dist-contrib
@@ -245,51 +245,17 @@ DISTCLEANFILES = $(BUILT_SOURCES_distclean) vlc-config.in compile
 # Don't use it if you don't know what it is about.
 # Don't complain if it doesn't work. -- Courmisch
 libvlc:
-	cd src && $(MAKE) $(AM_MAKEFLAGS) $(LIB_libvlc)
+	cd src && $(MAKE) $(AM_MAKEFLAGS) libvlc.la
 
-.PHONY: libvlc
+core:
+	cd src && $(MAKE) $(AM_MAKEFLAGS) vlc
 
-###############################################################################
-# Building vlc
-###############################################################################
-
-bin_PROGRAMS = vlc
-
-vlc_SOURCES = src/vlc.c
-# Ugly kludge so that automake defines $(CXXLINK)
-nodist_EXTRA_vlc_SOURCES = extras/zsh.cpp src/misc/darwin_specific.m
-
-vlc_DEPENDENCIES = $(DATA_win32_rc)
-
-vlc_LDADD = $(DATA_win32_rc) $(LIBVLC) $(LTLIBINTL) `$(VLC_CONFIG) -libs vlc`
-vlc_LDFLAGS = `$(VLC_CONFIG) --ldflags vlc`
-if !HAVE_PLUGINS
-vlc_LDFLAGS += `$(VLC_CONFIG) --target plugin | sed -e 's/\_plugin /_plugin.la /g'`
-endif
-
-vlc_CFLAGS = `$(VLC_CONFIG) --cflags vlc`
-LIB_libvlc = libvlc.la
-LIBVLC = src/$(LIB_libvlc)
+.PHONY: libvlc core
 
 #To get some nice output
 nice:
 	$(top_builddir)/compile
 
-core: libvlc vlc$(EXEEXT)
-
-.PHONY: core
-
-vlc$(EXEEXT): $(vlc_OBJECTS) $(vlc_DEPENDENCIES)
-	@rm -f vlc$(EXEEXT)
-	@case `$(VLC_CONFIG) --linkage vlc builtin` in \
-	  c++) cmd="$(CXXLINK)" ;; \
-	  objc) cmd="$(OBJCLINK)" ;; \
-	  c|*) cmd="$(LINK)" ;; \
-	esac ; \
-	cmd="$$cmd $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS)" ; \
-	echo $$cmd ; \
-	eval $$cmd
-
 if HAVE_BEOS
 noinst_DATA = vlc-bundle
 vlc-bundle: vlc
@@ -322,6 +288,7 @@ endif
 
 ALL_ALIASES = cvlc rvlc svlc wxvlc qvlc nvlc
 bin_SCRIPTS += $(ALIASES)
+CLEANFILES += $(ALIASES)
 EXTRA_SCRIPTS = $(ALL_ALIASES)
 
 dist_noinst_SCRIPTS += make-alias
@@ -346,22 +313,30 @@ qvlc: make-alias
 nvlc: make-alias
 	$(MKALIAS) ncurses
 
+noinst_SCRIPTS = vlc$(EXEEXT)
+
+vlc$(EXEEXT): core
+	rm -f vlc$(EXEEXT)
+	ln -s src/vlc$(EXEEXT)
+#	rm -f -- vlc vlc.tmp
+#	echo '#! /bin/sh' > vlc.tmp
+#	echo 'exec "$$(dirname "$$0")/src/vlc$(EXEEXT)" "--plugin-path=$$(dirname "$$0")/modules" "$$@"' >> vlc.tmp
+#	chmod +x vlc.tmp
+#	mv -f -- vlc.tmp vlc
+
 if HAVE_DARWIN
 # Create the MacOS X app
 noinst_DATA = VLC.app
 # VLC-release.app is the old VLC.app target
 VLC-release.app: vlc
-	( cd  src && make  )
-	@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/extras/package/macosx"; \
-	fi
+	( cd src && make install )
+	rm -Rf "$(top_builddir)/tmp"
+	mkdir -p "$(top_builddir)/tmp/extras/package/macosx"
 	rm -Rf $(top_builddir)/VLC-release.app
-	cp -R $(srcdir)/extras/package/macosx/vlc.xcodeproj $(top_builddir)/tmp/extras/package/macosx/
-	cp -R $(srcdir)/extras/package/macosx/Resources $(top_builddir)/tmp/extras/package/macosx
-	for i in AUTHORS COPYING extras/package/macosx/README.MacOSX.rtf THANKS; do \
+	for i in vlc.xcodeproj Resources README.MacOSX.rtf; do \
+	  cp -R $(srcdir)/extras/package/macosx/$$i $(top_builddir)/tmp/extras/package/macosx/; \
+	done
+	for i in AUTHORS COPYING THANKS; do \
 	  cp "$(srcdir)/$$i" $(top_builddir)/tmp; \
 	done
 	mkdir -p $(top_builddir)/tmp/modules/audio_output
@@ -394,6 +369,8 @@ VLC-release.app: vlc
 	    prefs_widgets.m \
 	    prefs.h \
 	    prefs.m \
+	    simple_prefs.h \
+	    simple_prefs.m \
 	    vout.h \
 	    voutqt.m \
 	    voutgl.m \
@@ -418,12 +395,12 @@ VLC-release.app: vlc
              $(top_builddir)/tmp/modules/gui/macosx; \
 	done
 	cd $(top_builddir)/tmp/extras/package/macosx && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)' && \
-	    cd ../../../ && \
+	    cd ../../../../ && \
 	    cp -R $(top_builddir)/tmp/extras/package/macosx/build/Default/VLC.bundle \
 	          $(top_builddir)/VLC-release.app; \
 	rm -Rf $(top_builddir)/tmp
 	$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS
-	ACTION="VLC-release.app" src_dir=$(srcdir) build_dir=$(top_builddir) sh $(srcdir)/extras/package/macosx/Framework/Pre-Compile.sh
+	ACTION="VLC-release.app" src_dir=$(srcdir) build_dir=$(top_builddir) sh $(srcdir)/projects/macosx/framework/Pre-Compile.sh
 	$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/luaplaylist
 	for i in $(srcdir)/share/luaplaylist/*.* ; do \
 	  $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/luaplaylist/`basename $${i}` ; \
@@ -450,28 +427,28 @@ VLC-release.app: vlc
 	$(INSTALL) -m 644 $(srcdir)/share/http-lua/.hosts $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/.hosts
 	for i in $(srcdir)/share/http-lua/*.* ; do \
 	  $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/`basename $${i}` ; \
-	done ; \
+	done
 	for i in $(srcdir)/share/http-lua/dialogs/* ; do \
 	  $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/dialogs/`basename $${i}` ; \
-	done ; \
+	done
 	for i in $(srcdir)/share/http-lua/js/*.* ; do \
 	  $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/js/`basename $${i}` ; \
-	done ; \
+	done
 	for i in $(srcdir)/share/http-lua/old/*.* ; do \
 	  $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/old/`basename $${i}` ; \
-	done ; \
+	done
 	for i in $(srcdir)/share/http-lua/old/admin/*.* ; do \
 	  $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/old/admin/`basename $${i}` ; \
-	done ; \
+	done
 	for i in $(srcdir)/share/http-lua/old/vlm/*.* ; do \
 	  $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/old/vlm/`basename $${i}` ; \
-	done ; \
+	done
 	for i in $(srcdir)/share/http-lua/images/*.* ; do \
 	  $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/images/`basename $${i}` ; \
-	done ; \
+	done
 	for i in $(srcdir)/share/http-lua/requests/*.* ; do \
 	  $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/requests/`basename $${i}` ; \
-	done ; \
+	done
 	$(INSTALL) -m 644 $(srcdir)/share/http-lua/requests/readme $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/requests/readme.txt
 	$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/dialogs
 	$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/js
@@ -484,28 +461,28 @@ VLC-release.app: vlc
 	$(INSTALL) -m 644 $(srcdir)/share/http/old/.hosts $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/old/.hosts
 	for i in $(srcdir)/share/http/*.* ; do \
 	  $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/`basename $${i}` ; \
-	done ; \
+	done
 	for i in $(srcdir)/share/http/dialogs/* ; do \
 	  $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/dialogs/`basename $${i}` ; \
-	done ; \
+	done
 	for i in $(srcdir)/share/http/js/*.* ; do \
 	  $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/js/`basename $${i}` ; \
-	done ; \
+	done
 	for i in $(srcdir)/share/http/old/*.* ; do \
 	  $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/old/`basename $${i}` ; \
-	done ; \
+	done
 	for i in $(srcdir)/share/http/old/admin/*.* ; do \
 	  $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/old/admin/`basename $${i}` ; \
-	done ; \
+	done
 	for i in $(srcdir)/share/http/old/vlm/*.* ; do \
 	  $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/old/vlm/`basename $${i}` ; \
-	done ; \
+	done
 	for i in $(srcdir)/share/http/images/*.* ; do \
 	  $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/images/`basename $${i}` ; \
-	done ; \
+	done
 	for i in $(srcdir)/share/http/requests/*.* ; do \
 	  $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/requests/`basename $${i}` ; \
-	done ; \
+	done
 	$(INSTALL) -m 644 $(srcdir)/share/http/requests/readme $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/requests/readme.txt
 	$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/locale
 	cat $(top_srcdir)/po/LINGUAS | while read i; do \
@@ -523,16 +500,13 @@ VLC-release.app: vlc
 
 VLC.app: vlc 
 	( cd src && make install )
-	@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/extras/package/macosx"; \
-	fi
+	rm -Rf $(top_builddir)/tmp
+	mkdir -p "$(top_builddir)/tmp/extras/package/macosx"
 	rm -Rf $(top_builddir)/VLC.app
-	cp -R $(srcdir)/extras/package/macosx/vlc.xcodeproj $(top_builddir)/tmp/extras/package/macosx/
-	cp -R $(srcdir)/extras/package/macosx/Resources $(top_builddir)/tmp/extras/package/macosx
-	for i in AUTHORS COPYING extras/package/macosx/README.MacOSX.rtf THANKS; do \
+	for i in vlc.xcodeproj Resources README.MacOSX.rtf; do \
+	  cp -R $(srcdir)/extras/package/macosx/$$i $(top_builddir)/tmp/extras/package/macosx/; \
+	done
+	for i in AUTHORS COPYING THANKS; do \
 	  cp "$(srcdir)/$$i" $(top_builddir)/tmp; \
 	done
 	mkdir -p $(top_builddir)/tmp/modules/audio_output
@@ -565,6 +539,8 @@ VLC.app: vlc
 	    prefs_widgets.m \
 	    prefs.h \
 	    prefs.m \
+	    simple_prefs.h \
+	    simple_prefs.m \
 	    vout.h \
 	    voutqt.m \
 	    voutgl.m \
@@ -589,12 +565,12 @@ VLC.app: vlc
              $(top_builddir)/tmp/modules/gui/macosx; \
 	done
 	cd $(top_builddir)/tmp/extras/package/macosx && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)' && \
-	    cd ../../../ && \
+	    cd ../../../../ && \
 	    cp -R $(top_builddir)/tmp/extras/package/macosx/build/Default/VLC.bundle \
-	          $(top_builddir)/VLC.app; \
+	          $(top_builddir)/VLC.app
 	rm -Rf $(top_builddir)/tmp
 	$(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS
-	$(INSTALL) $(top_builddir)/.libs/vlc \
+	$(INSTALL) $(top_builddir)/src/.libs/vlc \
 		   $(top_builddir)/VLC.app/Contents/MacOS/VLC
 	ln -sf ./VLC $(top_builddir)/VLC.app/Contents/MacOS/clivlc
 	$(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/modules
@@ -607,7 +583,7 @@ VLC.app: vlc
 	$(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/locale
 	cat $(top_srcdir)/po/LINGUAS | while read i; do \
 	  mkdir -p $(top_builddir)/VLC.app/Contents/MacOS/locale/$${i}/LC_MESSAGES ; \
-	  ln -sfn `pwd`/po/$${i}.gmo $(top_builddir)/VLC.app/Contents/MacOS/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \
+	  ln -sfn `pwd`/$(srcdir)/po/$${i}.gmo $(top_builddir)/VLC.app/Contents/MacOS/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \
 	  mkdir -p $(top_builddir)/VLC.app/Contents/Resources/$${i}.lproj ; \
 	  ln -sf ../English.lproj/InfoPlist.strings \
 	      $(top_builddir)/VLC.app/Contents/Resources/$${i}.lproj ; \
@@ -617,15 +593,6 @@ VLC.app: vlc
 	printf "APPLVLC#" >| $(top_builddir)/VLC.app/Contents/PkgInfo
 endif
 
-if HAVE_WIN32
-DATA_win32_rc = $(noinst_share_vlc_win32_rc_DATA)
-noinst_share_vlc_win32_rc_DATA = share/vlc_win32_rc.$(OBJEXT)
-noinst_share_vlc_win32_rcdir = $(libdir)
-share/vlc_win32_rc.$(OBJEXT): share/vlc_win32_rc.rc
-	$(WINDRES) -DVERSION=$(VERSION) -DVERSION_NUMBER=`echo $(VERSION).0.0.0 | sed 's/\([0-9]*\)[^.]*\.*\([0-9]*\)[^.]*\.*\([0-9]*\)[^.]*\.*\([0-9]*\).*/\1,\2,\3,\4/'` --include-dir $(srcdir)/share -i $< -o $@
-endif
-
-
 ###############################################################################
 # Building architecture-specific binary packages
 ###############################################################################
@@ -644,7 +611,7 @@ package-win-common:
 	fi
 
 # Copy relevant files
-	cp "$(top_builddir)/.libs/vlc$(EXEEXT)" "$(top_builddir)/vlc-$(VERSION)/"
+	cp "$(top_builddir)/src/.libs/vlc$(EXEEXT)" "$(top_builddir)/vlc-$(VERSION)/"
 	cp "$(top_srcdir)/extras/package/win32/vlc.exe.manifest" "$(top_builddir)/vlc-$(VERSION)/"
 	cp "$(top_builddir)/src/.libs/libvlc$(LIBEXT)" "vlc-$(VERSION)/"
 	cp "$(top_builddir)/src/.libs/libvlc-control$(LIBEXT)" "vlc-$(VERSION)/"
@@ -652,8 +619,8 @@ package-win-common:
 	for file in AUTHORS MAINTAINERS THANKS ; \
 	  do sed 's/@/_AT_/' < "$(srcdir)/$$file" > "$(top_builddir)/vlc-$(VERSION)/$${file}.txt" ; done;
 	for file in NEWS COPYING README; \
-	   do cp "$(srcdir)/$$file" "$(top_builddir)/vlc-$(VERSION)/$${file}.txt"; done
-	  unix2dos "$(top_builddir)/vlc-$(VERSION)/"*.txt
+	  do cp "$(srcdir)/$$file" "$(top_builddir)/vlc-$(VERSION)/$${file}.txt"; done
+	unix2dos "$(top_builddir)/vlc-$(VERSION)/"*.txt
 
 	mkdir $(top_builddir)/vlc-$(VERSION)/locale
 	cat $(top_srcdir)/po/LINGUAS | while read i; do \
@@ -750,7 +717,7 @@ if BUILD_ACTIVEX
 	cp $(srcdir)/projects/activex/test.html  $(top_builddir)/vlc-$(VERSION)/activex/ ;
 	unix2dos $(top_builddir)/vlc-$(VERSION)/activex/* ;
 
-	cp $(top_builddir)/activex/.libs/axvlc$(LIBEXT) $(top_builddir)/vlc-$(VERSION)/activex/ ;
+	cp $(top_builddir)/projects/activex/.libs/axvlc$(LIBEXT) $(top_builddir)/vlc-$(VERSION)/activex/ ;
 endif
 # Rebase all those DLLs to speed up loading (need cygwin rebase)
 	if rebase -b 0x42 /dev/null >/dev/null 2>&1; then \
@@ -770,7 +737,7 @@ endif
 
 package-win32-base-debug: package-win-common
 # Copy relevant files
-	cp "$(top_builddir)/vlc.win32.nsi" "$(top_builddir)/vlc-$(VERSION)/"
+	cp "$(top_builddir)/extras/package/win32/vlc.win32.nsi" "$(top_builddir)/vlc-$(VERSION)/"
 
 	mkdir -p "$(top_builddir)/vlc-$(VERSION)/plugins"
 	for i in "" `$(VLC_CONFIG) --target plugin` ; do \
@@ -941,7 +908,7 @@ package-macosx:
           mkdir -p $(top_builddir)/vlc-$(VERSION)/.background/ && \
           cp AUTHORS COPYING ChangeLog README THANKS NEWS $(top_builddir)/vlc-$(VERSION)/Goodies/ && \
           cp -R  extras/package/macosx/Delete_Preferences.app $(top_builddir)/vlc-$(VERSION)/Goodies/Delete\ VLC\ Preferences.app && \
-	  cp README.MacOSX.rtf $(top_builddir)/vlc-$(VERSION)/Read\ Me.rtf && \
+	  cp extras/package/macosx/README.MacOSX.rtf $(top_builddir)/vlc-$(VERSION)/Read\ Me.rtf && \
 	  cp extras/package/macosx/Resources/about_bg.png $(top_builddir)/vlc-$(VERSION)/.background/background.png ;
 
 # Place a link to the application folder