X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.am;h=93a84eed71fe38db9e116e97996558cb572819c9;hb=61d872f559ebffc1a4e0768a77d3631523c60d71;hp=dab434343842b1c6f5a745f50ef4c30d25e904ce;hpb=717b5070683209785736bc89a57d026a597280ea;p=vlc

diff --git a/Makefile.am b/Makefile.am
index dab4343438..93a84eed71 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,8 +26,9 @@ EXTRA_DIST = \
 	toolbox \
 	vlc-api.pl \
 	vlc-config.in.in \
-	vlc.spec \
-	vlc.spec.mdk \
+	vlc.fedora.spec \
+	vlc.mandriva.spec \
+	vlc.altlinux.spec \
 	vlc.win32.nsi.in \
 	$(NULL)
 
@@ -39,10 +40,7 @@ BUILT_SOURCES = $(BUILT_SOURCES_distclean) $(BUILT_SOURCES_clean)
 SUFFIXES = 
 
 DISTCHECK_CONFIGURE_FLAGS = --disable-dvd --disable-mad --disable-libmpeg2 \
-	--disable-ffmpeg --disable-faad --disable-skins2
-if USE_LIBTOOL
-DISTCHECK_CONFIGURE_FLAGS += --enable-libtool
-endif
+	--disable-ffmpeg --disable-faad --disable-wxwidgets --disable-skins2
 
 # Tell aclocal to use -I m4. Wonder if it really works.
 ACLOCAL_AMFLAGS = -I m4
@@ -82,6 +80,9 @@ EXTRA_DIST += \
 	extras/MacOSX/Resources/English.lproj/Interaction.nib/classes.nib \
 	extras/MacOSX/Resources/English.lproj/Interaction.nib/info.nib \
 	extras/MacOSX/Resources/English.lproj/Interaction.nib/keyedobjects.nib \
+	extras/MacOSX/Resources/English.lproj/InteractionErrorPanel.nib/classes.nib \
+	extras/MacOSX/Resources/English.lproj/InteractionErrorPanel.nib/info.nib \
+	extras/MacOSX/Resources/English.lproj/InteractionErrorPanel.nib/keyedobjects.nib \
 	extras/MacOSX/Resources/English.lproj/InfoPlist.strings \
 	extras/MacOSX/Resources/a52.icns \
 	extras/MacOSX/Resources/aac.icns \
@@ -152,6 +153,41 @@ EXTRA_DIST += \
 	extras/MacOSX/Resources/vlc.scriptSuite \
 	extras/MacOSX/Resources/vlc.scriptTerminology \
 	extras/MacOSX/Resources/README \
+	extras/MacOSX/Resources/add_embedded.png \
+	extras/MacOSX/Resources/add_embedded_blue.png \
+	extras/MacOSX/Resources/repeat_embedded.png \
+	extras/MacOSX/Resources/repeat_embedded_blue.png \
+	extras/MacOSX/Resources/repeat_single_embedded_blue.png \
+	extras/MacOSX/Resources/shuffle_embedded.png \
+	extras/MacOSX/Resources/shuffle_embedded_blue.png \
+	extras/MacOSX/Resources/fs_volume_slider_knob_highlight.png \
+	extras/MacOSX/Resources/fs_volume_slider_knob.png \
+	extras/MacOSX/Resources/fs_volume_slider_bar.png \
+	extras/MacOSX/Resources/fs_volume_mute_highlight.png \
+	extras/MacOSX/Resources/fs_volume_mute.png \
+	extras/MacOSX/Resources/fs_volume_max_highlight.png \
+	extras/MacOSX/Resources/fs_volume_max.png \
+	extras/MacOSX/Resources/fs_time_slider_knob_highlight.png \
+	extras/MacOSX/Resources/fs_time_slider_knob.png \
+	extras/MacOSX/Resources/fs_time_slider.png \
+	extras/MacOSX/Resources/fs_stop_highlight.png \
+	extras/MacOSX/Resources/fs_stop.png \
+	extras/MacOSX/Resources/fs_skip_previous_highlight.png \
+	extras/MacOSX/Resources/fs_skip_previous.png \
+	extras/MacOSX/Resources/fs_skip_next_highlight.png \
+	extras/MacOSX/Resources/fs_skip_next.png \
+	extras/MacOSX/Resources/fs_rewind_highlight.png \
+	extras/MacOSX/Resources/fs_rewind.png \
+	extras/MacOSX/Resources/fs_play_highlight.png \
+	extras/MacOSX/Resources/fs_play.png \
+	extras/MacOSX/Resources/fs_pause_highlight.png \
+	extras/MacOSX/Resources/fs_pause.png \
+	extras/MacOSX/Resources/fs_forward_highlight.png \
+	extras/MacOSX/Resources/fs_forward.png \
+	extras/MacOSX/Resources/fs_exit_fullscreen_highlight.png \
+	extras/MacOSX/Resources/fs_exit_fullscreen.png \
+	extras/MacOSX/Resources/fs_background.png \
+	extras/MacOSX/fullscreen_panel.svg \
 	extras/MacOSX/vlc.pbproj/project.pbxproj \
 	extras/MacOSX/Delete_Preferences.app/Contents/Info.plist \
 	extras/MacOSX/Delete_Preferences.app/Contents/PkgInfo \
