X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.am;h=b1519247037e536493daad1303bfd8e926fa16f8;hb=77015ab46b9aff1d25ac3ca3c064893549fd4137;hp=6a04de80c00be8858c61d3ed96dd819ae8bd786c;hpb=5f94d9ca26ecd8466dff44b284cc1aad3ffdea3f;p=vlc

diff --git a/Makefile.am b/Makefile.am
index 6a04de80c0..b151924703 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -246,10 +246,10 @@ 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 = $(LIBVLC) $(DATA_win32_rc)
+vlc_DEPENDENCIES = $(DATA_win32_rc)
 
-vlc_LDADD = $(DATA_win32_rc) $(LIBVLC) $(LTLIBINTL)
-vlc_LDFLAGS = `$(VLC_CONFIG) --libs vlc`
+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
@@ -258,19 +258,20 @@ vlc_CFLAGS = `$(VLC_CONFIG) --cflags vlc`
 LIB_libvlc = libvlc.la
 LIBVLC = src/$(LIB_libvlc)
 
+#To get some nice output
+nice:
+	$(top_builddir)/compile
+
 # 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
 libvlc:
 	cd src && $(MAKE) $(AM_MAKEFLAGS) $(LIB_libvlc)
 
-core: libvlc
-	$(MAKE) $(AM_MAKEFLAGS) vlc$(EXEEXT)
+core: libvlc vlc$(EXEEXT)
 
 .PHONY: libvlc core
 
-src/$(LIB_libvlc): libvlc
-
 vlc$(EXEEXT): $(vlc_OBJECTS) $(vlc_DEPENDENCIES)
 	@rm -f vlc$(EXEEXT)
 	@case `$(VLC_CONFIG) --linkage vlc builtin` in \
@@ -300,7 +301,7 @@ vlc-bundle: vlc
 	    cp $$i $(top_builddir)/vlc-bundle/lib/ ; \
 	  done ; \
 	fi
-	for i in $(ALL_LINGUAS); do \
+	cat $(top_srcdir)/po/LINGUAS | while read i; do \
 	  mkdir -p "$(top_builddir)/vlc-bundle/locale/$$i/LC_MESSAGES" ; \
 	  cp "$(top_builddir)/po/$$i.gmo" \
 	    "$(top_builddir)/vlc-bundle/locale/$$i/LC_MESSAGES/vlc.mo" || true ; \
@@ -403,6 +404,11 @@ VLC-release.app: vlc
 		   $(top_builddir)/VLC-release.app/Contents/MacOS/VLC
 	$(INSTALL) $(top_builddir)/src/.libs/libvlc.1.dylib \
 		   $(top_builddir)/VLC-release.app/Contents/MacOS/lib/libvlc.dylib
+	$(INSTALL) $(top_builddir)/src/.libs/libvlc-control.1.dylib \
+		   $(top_builddir)/VLC-release.app/Contents/MacOS/lib/libvlc-control.dylib
+	install_name_tool -change /usr/local/lib/libvlc.1.dylib \
+		   @executable_path/lib/libvlc.dylib \
+		   $(top_builddir)/VLC-release.app/Contents/MacOS/lib/libvlc-control.dylib
 	install_name_tool -change /usr/local/lib/libvlc.1.dylib \
 		   @executable_path/lib/libvlc.dylib \
 	       $(top_builddir)/VLC-release.app/Contents/MacOS/VLC
@@ -460,7 +466,7 @@ VLC-release.app: vlc
 	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
-	for i in $(ALL_LINGUAS); do \
+	cat $(top_srcdir)/po/LINGUAS | while read i; do \
 	  mkdir -p $(top_builddir)/VLC-release.app/Contents/MacOS/locale/$${i}/LC_MESSAGES ; \
 	  cp $(srcdir)/po/$${i}.gmo $(top_builddir)/VLC-release.app/Contents/MacOS/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \
 	  mkdir -p $(top_builddir)/VLC-release.app/Contents/Resources/$${i}.lproj ; \
