now that stdout/stdlog are used consistently, the message order changed

[apt.git] / doc / makefile

diff --git a/doc/makefile b/doc/makefile
index 26ca52a9ec6347a0dec30cf514b8dec19e15b7d4..4fcf3bd10a822afcb5c4e811f01d6e5fd20df032 100644 (file)
--- a/doc/makefile
+++ b/doc/makefile
@@ -8,16 +8,37 @@ include ../buildlib/defaults.mak
 
 # Debian Doc SGML Documents
 SOURCE = $(wildcard *.sgml)
 
 # Debian Doc SGML Documents
 SOURCE = $(wildcard *.sgml)

-DEBIANDOC_HTML_OPTIONS=-l en
+DEBIANDOC_HTML_OPTIONS=-l en.UTF-8

 include $(DEBIANDOC_H)
 
 include $(DEBIANDOC_H)
 

-# XML man pages
-SOURCE = apt-cache.8 apt-get.8 apt-cdrom.8 apt.conf.5 sources.list.5 \
-         apt-config.8 apt_preferences.5  \
-         apt-sortpkgs.1 apt-ftparchive.1 apt-extracttemplates.1 \
-        apt-key.8 apt-secure.8 apt-mark.8
-INCLUDES = apt.ent      
-include $(XML_MANPAGE_H)
+# Do not use XMLTO, build the manpages directly with XSLTPROC
+ifdef XSLTPROC
+# generate a list of accepted man page translations
+SOURCE = $(patsubst %.xml,%,$(wildcard *.?.xml))
+INCLUDES = apt.ent
+STYLESHEET=manpage-style.xsl
+
+LOCAL := manpage-$(firstword $(SOURCE))
+$(LOCAL)-LIST := $(SOURCE)
+
+# Install generation hooks
+doc: $($(LOCAL)-LIST)
+veryclean: veryclean/$(LOCAL)
+
+$($(LOCAL)-LIST) :: % : %.xml $(INCLUDES)
+       echo Creating man page $@
+       $(XSLTPROC) -o $@ $(STYLESHEET) $<
+
+# Clean rule
+.PHONY: veryclean/$(LOCAL)
+veryclean/$(LOCAL):
+       -rm -rf $($(@F)-LIST)
+
+endif
+
+# Chain to the manpage rule
+SOURCE = apt.8
+include $(MANPAGE_H)

 
 # Examples
 SOURCE = examples/apt.conf examples/sources.list examples/configure-index examples/apt-https-method-example.conf
 
 # Examples
 SOURCE = examples/apt.conf examples/sources.list examples/configure-index examples/apt-https-method-example.conf


@@ -25,10 +46,12 @@ TO = $(DOC)
 TARGET = binary
 include $(COPY_H)
 
 TARGET = binary
 include $(COPY_H)
 

-#.PHONY: headers library clean veryclean all binary program doc doc.pt_BR doc.fr
+.PHONY: clean clean-subdirs veryclean veryclean-subdirs all binary doc

 doc:
 doc:

-       for dir in $(SUBDIRS); do\
-               $(MAKE) -C $$dir $@; \
+       for i in $(shell ls po/*.po | sed -r 's#po/([a-z]+[A-Z_]*).po#\1#'); do \
+               test -d $$i || mkdir $$i; \
+               test -f $$i/makefile || sed "s#@@LANG@@#$$i#" lang.makefile > $$i/makefile; \
+               $(MAKE) -C $$i $@; \

        done
 
 clean: clean-subdirs
        done
 
 clean: clean-subdirs


@@ -41,15 +64,7 @@ clean-subdirs:
 
 veryclean-subdirs:
        for dir in $(SUBDIRS); do\
 
 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/debiandoc*))); do\
-               rm -f $$dir/offline.$$dir.sgml; \
-               rm -f $$dir/guide.$$dir.sgml; \
+               rm -rf $$dir; \

        done
 
 ifdef PO4A
        done
 
 ifdef PO4A


@@ -57,7 +72,7 @@ doc: po4a
 
 clean: po4a-clean
 
 
 clean: po4a-clean
 

-.PHONY: update-po po4a
+.PHONY: update-po po4a stats

 update-po:
        po4a --previous --no-backups --force --no-translations po4a.conf
 
 update-po:
        po4a --previous --no-backups --force --no-translations po4a.conf
 


@@ -66,6 +81,10 @@ po4a-clean:
 
 po4a:
        po4a --previous --no-backups po4a.conf
 
 po4a:
        po4a --previous --no-backups po4a.conf

+
+stats:
+       for i in po/*.po; do echo -n "$$i: "; msgfmt --statistics $$i; done
+

 endif
 
 ifdef DOXYGEN
 endif
 
 ifdef DOXYGEN


@@ -82,9 +101,9 @@ $(BUILD)/doc/Doxyfile: Doxyfile.in
 
 $(BUILD)/doc/doxygen-stamp: $(DOXYGEN_SOURCES) $(BUILD)/doc/Doxyfile
        rm -fr $(BUILD)/doc/doxygen
 
 $(BUILD)/doc/doxygen-stamp: $(DOXYGEN_SOURCES) $(BUILD)/doc/Doxyfile
        rm -fr $(BUILD)/doc/doxygen

+       mkdir $(BUILD)/doc/doxygen  # some versions seem to not create this directory #628799

        $(DOXYGEN) $(BUILD)/doc/Doxyfile
        touch $(BUILD)/doc/doxygen-stamp
 
 doc: $(BUILD)/doc/doxygen-stamp
        $(DOXYGEN) $(BUILD)/doc/Doxyfile
        touch $(BUILD)/doc/doxygen-stamp
 
 doc: $(BUILD)/doc/doxygen-stamp

-

 endif
 endif