[SCM] live-manual branch, debian, updated. debian/20100501-1-20-gd8e8bd1

[Daniel Baumann]

The following commit has been merged in the debian branch:
commit d8e8bd1ef32d29bd9c3dd8fa2d9ab1ab072c4d1e
Author: Daniel Baumann <daniel at debian.org>
Date:   Sun Jun 6 11:03:13 2010 +0200

    Merging Makefile.common into Makefile.

diff --git a/Makefile b/Makefile
index c75d8e8..f0044d5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,41 @@
 AUTOBUILD	:= build
 #LANGUAGES       := de fr
 
-include Makefile.common
+PROJECT		:= live-manual
+FORMATS		:= html txt pdf
+
+VERSION		:= Unreleased Snapshot
+PUBDATE		:= $(shell date -R)
+
+TARGETS		:= $(foreach fmt,$(FORMATS),$(PROJECT).$(fmt))
+SOURCES		:= $(wildcard xml/chapters/*.xml) $(wildcard xml/appendices/*.xml) xml/entities/version.ent xml/entities/common.ent
+
+XP		:= xsltproc --nonet --novalid --xinclude
+XL		:= xmllint --nonet --noout --postvalid --xinclude
+DBLATEX		:= dblatex --style=db2latex
+
+all: $(TARGETS)
+
+update:
+	git pull
+
+test: $(SOURCES)
+	$(XL) xml/index.xml
+
+index.html: $(SOURCES)
+	$(XP) xsl/html.xsl xml/index.xml
+
+$(PROJECT).html: index.html
+
+$(PROJECT).txt: $(SOURCES)
+	$(XP) xsl/txt.xsl xml/index.xml | w3m -cols 65 -dump -T text/html > $@
+
+$(PROJECT).pdf: $(SOURCES)
+	$(DBLATEX) xml/index.xml -o $@
+
+xml/entities/version.ent:
+	echo '<!ENTITY version "$(VERSION)">' >  $@
+	echo '<!ENTITY pubdate "$(PUBDATE)">' >> $@
 
 #build: clean translations all
 build: clean all
@@ -42,4 +76,4 @@ clean:
 distclean: clean
 	rm -rf build
 
-.PHONY: clean po4a translations
+.PHONY: all clean po4a translations test $(PROJECT).html
diff --git a/Makefile.common b/Makefile.common
deleted file mode 100644
index f527cbd..0000000
--- a/Makefile.common
+++ /dev/null
@@ -1,37 +0,0 @@
-PROJECT		:= live-manual
-FORMATS		:= html txt pdf
-
-VERSION		:= Unreleased Snapshot
-PUBDATE		:= $(shell date -R)
-
-TARGETS		:= $(foreach fmt,$(FORMATS),$(PROJECT).$(fmt))
-SOURCES		:= $(wildcard xml/chapters/*.xml) $(wildcard xml/appendices/*.xml) xml/entities/version.ent xml/entities/common.ent
-
-XP		:= xsltproc --nonet --novalid --xinclude
-XL		:= xmllint --nonet --noout --postvalid --xinclude
-DBLATEX		:= dblatex --style=db2latex
-
-all: $(TARGETS)
-
-update:
-	git pull
-
-test: $(SOURCES)
-	$(XL) xml/index.xml
-
-index.html: $(SOURCES)
-	$(XP) xsl/html.xsl xml/index.xml
-
-$(PROJECT).html: index.html
-
-$(PROJECT).txt: $(SOURCES)
-	$(XP) xsl/txt.xsl xml/index.xml | w3m -cols 65 -dump -T text/html > $@
-
-$(PROJECT).pdf: $(SOURCES)
-	$(DBLATEX) xml/index.xml -o $@
-
-xml/entities/version.ent:
-	echo '<!ENTITY version "$(VERSION)">' >  $@
-	echo '<!ENTITY pubdate "$(PUBDATE)">' >> $@
-
-.PHONY: all test $(PROJECT).html

-- 
live-manual