@@ -549,6 +555,11 @@ VLC.app: vlc
 		   $(top_builddir)/VLC.app/Contents/MacOS/VLC
 	$(INSTALL) $(top_builddir)/src/.libs/libvlc.1.dylib \
 		   $(top_builddir)/VLC.app/Contents/MacOS/lib/libvlc.dylib
+	$(INSTALL) $(top_builddir)/src/.libs/libvlc-control.1.dylib \
+		   $(top_builddir)/VLC.app/Contents/MacOS/lib/libvlc-control.dylib
+	install_name_tool -change /usr/local/lib/libvlc.1.dylib \
+		   @executable_path/lib/libvlc.dylib \
+		   $(top_builddir)/VLC.app/Contents/MacOS/lib/libvlc-control.dylib
 	install_name_tool -change /usr/local/lib/libvlc.1.dylib \
 		   @executable_path/lib/libvlc.dylib \
 	       $(top_builddir)/VLC.app/Contents/MacOS/VLC
@@ -571,7 +582,7 @@ VLC.app: vlc
 	fi
 	ln -sfn `pwd`/$(srcdir)/share $(top_builddir)/VLC.app/Contents/MacOS/
 	$(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/locale
-	for i in $(ALL_LINGUAS); do \
+	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 ; \
 	  mkdir -p $(top_builddir)/VLC.app/Contents/Resources/$${i}.lproj ; \
@@ -592,30 +603,12 @@ share/vlc_win32_rc.$(OBJEXT): share/vlc_win32_rc.rc
 endif
 
 
-###############################################################################
-# Building specific source packages
-###############################################################################
-
-dist-woody: distdir
-	$(remove_distdir_woody)
-	mv $(distdir) $(PACKAGE)-woody-$(VERSION)
-	$(srcdir)/toolbox --make-woody $(PACKAGE)-woody-$(VERSION)
-	$(AMTAR) chof - $(PACKAGE)-woody-$(VERSION) \
-	  | GZIP=$(GZIP_ENV) gzip -c >$(PACKAGE)-woody-$(VERSION).tar.gz
-	$(remove_distdir_woody)
-
-remove_distdir_woody = \
-  { test ! -d $(PACKAGE)-woody-$(VERSION) \
-    || { find $(PACKAGE)-woody-$(VERSION) -type d ! -perm -200 \
-           -exec chmod u+w {} ';' \
-         && rm -fr $(PACKAGE)-woody-$(VERSION); }; }
-
 ###############################################################################
 # Building architecture-specific binary packages
 ###############################################################################
 
 # XXX: this rule is probably only useful to you if you have exactly
-# the same setup as me. Contact sam@zoy.org if you need to use it.
+# the same setup as the maintaner(s).
 #
 
 package-win-common:
@@ -638,7 +631,7 @@ package-win-common:
 	  unix2dos "$(top_builddir)/vlc-${VERSION}/$${file}.txt" ; done
 
 	mkdir $(top_builddir)/vlc-${VERSION}/locale
-	for i in $(ALL_LINGUAS); do \
+	cat $(top_srcdir)/po/LINGUAS | while read i; do \
 	  mkdir -p "$(top_builddir)/vlc-${VERSION}/locale/$${i}/LC_MESSAGES" ; \
 	  cp "$(srcdir)/po/$${i}.gmo" \
 	    "$(top_builddir)/vlc-${VERSION}/locale/$${i}/LC_MESSAGES/vlc.mo" \
@@ -743,15 +736,18 @@ package-win32-base-debug: package-win-common
 
 	mkdir -p "$(top_builddir)/vlc-${VERSION}/osdmenu"
 	cp $(srcdir)/share/osdmenu/*.* "$(top_builddir)/vlc-${VERSION}/osdmenu"
-	for dir in dvd dvd/selected dvd/unselect dvd/selection dvd/volume default default/selected default/selection default/volume;do \
+	for dir in dvd dvd/selected dvd/unselect dvd/selection dvd/volume default default/selected default/selection default/volume minimal;do \
 		mkdir -p "$(top_builddir)/vlc-${VERSION}/osdmenu/$$dir"; \
 		for file in $(srcdir)/share/osdmenu/$${dir}/*.*;do \
 			 cp $$file "$(top_builddir)/vlc-${VERSION}/osdmenu/$$dir" || true; \
 		done; \
 	done
 	unix2dos $(top_builddir)/vlc-${VERSION}/osdmenu/*.cfg;
-	sed -i 's%share/osdmenu%osdmenu%g' $(top_builddir)/vlc-${VERSION}/osdmenu/*.cfg
-	sed -i 's%/%\\%g' $(top_builddir)/vlc-${VERSION}/osdmenu/*.cfg 
+	for file in $(top_builddir)/vlc-${VERSION}/osdmenu/*.cfg; do \
+		if sed 's%share/osdmenu%osdmenu%g' $$file >$$file.tmp; then :; else exit 1; fi; \
+		if sed 's%/%\\%g' $$file.tmp >$$file; then :; else exit 1; fi; \
+		rm -f $$file.tmp; \
+	done
 
 
 package-win32-base: package-win32-base-debug package-win-common-strip
@@ -764,7 +760,9 @@ package-win32-base-exe: package-win32-base
 	    MAKENSIS="makensis -DVERSION=${VERSION}"; \
 	elif [ -x "/cygdrive/c/Program Files/NSIS/makensis" ]; then \
 	    MAKENSIS="/cygdrive/c/Program\ Files/NSIS/makensis /DVERSION=${VERSION}"; \
-	elif wine --version >dev/null 2>&1; then \
+	elif [ -x "${PROGRAMFILES}/NSIS/makensis" ]; then \
+	    MAKENSIS="${PROGRAMFILES}/NSIS/makensis -DVERSION=${VERSION}"; \
+	elif wine --version >/dev/null 2>&1; then \
 	    MAKENSIS="wine C:/Program\ Files/NSIS/makensis.exe /DVERSION=${VERSION}"; \
 	else \
 	    echo 'Error: cannot locate makensis tool'; exit 1; \
@@ -978,7 +976,7 @@ package-translations:
 	  echo "OK."; mkdir -p "$(srcdir)/vlc-translations-${VERSION}"; \
 	fi
 # Copy translations
-	for i in $(ALL_LINGUAS); do \
+	cat $(top_srcdir)/po/LINGUAS | while read i; do \
 	  cp "$(srcdir)/po/$${i}.po" \
 	    "$(srcdir)/vlc-translations-${VERSION}/$${i}.po" \
 	    || true ; \
@@ -1000,6 +998,8 @@ package-translations:
 
 ###############################################################################
 # PO translation files update
+# Generate po/POTFILES.in which lists all the files containing translatable
+# strings. Find all source files and remove the generated files
 ###############################################################################
 .PHONY: update-po
 
@@ -1015,9 +1015,9 @@ update-po:
 	    | sort ; \
 	  echo "" ; \
 	  echo "# modules" ; \
-	  find modules -name '*.[chm]' -o -name '*.[ch]pp' -o -wholename 'modules/gui/qt4/ui/*.ui'\
+	  find modules -name '*.[chm]' -o -name '*.[ch]pp' -o -name '*.ui' \
 	    | grep -v '\(\.moc\.\|gui/gtk2/\)' \
-	    | grep -vE 'qt4/ui/.*.h' |grep -v qt4/resources.cpp \
+	    | grep -vE 'qt4/ui/.*.h' |grep -v 'qt4/resources.cpp\|qt4/dialogs/about.hpp' \
 	    | sort ; \
 	} > $(top_srcdir)/po/POTFILES.in
 	rm -f $(top_srcdir)/po/vlc.pot