@@ -168,7 +204,7 @@ EXTRA_DIST += \
 	$(NULL)
 
 ###############################################################################
-# Various utilities ( editor syntax files, ... )
+# Various utilities ( editor syntax files, D-Bus controller ... )
 ##############################################################################
 EXTRA_DIST += \
 	extras/Makefile \
@@ -177,6 +213,9 @@ EXTRA_DIST += \
 	extras/vlc.vim \
 	extras/make.pl \
 	extras/valgrind.suppressions \
+	extras/m4/autoconf260.m4 \
+	extras/dbus-vlc.py \
+	extras/dbus-vlc.glade \
 	$(NULL)
 
 ###############################################################################
@@ -243,9 +282,9 @@ vlc_LDADD = $(DATA_win32_rc) $(LIBVLC)
 
 vlc_CFLAGS = `$(VLC_CONFIG) --cflags vlc`
 if USE_LIBTOOL
-vlc_LDFLAGS = `$(VLC_CONFIG) --libs vlc`
 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
@@ -267,14 +306,15 @@ endif
 # Shortcut for developpers to rebuild the core (libvlc + vlc)
 # Don't use it if you don't know what it is about.
 # Don't complain if it doesn't work. -- Courmisch
-core:
-	rm -f src/$(LIB_libvlc)
+libvlc:
+	cd src && $(MAKE) $(AM_MAKEFLAGS) $(LIB_libvlc)
+
+core: libvlc
 	$(MAKE) $(AM_MAKEFLAGS) vlc$(EXEEXT)
 
-.PHONY: core
+.PHONY: libvlc core
 
-src/$(LIB_libvlc):
-	cd src && $(MAKE) $(AM_MAKEFLAGS) $(LIB_libvlc)
+src/$(LIB_libvlc): libvlc
 
 vlc$(EXEEXT): $(vlc_OBJECTS) $(DEPENDENCIES_vlc)
 	@rm -f vlc$(EXEEXT)
@@ -314,7 +354,7 @@ vlc-bundle: vlc
 endif
 
 # Install the symlinks
-install-exec-local:
+install-exec-local: install-binPROGRAMS
 	for i in "" $(ALIASES) ; do if test -n "$$i" ; then \
 	  rm -f "$(DESTDIR)$(bindir)/$$i" && \
 	  ln -sf vlc "$(DESTDIR)$(bindir)/$$i" ; \
@@ -390,21 +430,23 @@ VLC-release.app: vlc
 	    interaction.m \
 	    embeddedwindow.h \
 	    embeddedwindow.m \
+	    fspanel.h \
+	    fspanel.m \
 	    vout.m; do \
 	  cp "$(srcdir)/modules/gui/macosx/$$i" \
              $(top_builddir)/tmp/modules/gui/macosx; \
 	done
-	case $(target_triplet) in \
-	  *darwin6*) cd $(top_builddir)/tmp/extras/MacOSX && pbxbuild -target vlc | grep -v '^\([ \t]\|$$\)'; \
-	    cd ../../../; \
+	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 ../../../; \
+	  *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 ../../../; \
+	  *darwin8*) 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
@@ -530,21 +572,23 @@ VLC.app: vlc
 	    interaction.m \
 	    embeddedwindow.h \
 	    embeddedwindow.m \
+	    fspanel.h \
+	    fspanel.m \
 	    vout.m; do \
 	  cp "$(srcdir)/modules/gui/macosx/$$i" \
              $(top_builddir)/tmp/modules/gui/macosx; \
 	done
