fix/simplify buildsystem for the (now) po4a-only manpages

diff --git a/.bzrignore b/.bzrignore
index 660c3e0274682daade38e7d4ff559535d623286e..45db3c6072d3bc89e766b5d01aaa9aa71cecb400 100644 (file)
--- a/.bzrignore
+++ b/.bzrignore
@@ -9,7 +9,8 @@ autom4te.cache/
 build/
 configure
 
-# generated apt man pages
+# generated files in the progress to build all
+# apt man pages and other documentation
 doc/*.1
 doc/*.5
 doc/*.8
@@ -17,14 +18,5 @@ doc/*/*.1
 doc/*/*.5
 doc/*/*.8
 doc/*/apt.ent
-
-# ignore xml man page files generated by po4a
-# older translation methods translate in this files
-# so we can not ignore it for all translations now
 doc/*/*.xml
-
-# FIXME: files generated by deprecated sgml man pages
-doc/es/manpage.links
-doc/es/manpage.refs
-doc/pt_BR/manpage.links
-doc/pt_BR/manpage.refs
+doc/*/*.sgml

diff --git a/buildlib/po4a_manpage.mak b/buildlib/po4a_manpage.mak
index 3d90c6ba498d4256d2b39cfe8ab8036e47497e83..dfa215d299cf92f625c51161bbce0cda7a9908fd 100644 (file)
--- a/buildlib/po4a_manpage.mak
+++ b/buildlib/po4a_manpage.mak
@@ -35,7 +35,8 @@ $($(LOCAL)-LIST) :: % : %.xml $(INCLUDES)
 .PHONY: veryclean/$(LOCAL)
 veryclean/$(LOCAL):
        -rm -rf $($(@F)-LIST) apt.ent apt.$(LC).8 \
-               $(addsuffix .xml,$($(@F)-LIST))
+               $(addsuffix .xml,$($(@F)-LIST)) \
+               offline.$(LC).sgml guide.$(LC).sgml
 
 HAVE_PO4A=yes
 endif

diff --git a/buildlib/sgml_manpage.mak b/buildlib/sgml_manpage.mak
deleted file mode 100644 (file)
index 5fcb75c..0000000
--- a/buildlib/sgml_manpage.mak
+++ /dev/null
@@ -1,45 +0,0 @@
-# -*- make -*-
-
-# This handles man pages in DocBook SGMLL format. We convert to the respective
-# output in the source directory then copy over to the final dest. This
-# means yodl is only needed if compiling from CVS
-
-# Input
-# $(SOURCE) - The documents to use, in the form foo.sect, ie apt-cache.8
-#             the sgml files are called apt-cache.8.sgml
-
-# See defaults.mak for information about LOCAL
-
-# Some local definitions
-ifdef DOCBOOK2MAN
-
-LOCAL := sgml-manpage-$(firstword $(SOURCE))
-$(LOCAL)-LIST := $(SOURCE)
-
-# Install generation hooks
-doc: $($(LOCAL)-LIST)
-veryclean: veryclean/$(LOCAL)
-
-$($(LOCAL)-LIST) :: % : %.sgml $(INCLUDES)
-       echo Creating man page $@
-       $(DOCBOOK2MAN) $<
-
-# Clean rule
-.PHONY: veryclean/$(LOCAL)
-veryclean/$(LOCAL):
-       -rm -rf $($(@F)-LIST)
-
-HAVE_SGML=yes
-endif
-
-INCLUDES :=
-
-ifndef HAVE_SGML
-# Strip from the source list any man pages we dont have compiled already
-SOURCE := $(wildcard $(SOURCE))
-endif
-
-# Chain to the manpage rule
-ifneq ($(words $(SOURCE)),0)
-include $(MANPAGE_H)
-endif

diff --git a/doc/es/makefile b/doc/es/makefile
index 81a410c5c05768973852fbb248dc82e47d726359..0b5b5222281dbf09db4be7b7c5c1bde035fa8bee 100644 (file)
--- a/doc/es/makefile
+++ b/doc/es/makefile
@@ -5,8 +5,7 @@ SUBDIR=doc/es
 # Bring in the default rules
 include ../../buildlib/defaults.mak
 
-# Man pages
-SOURCE = apt-cache.es.8 apt-get.es.8 apt-cdrom.es.8 apt.conf.es.5 \
-         sources.list.es.5 apt-config.es.8 apt_preferences.es.5
-INCLUDES = apt.ent.es
-include $(SGML_MANPAGE_H)
+# Language Code of this translation
+LC=es
+
+include $(PO4A_MANPAGE_H)

diff --git a/doc/makefile b/doc/makefile
index 0cb135c7b75725d358e5b5c3d6463f3e1d4d487f..fe53aba48c2777320d273984beddbeb28d4d23b3 100644 (file)
--- a/doc/makefile
+++ b/doc/makefile
@@ -43,14 +43,6 @@ veryclean-subdirs:
        for dir in $(SUBDIRS); do\
                $(MAKE) -C $$dir veryclean; \
        done
-       # FIXME remove created sgml files, but preserve all
-       # which are "left over" from older systems.
-       # After completing the transition this should be handled
-       # in the po4a-manpage makefile for all translations
-       for dir in $(subst /addendum/,, $(dir $(wildcard */addendum/*))); do\
-               rm -f $$dir/offline.$$dir.sgml; \
-               rm -f $$dir/guide.$$dir.sgml; \
-       done
 
 ifdef PO4A
 doc: po4a

diff --git a/doc/pt_BR/makefile b/doc/pt_BR/makefile
index 4c9ea62932ddfae2b027da2f7d6c9070cfa6c2d1..6e485bbf61714cddbbb5494efb58e2a213649362 100644 (file)
--- a/doc/pt_BR/makefile
+++ b/doc/pt_BR/makefile
@@ -5,6 +5,7 @@ SUBDIR=doc/pt_BR
 # Bring in the default rules
 include ../../buildlib/defaults.mak
 
-SOURCE = apt_preferences.pt_BR.5
-INCLUDES = apt.ent.pt_BR
-include $(SGML_MANPAGE_H)
+# Language Code of this translation
+LC=pt_BR
+
+include $(PO4A_MANPAGE_H)