diff options
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | buildlib/debiandoc.mak | 6 | ||||
| -rw-r--r-- | buildlib/defaults.mak | 2 | ||||
| -rw-r--r-- | buildlib/po4a_manpage.mak | 4 | ||||
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/control | 4 | ||||
| -rwxr-xr-x | debian/rules | 10 | ||||
| -rw-r--r-- | doc/makefile | 66 | ||||
| -rw-r--r-- | test/Makefile | 2 |
9 files changed, 63 insertions, 41 deletions
@@ -10,7 +10,7 @@ endif default: startup all .PHONY: headers library clean veryclean all binary program doc test update-po -all headers library clean veryclean binary program doc manpages test update-po startup dirs: +all headers library clean veryclean binary program doc manpages debiandoc test update-po startup dirs: $(MAKE) -C apt-pkg $@ $(MAKE) -C apt-inst $@ $(MAKE) -C methods $@ @@ -21,7 +21,7 @@ all headers library clean veryclean binary program doc manpages test update-po s $(MAKE) -C po $@ $(MAKE) -C test $@ -all headers library clean veryclean binary program doc manpages test update-po: startup dirs +all headers library clean veryclean binary program doc manpages debiandoc test update-po: startup dirs dirs: startup diff --git a/buildlib/debiandoc.mak b/buildlib/debiandoc.mak index a97af0caf..7e22467cf 100644 --- a/buildlib/debiandoc.mak +++ b/buildlib/debiandoc.mak @@ -14,13 +14,15 @@ LOCAL := debiandoc-$(firstword $(SOURCE)) $(LOCAL)-HTML := $(addsuffix .html,$(addprefix $(DOC)/,$(basename $(SOURCE)))) $(LOCAL)-TEXT := $(addsuffix .text,$(addprefix $(DOC)/,$(basename $(SOURCE)))) +debiandoc: + #--------- # Rules to build HTML documentations ifdef DEBIANDOC_HTML # Install generation hooks -doc: $($(LOCAL)-HTML) +debiandoc: $($(LOCAL)-HTML) veryclean: veryclean/html/$(LOCAL) vpath %.sgml $(SUBDIRS) @@ -42,7 +44,7 @@ endif ifdef DEBIANDOC_TEXT # Install generation hooks -doc: $($(LOCAL)-TEXT) +debiandoc: $($(LOCAL)-TEXT) veryclean: veryclean/text/$(LOCAL) vpath %.sgml $(SUBDIRS) diff --git a/buildlib/defaults.mak b/buildlib/defaults.mak index 7b084f4b9..5b970876a 100644 --- a/buildlib/defaults.mak +++ b/buildlib/defaults.mak @@ -121,7 +121,7 @@ MKDIRS := $(BIN) all: dirs binary doc binary: library program maintainer-clean dist-clean distclean pristine sanity: veryclean -startup headers library clean veryclean program test update-po manpages: +startup headers library clean veryclean program test update-po manpages debiandoc: veryclean: echo Very Clean done for $(SUBDIR) diff --git a/buildlib/po4a_manpage.mak b/buildlib/po4a_manpage.mak index 1dedd0dcd..09eca0ec2 100644 --- a/buildlib/po4a_manpage.mak +++ b/buildlib/po4a_manpage.mak @@ -13,6 +13,8 @@ SOURCE = $(patsubst %.xml,%,$(wildcard *.$(LC).?.xml)) INCLUDES = apt.ent apt-verbatim.ent +manpages: + # Do not use XMLTO, build the manpages directly with XSLTPROC ifdef XSLTPROC @@ -22,7 +24,7 @@ LOCAL := po4a-manpage-$(firstword $(SOURCE)) $(LOCAL)-LIST := $(SOURCE) # Install generation hooks -doc: $($(LOCAL)-LIST) +manpages: $($(LOCAL)-LIST) veryclean: veryclean/$(LOCAL) apt-verbatim.ent: ../apt-verbatim.ent diff --git a/debian/changelog b/debian/changelog index 1e63657bc..c8b48cc4f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,8 +14,12 @@ apt (0.9.7.1) UNRELEASED; urgency=low * debian/control: - libapt-{pkg,inst} packages should be in section 'libs' instead of 'admin' as by ftp-master override request in #677596 + - demote debiandoc-sgml to Build-Depends-Indep + * doc/makefile: + - separate translation building of debiandoc from manpages + so that we don't need to build debiandoc for binary packages - -- David Kalnischkies <kalnischkies@gmail.com> Mon, 25 Jun 2012 18:07:13 +0200 + -- David Kalnischkies <kalnischkies@gmail.com> Fri, 29 Jun 2012 13:52:30 +0200 apt (0.9.7) unstable; urgency=low diff --git a/debian/control b/debian/control index 0020056a8..ec0d817fb 100644 --- a/debian/control +++ b/debian/control @@ -9,8 +9,8 @@ Standards-Version: 3.9.3 Build-Depends: dpkg-dev (>= 1.15.8), debhelper (>= 8.1.3~), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev (>= 7.19.0), zlib1g-dev, libbz2-dev, xsltproc, docbook-xsl, docbook-xml, - po4a (>= 0.34-2), autotools-dev, autoconf, automake, debiandoc-sgml -Build-Depends-Indep: doxygen + po4a (>= 0.34-2), autotools-dev, autoconf, automake +Build-Depends-Indep: doxygen, debiandoc-sgml Build-Conflicts: autoconf2.13, automake1.4 Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/ Vcs-Browser: http://bzr.debian.org/loggerhead/apt/debian-sid/ diff --git a/debian/rules b/debian/rules index ee001fe12..83e23881c 100755 --- a/debian/rules +++ b/debian/rules @@ -67,7 +67,7 @@ LIBAPT_INST=libapt-inst$(LIBAPTINST_MAJOR) export DPKG_GENSYMBOLS_CHECK_LEVEL=0 build: build/build-stamp -build-doc: build-manpages build/build-doc-stamp +build-debiandoc: build/build-debiandoc-stamp build-manpages: build/build-manpages-stamp # Note that this is unconditionally done first as part of loading environment.mak @@ -98,9 +98,9 @@ else endif touch $@ -build/build-doc-stamp: build/build-manpages-stamp build/configure-stamp +build/build-debiandoc-stamp: build/configure-stamp # Add here commands to compile the package. - $(MAKE) doc + $(MAKE) debiandoc touch $@ build/build-manpages-stamp: build/configure-stamp @@ -121,7 +121,7 @@ debian/%.install: debian/%.install.in binary-indep: apt-doc libapt-pkg-doc # Build architecture-independent files here. -libapt-pkg-doc: build-doc +libapt-pkg-doc: build-debiandoc dh_testdir -p$@ dh_testroot -p$@ dh_prep -p$@ @@ -147,7 +147,7 @@ libapt-pkg-doc: build-doc dh_md5sums -p$@ dh_builddeb -p$@ -apt-doc: build-doc +apt-doc: build-debiandoc dh_testdir -p$@ dh_testroot -p$@ dh_prep -p$@ diff --git a/doc/makefile b/doc/makefile index 220a6160d..8021bce3f 100644 --- a/doc/makefile +++ b/doc/makefile @@ -11,10 +11,7 @@ SOURCE = $(wildcard *.sgml) DEBIANDOC_HTML_OPTIONS=-l en.UTF-8 include $(DEBIANDOC_H) -MANPAGEPO = $(patsubst %.po,%,$(notdir $(wildcard po/*.po))) -MANPAGEPOLIST = $(patsubst %,manpages-translation-%,$(MANPAGEPO)) - -doc: manpages +doc: manpages debiandoc # Do not use XMLTO, build the manpages directly with XSLTPROC ifdef XSLTPROC @@ -27,29 +24,17 @@ LOCAL := manpage-$(firstword $(SOURCE)) $(LOCAL)-LIST := $(SOURCE) # Install generation hooks -manpages: $(MANPAGEPOLIST) $($(LOCAL)-LIST) +manpages: $($(LOCAL)-LIST) $($(LOCAL)-LIST) :: % : %.xml $(STYLESHEET) $(INCLUDES) echo Creating man page $@ $(XSLTPROC) -o $@ $(STYLESHEET) $< -$(MANPAGEPOLIST) :: manpages-translation-% : %/makefile po4a - $(MAKE) -C $(dir $<) doc - -.PHONY: manpages dirs-manpage-subdirs $(MANPAGEPOLIST) -dirs: dirs-manpage-subdirs -dirs-manpage-subdirs: - for i in $(MANPAGEPO); do \ - test -d $$i || mkdir $$i; \ - test -f $$i/makefile || sed "s#@@LANG@@#$$i#" lang.makefile > $$i/makefile; \ - done - # Clean rule .PHONY: veryclean/$(LOCAL) veryclean: veryclean/$(LOCAL) veryclean/$(LOCAL): -rm -rf $($(@F)-LIST) - endif # Chain to the manpage rule @@ -65,7 +50,7 @@ TO = $(DOC) TARGET = binary include $(COPY_H) -.PHONY: clean clean-subdirs veryclean veryclean-subdirs all binary doc +.PHONY: clean clean-subdirs veryclean veryclean-subdirs all binary doc stats clean: clean-subdirs veryclean: veryclean-subdirs @@ -80,24 +65,53 @@ veryclean-subdirs: rm -rf $$dir; \ done -.PHONY: update-po po4a stats +stats: + for i in po/*.po; do echo -n "$$i: "; msgfmt --output-file=/dev/null --statistics $$i; done ifdef PO4A -doc: po4a +DOCUMENTATIONPO = $(patsubst %.po,%,$(notdir $(wildcard po/*.po))) +MANPAGEPOLIST = $(addprefix manpages-translation-,$(DOCUMENTATIONPO)) +DEBIANDOCPOLIST = $(addprefix debiandoc-translation-,$(DOCUMENTATIONPO)) + +MANPAGEDIRLIST = $(addsuffix /makefile,$(DOCUMENTATIONPO)) + +.PHONY: update-po po4a $(MANPAGEPOLIST) $(MANPAGEDIRLIST) + +manpages: $(MANPAGEPOLIST) +debiandoc: $(DEBIANDOCPOLIST) +po4a: $(MANPAGEPOLIST) $(DEBIANDOCPOLIST) update-po: po4a --previous --no-backups --force --no-translations \ --package-name='$(PACKAGE)-doc' --package-version='$(PACKAGE_VERSION)' \ --msgid-bugs-address='$(PACKAGE_MAIL)' po4a.conf -po4a: - po4a --previous --no-backups \ +$(MANPAGEPOLIST) :: manpages-translation-% : %/makefile po4a.conf + po4a --previous --no-backups --translate-only $(dir $<)apt.ent \ + $(patsubst %,--translate-only $(dir $<)%,$(patsubst %.1.xml,%.$(subst /,,$(dir $<)).1.xml,$(wildcard *.1.xml))) \ + $(patsubst %,--translate-only $(dir $<)%,$(patsubst %.2.xml,%.$(subst /,,$(dir $<)).2.xml,$(wildcard *.2.xml))) \ + $(patsubst %,--translate-only $(dir $<)%,$(patsubst %.3.xml,%.$(subst /,,$(dir $<)).3.xml,$(wildcard *.3.xml))) \ + $(patsubst %,--translate-only $(dir $<)%,$(patsubst %.4.xml,%.$(subst /,,$(dir $<)).4.xml,$(wildcard *.4.xml))) \ + $(patsubst %,--translate-only $(dir $<)%,$(patsubst %.5.xml,%.$(subst /,,$(dir $<)).5.xml,$(wildcard *.5.xml))) \ + $(patsubst %,--translate-only $(dir $<)%,$(patsubst %.6.xml,%.$(subst /,,$(dir $<)).6.xml,$(wildcard *.6.xml))) \ + $(patsubst %,--translate-only $(dir $<)%,$(patsubst %.7.xml,%.$(subst /,,$(dir $<)).7.xml,$(wildcard *.7.xml))) \ + $(patsubst %,--translate-only $(dir $<)%,$(patsubst %.8.xml,%.$(subst /,,$(dir $<)).8.xml,$(wildcard *.8.xml))) \ --package-name='$(PACKAGE)-doc' --package-version='$(PACKAGE_VERSION)' \ --msgid-bugs-address='$(PACKAGE_MAIL)' po4a.conf -endif + $(MAKE) -C $(dir $<) manpages -stats: - for i in po/*.po; do echo -n "$$i: "; msgfmt --output-file=/dev/null --statistics $$i; done +$(DEBIANDOCPOLIST) :: debiandoc-translation-% : %/makefile po4a.conf + po4a --previous --no-backups --translate-only $(dir $<)apt.ent \ + $(patsubst %,--translate-only $(dir $<)%,$(patsubst %.sgml,%.$(subst /,,$(dir $<)).sgml,$(wildcard *.sgml))) \ + --package-name='$(PACKAGE)-doc' --package-version='$(PACKAGE_VERSION)' \ + --msgid-bugs-address='$(PACKAGE_MAIL)' po4a.conf + $(MAKE) -C $(dir $<) debiandoc + +dirs: $(MANPAGEDIRLIST) +$(MANPAGEDIRLIST) :: %/makefile : lang.makefile + test -d $(dir $@) || mkdir $(dir $@) + sed "s#@@LANG@@#$(subst /,,$(dir $@))#" $< > $@ +endif ifdef DOXYGEN DOXYGEN_SOURCES = $(shell find $(BASE)/apt-pkg -not -name .\\\#* -and \( -name \*.cc -or -name \*.h \) ) @@ -114,5 +128,5 @@ $(BUILD)/doc/doxygen-stamp: $(DOXYGEN_SOURCES) $(BUILD)/doc/Doxyfile $(DOXYGEN) $(BUILD)/doc/Doxyfile touch $(BUILD)/doc/doxygen-stamp -doc: $(BUILD)/doc/doxygen-stamp +debiandoc: $(BUILD)/doc/doxygen-stamp endif diff --git a/test/Makefile b/test/Makefile index 8207ebdab..74bffccb7 100644 --- a/test/Makefile +++ b/test/Makefile @@ -7,7 +7,7 @@ ifndef NOISY endif .PHONY: startup headers library clean veryclean all binary program doc test update-po -startup all clean veryclean binary program dirs test update-po manpages: +startup all clean veryclean binary program dirs test update-po manpages debiandoc: $(MAKE) -C libapt $@ $(MAKE) -C interactive-helper $@ |