-	case $(target_triplet) in \
-	  *darwin6*) cd $(top_builddir)/tmp/extras/MacOSX && pbxbuild -target vlc | grep -v '^\([ \t]\|$$\)'; \
-	    cd ../../../; \
+	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 ../../../; \
+	  *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 ../../../; \
+	  *darwin8*) 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
@@ -678,7 +722,6 @@ endif
 if BUILD_MOZILLA
 	mkdir -p "$(top_builddir)/vlc-${VERSION}/mozilla"
 	cp $(top_builddir)/mozilla/*$(LIBEXT) $(top_builddir)/vlc-${VERSION}/mozilla/ ;
-	cp $(top_builddir)/mozilla/vlcintf.xpt  $(top_builddir)/vlc-${VERSION}/mozilla/ ;
 endif
 
 if BUILD_ACTIVEX
@@ -764,7 +807,7 @@ package-win32-base-exe-linux:
 
 package-win32-base-zip: package-win32-base
 # Create package 
-	zip -r vlc-${VERSION}-win32.zip vlc-${VERSION}
+	zip -r -9 vlc-${VERSION}-win32.zip vlc-${VERSION}
 
 package-win32-base-7zip: package-win32-base
 # Create package 
@@ -819,7 +862,7 @@ package-beos:
 	xres -o $(srcdir)/tmp/vlc/vlc $(srcdir)/share/vlc_beos.rsrc ;
 	find $(srcdir)/tmp/vlc -exec mimeset -f {} \; ;
 	mv $(srcdir)/tmp/vlc $(srcdir)/tmp/vlc-${VERSION} ;
-	(cd $(srcdir)/tmp ; zip -9 -r vlc-${VERSION}-BeOS-debug.zip vlc-${VERSION} )
+	(cd $(srcdir)/tmp && zip -9 -r vlc-${VERSION}-BeOS-debug.zip vlc-${VERSION} )
 	mv $(srcdir)/tmp/vlc-${VERSION}-BeOS-debug.zip $(srcdir)/ ;
 	mv $(srcdir)/tmp/vlc-${VERSION} $(srcdir)/tmp/vlc ;
 
@@ -830,7 +873,7 @@ package-beos:
 	xres -o $(srcdir)/tmp/vlc/vlc $(srcdir)/share/vlc_beos.rsrc ;
 	find $(srcdir)/tmp/vlc -exec mimeset -f {} \; ;
 	mv $(srcdir)/tmp/vlc $(srcdir)/tmp/vlc-${VERSION} ;
-	(cd $(srcdir)/tmp ; zip -9 -r vlc-${VERSION}-BeOS.zip vlc-${VERSION} )
+	(cd $(srcdir)/tmp &&  zip -9 -r vlc-${VERSION}-BeOS.zip vlc-${VERSION} )
 	mv $(srcdir)/tmp/vlc-${VERSION}-BeOS.zip $(srcdir)/ ;
 
 # Clean up
@@ -846,7 +889,11 @@ package-macosx:
 	mkdir -p "$(top_builddir)/vlc-${VERSION}/";
 
 # Copy relevant files 
-	cp -R "$(top_builddir)/VLC-release.app" "$(top_builddir)/vlc-${VERSION}/VLC.app"
+	@if test -e "$(top_builddir)/VLC-release.app/"; then \
+	  cp -R "$(top_builddir)/VLC-release.app" "$(top_builddir)/vlc-${VERSION}/VLC.app"; \
+	else \
+	  cp -R "$(top_builddir)/VLC.app" "$(top_builddir)/vlc-${VERSION}/VLC.app"; \
+	fi
 	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 
@@ -922,7 +969,7 @@ package-translations:
 update-po:
 	rm -f $(top_srcdir)/po/POTFILES.in
 	{ \
-	  cd $(top_srcdir) ; \
+	  cd $(top_srcdir) && \
 	  echo "# automatically created by make update-po" ; \
 	  echo "" ; \
 	  echo "# main sources" ; \
@@ -931,7 +978,7 @@ update-po:
 	    | sort ; \
 	  echo "" ; \
 	  echo "# modules" ; \
-	  find modules -name '*.[chm]' -o -name '*.[ch]pp' -o -name '*.ui'\
+	  find modules -name '*.[chm]' -o -name '*.[ch]pp' -o -wholename 'modules/gui/qt4/ui/*.ui'\
 	    | grep -v '\(\.moc\.\|gui/gtk2/\)' \
 	    | grep -vE 'qt4/ui/.*.h' |grep -v qt4/resources.cpp \
 	    | sort ; \