X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.am;h=a60756438a6d6414b20ca404ed5478f8c1bab5d9;hb=da7946c0c327f175ee4b9169dd54a35257fadc2c;hp=322164393754452bf43c6d3859a063beba7ec5e5;hpb=f53fe2616cba88c32648098ae3d69e0f221091b1;p=vlc

diff --git a/Makefile.am b/Makefile.am
index 3221643937..a60756438a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -106,13 +106,13 @@ HEADERS_include_built = \
 	$(NULL)
 
 include/vlc_symbols.h: Makefile $(HEADERS_include)
-	$(srcdir)/toolbox --update-includes
+	srcdir=$(srcdir) $(srcdir)/toolbox --update-includes
 
 src/misc/modules_plugin.h: Makefile src/misc/modules_plugin.h.in $(HEADERS_include)
-	$(srcdir)/toolbox --update-includes
+	srcdir=$(srcdir) $(srcdir)/toolbox --update-includes
 
 src/misc/modules_builtin.h: Makefile src/misc/modules_builtin.h.in
-	$(srcdir)/toolbox --update-includes
+	srcdir=$(srcdir) $(srcdir)/toolbox --update-includes
 
 # These dependencies are mandatory
 $(SOURCES): include/vlc_symbols.h
@@ -208,7 +208,7 @@ EXTRA_DIST += \
 
 dist-hook:
 	mv $(distdir)/vlc.ebuild $(distdir)/vlc-${VERSION}.ebuild
-	cd $(distdir) && $(srcdir)/toolbox --update-vc
+	cd $(distdir) && srcdir=$(srcdir) $(srcdir)/toolbox --update-vc
 
 ###############################################################################
 # Building libvlc
@@ -348,12 +348,12 @@ vlc_CFLAGS = `$(VLC_CONFIG) --cflags vlc`
 # old automake-1.5 bug (automake/279).
 DEPENDENCIES_vlc = lib/libvlc.a $(DATA_win32_rc) $(LIB_intl)
 
-vlc$(EXEEXT): $(vlc_OBJECTS) $(DEPENDENCIES_vlc)
-	@rm -f $(srcdir)/vlc$(EXEEXT)
-	case `$(VLC_CONFIG) --linkage vlc builtin` in \
-	  c++) $(CXXLINK) $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS) $(LIBS) ;; \
-	  objc) $(OBJCLINK) $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS) $(LIBS) ;; \
-	  c|*) $(LINK) $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS) $(LIBS) ;; \
+vlc$(EXEEXT): $(vlc_OBJECTS) $(DEPENDENCIES_vlc) stamp-builtin
+	@rm -f $(top_builddir)/vlc$(EXEEXT)
+	@case `$(VLC_CONFIG) --linkage vlc builtin` in \
+	  c++) echo $(CXXLINK) $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS) $(LIBS) ; $(CXXLINK) $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS) $(LIBS) ;; \
+	  objc) echo $(OBJCLINK) $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS) $(LIBS) ; $(OBJCLINK) $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS) $(LIBS) ;; \
+	  c|*) echo $(LINK) $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS) $(LIBS) ; $(LINK) $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS) $(LIBS) ;; \
 	esac
 
 if HAVE_BEOS
@@ -370,11 +370,19 @@ endif
 # Install the modules and the symlinks
 install-exec-local:
 	for i in "" `$(VLC_CONFIG) --target plugin` ; do if test -n "$$i" ; then \
-	  $(INSTALL) -m 755 "$$i$(LIBEXT)" "$(DESTDIR)$(libdir)/vlc/`echo $$i | cut -f1 -d/`" ; \
+	  echo $(INSTALL) -m 755 "$$i$(LIBEXT)" "$(DESTDIR)$(libdir)/vlc/`echo $$i | cut -f2 -d/`" ; \
+	  $(INSTALL) -m 755 "$$i$(LIBEXT)" "$(DESTDIR)$(libdir)/vlc/`echo $$i | cut -f2 -d/`" ; \
 	fi ; done
-	for i in "" `$(VLC_CONFIG) --target builtin` `$(VLC_CONFIG) --target builtin pic` ; do if test -n "$$i" ; then \
+	for i in "" `$(VLC_CONFIG) --target builtin` ; do if test -n "$$i" ; then \
+	  echo $(INSTALL) -m 644 "$$i" "$(DESTDIR)$(libdir)/vlc" ; \
 	  $(INSTALL) -m 644 "$$i" "$(DESTDIR)$(libdir)/vlc" ; \
 	fi ; done
