[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=6be5f2a

The following commit has been merged in the master branch:
commit 6be5f2a79ba370eb9707007ba27b889fedf68280
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Mon May 30 15:44:01 2005 +0000

    Final touches: get it working with the changes directory name, detect missing taglist binary
---
 doc/Makefile           | 6 +++---
 doc/templates/Makefile | 7 +++++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/doc/Makefile b/doc/Makefile
index b5a7879..7b13b0e 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -38,8 +38,8 @@ doxygen:
 	doxygen $(top_srcdir)/config/Doxyfile
 
 tags:
-	cd $(top_srcdir)/doc/tags && $(MAKE) all
-	cp -f $(top_srcdir)/doc/tags/*.html $(top_srcdir)/doc/html/
+	cd $(top_srcdir)/doc/templates && $(MAKE) all
+	cp -f $(top_srcdir)/doc/templates/*.html $(top_srcdir)/doc/html/
 
 mostlyclean clean:
 	$(RM) *~ *.bak *#
@@ -49,5 +49,5 @@ distclean: clean
 # This command is intended for maintainers to use; it deletes files
 # that may need special tools to rebuild.
 maintainer-clean: distclean
-	cd $(top_srcdir)/doc/tags && $(MAKE) $(MAKECMDGOALS)
+	cd $(top_srcdir)/doc/templates && $(MAKE) $(MAKECMDGOALS)
 	rm -rf $(top_srcdir)/doc/html/*
diff --git a/doc/templates/Makefile b/doc/templates/Makefile
index 2729f52..5c303b1 100644
--- a/doc/templates/Makefile
+++ b/doc/templates/Makefile
@@ -37,7 +37,7 @@ all: tags
 tags: $(TABLES) Iptc
 	@./gen.py *.html.in
 
-$(TABLES):
+$(TABLES): $(TAGLIST)
 	@echo Generating $@ table...
 	@$(TAGLIST) $@ | awk -f tags.awk > $@.xml
 	@java org.apache.xalan.xslt.Process -IN $@.xml -XSL tags.xsl -OUT $@.tmp
@@ -45,7 +45,7 @@ $(TABLES):
 	@touch $@
 	@rm -f $@.tmp
 
-Iptc:
+Iptc: $(TAGLIST)
 	@echo Generating $@ table...
 	@$(TAGLIST) $@ | awk -f iptc.awk > $@.xml
 	@java org.apache.xalan.xslt.Process -IN $@.xml -XSL iptc.xsl -OUT $@.tmp
@@ -53,6 +53,9 @@ Iptc:
 	@touch $@
 	@rm -f $@.tmp
 
+$(TAGLIST): 
+	$(error File $(TAGLIST) does not exist. Did you build the library and examples?)
+
 mostlyclean:
 	rm -f *.xml
 	rm -f *.tmp

-- 
exiv2 packaging