Autostuff houskeeping:

  - prepare also po/POTFILES.in by 'make dist' before updating po-files,
    so also new files with strings for translatiom will be included
  - make build proces working in separate directory

CVS patchset: 6387
CVS date: 2004/04/10 20:35:27

4 files changed, 20 insertions, 11 deletions

diff --git a/ChangeLog b/ChangeLog
index 281a370d4..8a9f8f232 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,7 @@ xine-lib (1-rc4)
   * fix channel swapping in wave demuxer (lpcm)
   * colorkey support for drawing OSD (XVideo only - fix some flickering)
   * avoid possible segfaults in cdda
+  * build improvements - different source and build directory, translations
 
 xine-lib (1-rc3c)
   * fix the deadlock with non-seekable input plugins
diff --git a/doc/faq/Makefile.am b/doc/faq/Makefile.am
index 65f576366..7692541c3 100644
--- a/doc/faq/Makefile.am
+++ b/doc/faq/Makefile.am
@@ -8,13 +8,13 @@ docsdir = $(prefix)/share/doc/xine/faq
 docs: $(docs_DATA)
 
 dist-hook:
-	@touch $(EXTRA_DIST)
+	@touch $(addprefix $(srcdir)/, $(EXTRA_DIST))
 	@make fail_if_missing=yes docs
-	cp $(docs_DATA) $(distdir)
+	cp $(addprefix $(srcdir)/, $(docs_DATA)) $(distdir)
 
-faq.html: faq.sgml
+faq.html: $(srcdir)/faq.sgml
 	@if test "$(SGMLTOOLS)" != "no"; then \
-	  $(SGMLTOOLS) -b onehtml faq.sgml; \
+	  $(SGMLTOOLS) -b onehtml $(srcdir)/faq.sgml; \
 	else if test "$(fail_if_missing)" = "yes"; then \
 	    echo "Please install sgmltools-lite."; \
 	    exit 1; \
@@ -22,9 +22,9 @@ faq.html: faq.sgml
 	  fi; \
 	fi
 
-faq.txt: faq.sgml
+faq.txt: $(srcdir)/faq.sgml
 	@if test "$(SGMLTOOLS)" != "no"; then \
-	  $(SGMLTOOLS) -b txt faq.sgml; \
+	  $(SGMLTOOLS) -b txt $(srcdir)/faq.sgml; \
 	else if test "$(fail_if_missing)" = "yes"; then \
 	    echo "Please install sgmltools-lite."; \
 	    exit 1; \
diff --git a/doc/hackersguide/Makefile.am b/doc/hackersguide/Makefile.am
index 8ba5a6e02..f355b8a05 100644
--- a/doc/hackersguide/Makefile.am
+++ b/doc/hackersguide/Makefile.am
@@ -17,13 +17,13 @@ docsdir = $(prefix)/share/doc/xine/hackersguide
 docs: $(docs_DATA)
 
 dist-hook:
-	@touch $(EXTRA_DIST)
+	@touch $(addprefix $(srcdir)/, $(EXTRA_DIST))
 	@make fail_if_missing=yes docs
-	cp $(docs_DATA) $(distdir)
+	cp $(addprefix $(srcdir)/, $(docs_DATA)) $(distdir)
 
-hackersguide.html: $(hackersguide_sgml)
+hackersguide.html: $(addprefix $(srcdir)/, $(hackersguide_sgml))
 	@if test "$(SGMLTOOLS)" != "no"; then \
-	  $(SGMLTOOLS) -b onehtml hackersguide.sgml; \
+	  $(SGMLTOOLS) -b onehtml $(srcdir)/hackersguide.sgml; \
 	else if test "$(fail_if_missing)" = "yes"; then \
 	    echo "Please install sgmltools-lite."; \
 	    exit 1; \
@@ -31,7 +31,7 @@ hackersguide.html: $(hackersguide_sgml)
 	  fi; \
 	fi
 
-%.png: %.fig
+%.png: $(srcdir)/%.fig
 	@if test "$(FIG2DEV)" != "no"; then \
 	  $(FIG2DEV) -L png -S 4 $< $@; \
 	else if test "$(fail_if_missing)" = "yes"; then \
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index 2426e767c..2c31b7d06 100644
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -156,8 +156,16 @@ maintainer-clean: distclean
 	@echo "it deletes files that may require special tools to rebuild."
 	rm -f $(GMOFILES)
 
+# generate POTFILES.in before updating po-files
 distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 dist distdir:
+	(cd $(top_srcdir); \
+	 head -3 po/POTFILES.in > \
+	 /tmp/POTFILES.in && \
+	 find src -name "*.[chy]" | \
+	 xargs grep -l '[^A-Za-z_]_(' | \
+	 grep -v src/xine-engine/xineintl.h >> /tmp/POTFILES.in && \
+	 cp /tmp/POTFILES.in po/)
 	$(MAKE) update-po
 	@$(MAKE) dist2
 # This is a separate target because 'update-po' must be executed before.