+if BUILD_MOZILLA
+	for i in "" `$(VLC_CONFIG) --target builtin pic` ; do if test -n "$$i" ; then \
+	  echo $(INSTALL) -m 644 "$$i" "$(DESTDIR)$(libdir)/vlc" ; \
+	  $(INSTALL) -m 644 "$$i" "$(DESTDIR)$(libdir)/vlc" ; \
+	fi ; done
+endif
 	for i in "" $(ALIASES) ; do if test -n "$$i" ; then \
 	  rm -f "$(DESTDIR)$(bindir)/$$i" && \
 	  ln -s vlc "$(DESTDIR)$(bindir)/$$i" ; \
@@ -415,9 +423,27 @@ 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) --include-dir $(srcdir)/share -i $< -o $@
+	$(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 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
 ###############################################################################
@@ -436,7 +462,7 @@ package-win32:
 # Create installation script
 	cp "$(srcdir)/install-win32" "$(srcdir)/tmp/nsi"
 # Copy relevant files
-	cp "$(srcdir)/vlc$(EXEEXT)" "$(srcdir)/tmp/"
+	cp "$(top_builddir)/vlc$(EXEEXT)" "$(srcdir)/tmp/"
 	$(STRIP) "$(srcdir)/tmp/vlc$(EXEEXT)"
 	cp "$(srcdir)/INSTALL.win32" "$(srcdir)/tmp/INSTALL.txt"
 	unix2dos "$(srcdir)/tmp/INSTALL.txt"
@@ -598,18 +624,18 @@ $(SOURCES_mozilla): mozilla/vlcintf.h
 mozilla_plugin_DATA = $(LIBRARIES_mozilla)
 mozilla_plugindir = $(libdir)/mozilla/plugins
 $(LIBRARIES_mozilla): $(mozilla_libplugin_a_OBJECTS) \
-                      $(mozilla_libplugin_a_DEPENDENCIES)
+                      $(mozilla_libplugin_a_DEPENDENCIES) stamp-pic
 	$(CXXLINK) $(mozilla_libplugin_a_OBJECTS) $(DATA_npvlc_rc) \
 	  lib/libvlc_pic.a -shared \
 	  `$(VLC_CONFIG) --libs vlc mozilla builtin pic`
 
 mozilla_vlcintf_xpt_DATA = mozilla/vlcintf.xpt
 mozilla_vlcintf_xptdir = $(libdir)/mozilla/components
-mozilla/vlcintf.xpt: Makefile mozilla/vlcintf.idl
+mozilla/vlcintf.xpt: mozilla/vlcintf.idl
 	$(XPIDL) -I/usr/share/idl/mozilla -m typelib \
 	  -o mozilla/vlcintf $(srcdir)/mozilla/vlcintf.idl
 
-mozilla/vlcintf.h: Makefile mozilla/vlcintf.idl
+mozilla/vlcintf.h: mozilla/vlcintf.idl
 	$(XPIDL) -I/usr/share/idl/mozilla -m header \
 	  -o mozilla/vlcintf $(srcdir)/mozilla/vlcintf.idl
 
@@ -622,6 +648,31 @@ mozilla/npvlc_rc.$(OBJEXT): mozilla/npvlc_rc.rc
 endif
 endif
 
+###############################################################################
+# Stamp rules
+###############################################################################
+clean: clean-stamps
+clean-stamp:
+	rm -f stamp-builtin stamp-pic
+
+stamp-builtin: FORCE
+	@for dep in "" `$(VLC_CONFIG) --target builtin`; do \
+	  if test "$${dep}" -nt "$(top_builddir)/vlc$(EXEEXT)"; then \
+	    rm -f $@; \
+	    break; \
+	  fi; \
+	done
+	@if test ! -f $@; then printf "" > $@; fi
+
+stamp-pic: FORCE
+	@for dep in "" `$(VLC_CONFIG) --target builtin pic`; do \
+	  if test "$${dep}" -nt "$(LIBRARIES_mozilla)"; then \
+	    rm -f $@; \
+	    break; \
+	  fi; \
+	done
+	@if test ! -f $@; then printf "" > $@; fi
+
 ###############################################################################
 # Force rule
 ###############################################################################