From 742f57054fe787714c9ab59aa704cdcec25f3b28 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 12 May 2012 00:36:44 +0200 Subject: * Makefile, buildlib/*.mak: - reshuffle dependencies so that parallel building seems to work --- buildlib/configure.mak | 11 +++++------ buildlib/copy.mak | 2 +- buildlib/podomain.mak | 6 +++--- 3 files changed, 9 insertions(+), 10 deletions(-) (limited to 'buildlib') diff --git a/buildlib/configure.mak b/buildlib/configure.mak index 310c2600c..c0d8e3c76 100644 --- a/buildlib/configure.mak +++ b/buildlib/configure.mak @@ -20,16 +20,15 @@ startup: configure $(BUILDDIR)/config.status $(addprefix $(BUILDDIR)/,$(CONVERTE buildlib/config.sub: ln -sf /usr/share/misc/config.sub buildlib/config.sub buildlib/config.guess: - ln -sf /usr/share/misc/config.guess buildlib/config.guess + ln -sf /usr/share/misc/config.guess buildlib/config.guess configure: aclocal.m4 configure.in buildlib/config.guess buildlib/config.sub autoconf aclocal.m4: $(wildcard buildlib/*.m4) aclocal -I buildlib - + $(BUILDDIR)/config.status: configure - /usr/bin/test -e $(BUILDDIR) || mkdir $(BUILDDIR) + /usr/bin/test -e $(BUILDDIR) || mkdir $(BUILDDIR) (HERE=`pwd`; cd $(BUILDDIR) && $$HERE/configure) - -$(addprefix $(BUILDDIR)/,$(CONVERTED)): - (cd $(BUILDDIR) && ./config.status) + +$(addprefix $(BUILDDIR)/,$(CONVERTED)): $(BUILDDIR)/config.status diff --git a/buildlib/copy.mak b/buildlib/copy.mak index 3ae11a7eb..e8fe43deb 100644 --- a/buildlib/copy.mak +++ b/buildlib/copy.mak @@ -21,7 +21,7 @@ veryclean: veryclean/$(LOCAL) MKDIRS += $(dir $($(LOCAL)-LIST)) -$($(LOCAL)-LIST) : $(TO)/% : % +$($(LOCAL)-LIST) : $(TO)/% : % dirs echo Installing $< to $(@D) cp $< $(@D) diff --git a/buildlib/podomain.mak b/buildlib/podomain.mak index bb1c77e47..d46652520 100644 --- a/buildlib/podomain.mak +++ b/buildlib/podomain.mak @@ -11,9 +11,9 @@ MY_DOMAIN := $(APT_DOMAIN) endif MKDIRS += $(PO_DOMAINS)/$(MY_DOMAIN) -$(PO_DOMAINS)/$(MY_DOMAIN)/$(LOCAL).$(TYPE)list: SRC := $(addprefix $(SUBDIR)/,$(SOURCE)) -$(PO_DOMAINS)/$(MY_DOMAIN)/$(LOCAL).$(TYPE)list: makefile - (echo $(SRC) | xargs -n1 echo) > $@ +$(PO_DOMAINS)/$(MY_DOMAIN)/$(LOCAL).$(TYPE)list: $(addprefix $(BASE)/$(SUBDIR)/,$(SOURCE)) +$(PO_DOMAINS)/$(MY_DOMAIN)/$(LOCAL).$(TYPE)list: makefile dirs + (echo $(addprefix $(SUBDIR)/,$(SOURCE)) | xargs -n1 echo) > $@ startup binary program clean: $(PO_DOMAINS)/$(MY_DOMAIN)/$(LOCAL).$(TYPE)list veryclean: veryclean/$(LOCAL) -- cgit v1.2.3-70-g09d2 From e4bc41c765f2b9fec55faa747e8330130c987678 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 14 May 2012 14:39:15 +0200 Subject: - separate manpages from the rest of the doc building - make apt and apt-utils packages depend on manpages instead of full doc --- Makefile | 4 ++-- buildlib/defaults.mak | 2 +- buildlib/manpage.mak | 3 ++- debian/changelog | 2 ++ debian/rules | 14 ++++++++++---- doc/makefile | 26 ++++++++++++++++++-------- test/Makefile | 2 +- 7 files changed, 36 insertions(+), 17 deletions(-) (limited to 'buildlib') diff --git a/Makefile b/Makefile index a35ad1d37..24f5b3e2b 100644 --- a/Makefile +++ b/Makefile @@ -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 test update-po startup dirs: +all headers library clean veryclean binary program doc manpages 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 test update-po startup di $(MAKE) -C po $@ $(MAKE) -C test $@ -all headers library clean veryclean binary program doc test update-po: startup dirs +all headers library clean veryclean binary program doc manpages test update-po: startup dirs dirs: startup diff --git a/buildlib/defaults.mak b/buildlib/defaults.mak index c10813e9d..7b084f4b9 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: +startup headers library clean veryclean program test update-po manpages: veryclean: echo Very Clean done for $(SUBDIR) diff --git a/buildlib/manpage.mak b/buildlib/manpage.mak index 6cdf73ccf..063841d86 100644 --- a/buildlib/manpage.mak +++ b/buildlib/manpage.mak @@ -14,7 +14,8 @@ LOCAL := manpage-$(firstword $(SOURCE)) $(LOCAL)-LIST := $(addprefix $(DOC)/,$(SOURCE)) # Install generation hooks -doc: $($(LOCAL)-LIST) +doc: manpages +manpages: $($(LOCAL)-LIST) veryclean: veryclean/$(LOCAL) MKDIRS += $(DOC) diff --git a/debian/changelog b/debian/changelog index 12097ca6f..3de297513 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,10 +6,12 @@ apt (0.9.4) UNRELEASED; urgency=low as we don't need a symbol for it as it is not in a header * Makefile, buildlib/*.mak: - reshuffle dependencies so that parallel building seems to work + - separate manpages from the rest of the doc building * prepare-release: - apt-inst version isn't apt versions, so don't override variable * debian/rules: - apt-utils packages manpages, so it should depend on build-doc + - make apt and apt-utils packages depend on manpages instead of full doc -- David Kalnischkies Fri, 11 May 2012 23:26:59 +0200 diff --git a/debian/rules b/debian/rules index fcdff9d01..7b221fc2a 100755 --- a/debian/rules +++ b/debian/rules @@ -67,7 +67,8 @@ LIBAPT_INST=libapt-inst$(LIBAPTINST_MAJOR) export DPKG_GENSYMBOLS_CHECK_LEVEL=0 build: build/build-stamp -build-doc: build/build-doc-stamp +build-doc: build-manpages build/build-doc-stamp +build-manpages: build/build-manpages-stamp # Note that this is unconditionally done first as part of loading environment.mak # The true is needed to force make to reload environment.mak after running @@ -97,11 +98,16 @@ else endif touch $@ -build/build-doc-stamp: build/configure-stamp +build/build-doc-stamp: build/build-manpages-stamp build/configure-stamp # Add here commands to compile the package. $(MAKE) doc touch $@ +build/build-manpages-stamp: build/configure-stamp + # Add here commands to compile the package. + $(MAKE) manpages + touch $@ + clean: dh_testdir @@ -167,7 +173,7 @@ apt-doc: build-doc binary-arch: $(LIBAPT_PKG) $(LIBAPT_INST) apt libapt-pkg-dev apt-utils apt-transport-https apt_MANPAGES = apt-cache apt-cdrom apt-config apt-get apt-key apt-mark apt-secure apt apt.conf apt_preferences sources.list -apt: build build-doc +apt: build build-manpages dh_testdir -p$@ dh_testroot -p$@ dh_prep -p$@ @@ -231,7 +237,7 @@ libapt-pkg-dev: build debian/libapt-pkg-dev.install dh_builddeb -p$@ apt-utils_MANPAGES = apt-sortpkgs apt-ftparchive apt-extracttemplates -apt-utils: build build-doc +apt-utils: build build-manpages dh_testdir -p$@ dh_testroot -p$@ dh_prep -p$@ diff --git a/doc/makefile b/doc/makefile index df2ddb25f..f52586935 100644 --- a/doc/makefile +++ b/doc/makefile @@ -11,6 +11,11 @@ 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 + # Do not use XMLTO, build the manpages directly with XSLTPROC ifdef XSLTPROC # generate a list of accepted man page translations @@ -22,15 +27,26 @@ LOCAL := manpage-$(firstword $(SOURCE)) $(LOCAL)-LIST := $(SOURCE) # Install generation hooks -doc: $($(LOCAL)-LIST) -veryclean: veryclean/$(LOCAL) +manpages: $(MANPAGEPOLIST) $($(LOCAL)-LIST) $($(LOCAL)-LIST) :: % : %.xml $(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) @@ -47,12 +63,6 @@ TARGET = binary include $(COPY_H) .PHONY: clean clean-subdirs veryclean veryclean-subdirs all binary doc -doc: - 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 veryclean: veryclean-subdirs diff --git a/test/Makefile b/test/Makefile index b42a90b25..8207ebdab 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: +startup all clean veryclean binary program dirs test update-po manpages: $(MAKE) -C libapt $@ $(MAKE) -C interactive-helper $@ -- cgit v1.2.3-70-g09d2 From 1c8754c2fc67e6bafd92af8cb964661e858c6f41 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 17 May 2012 22:21:03 +0200 Subject: * doc/makefile: - build manpages with the correct l10n.gentext.default.language setting to get the correct section titles provided by docbook --- buildlib/po4a_manpage.mak | 2 +- debian/changelog | 3 +++ doc/makefile | 2 ++ doc/manpage-style.xsl | 1 + 4 files changed, 7 insertions(+), 1 deletion(-) (limited to 'buildlib') diff --git a/buildlib/po4a_manpage.mak b/buildlib/po4a_manpage.mak index 404bb57a5..5814180d8 100644 --- a/buildlib/po4a_manpage.mak +++ b/buildlib/po4a_manpage.mak @@ -16,7 +16,7 @@ INCLUDES = apt.ent apt-verbatim.ent # Do not use XMLTO, build the manpages directly with XSLTPROC ifdef XSLTPROC -STYLESHEET=../manpage-style.xsl +STYLESHEET=manpage-style.xsl LOCAL := po4a-manpage-$(firstword $(SOURCE)) $(LOCAL)-LIST := $(SOURCE) diff --git a/debian/changelog b/debian/changelog index bcc29eb86..b6464388d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -28,6 +28,9 @@ apt (0.9.4) UNRELEASED; urgency=low * cmdline/apt-get.cc: - use the host architecture, not the build architecture for matching of [architecture restrictions] in Build-Depends (Closes: #672927) + * doc/makefile: + - build manpages with the correct l10n.gentext.default.language setting + to get the correct section titles provided by docbook [ Raphael Geissert ] * apt-pkg/acquire*.cc: diff --git a/doc/makefile b/doc/makefile index f52586935..76e29e2b9 100644 --- a/doc/makefile +++ b/doc/makefile @@ -42,6 +42,8 @@ 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; \ + test -f $$i/manpage-style.xsl || sed "// i\ +" manpage-style.xsl > $$i/manpage-style.xsl; \ done # Clean rule diff --git a/doc/manpage-style.xsl b/doc/manpage-style.xsl index 85aa4521f..ef349f064 100644 --- a/doc/manpage-style.xsl +++ b/doc/manpage-style.xsl @@ -5,6 +5,7 @@ + <> -- cgit v1.2.3-70-g09d2 From 75f37d7d27c2579ddb88f852087a54934cb00c8b Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sun, 20 May 2012 18:37:14 +0200 Subject: move the creation of the manpage-style.xsl file to the rest of the manpage building instead of doing it at setup time, so we can properly depend on it --- buildlib/po4a_manpage.mak | 6 +++++- doc/makefile | 4 +--- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'buildlib') diff --git a/buildlib/po4a_manpage.mak b/buildlib/po4a_manpage.mak index 5814180d8..1dedd0dcd 100644 --- a/buildlib/po4a_manpage.mak +++ b/buildlib/po4a_manpage.mak @@ -28,7 +28,11 @@ veryclean: veryclean/$(LOCAL) apt-verbatim.ent: ../apt-verbatim.ent cp ../apt-verbatim.ent . -$($(LOCAL)-LIST) :: % : %.xml $(INCLUDES) +manpage-style.xsl: ../manpage-style.xsl + sed "// i\ +" ../manpage-style.xsl > manpage-style.xsl + +$($(LOCAL)-LIST) :: % : %.xml $(STYLESHEET) $(INCLUDES) echo Creating man page $@ $(XSLTPROC) -o $@ $(STYLESHEET) $< || exit 200 # why xsltproc doesn't respect the -o flag here??? test -f $(subst .$(LC),,$@) || echo FIXME: xsltproc respect the -o flag now, workaround can be removed diff --git a/doc/makefile b/doc/makefile index 76e29e2b9..4c0a431fd 100644 --- a/doc/makefile +++ b/doc/makefile @@ -29,7 +29,7 @@ $(LOCAL)-LIST := $(SOURCE) # Install generation hooks manpages: $(MANPAGEPOLIST) $($(LOCAL)-LIST) -$($(LOCAL)-LIST) :: % : %.xml $(INCLUDES) +$($(LOCAL)-LIST) :: % : %.xml $(STYLESHEET) $(INCLUDES) echo Creating man page $@ $(XSLTPROC) -o $@ $(STYLESHEET) $< @@ -42,8 +42,6 @@ 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; \ - test -f $$i/manpage-style.xsl || sed "// i\ -" manpage-style.xsl > $$i/manpage-style.xsl; \ done # Clean rule -- cgit v1.2.3-70-g09d2 From a680e061adae846d1c02dd0bb4b1f951592c9580 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 21 May 2012 15:12:27 +0200 Subject: * buildlib/podomain.mak: - ensure that all sources end up in the srclist so that we don't forget to extract half of the translation strings --- buildlib/podomain.mak | 6 +++--- debian/changelog | 9 +++++++++ 2 files changed, 12 insertions(+), 3 deletions(-) (limited to 'buildlib') diff --git a/buildlib/podomain.mak b/buildlib/podomain.mak index d46652520..cca7d55be 100644 --- a/buildlib/podomain.mak +++ b/buildlib/podomain.mak @@ -11,10 +11,10 @@ MY_DOMAIN := $(APT_DOMAIN) endif MKDIRS += $(PO_DOMAINS)/$(MY_DOMAIN) -$(PO_DOMAINS)/$(MY_DOMAIN)/$(LOCAL).$(TYPE)list: $(addprefix $(BASE)/$(SUBDIR)/,$(SOURCE)) +$(PO_DOMAINS)/$(MY_DOMAIN)/$(LOCAL).$(TYPE)list: SRC := $(addprefix $(SUBDIR)/,$(SOURCE)) $(PO_DOMAINS)/$(MY_DOMAIN)/$(LOCAL).$(TYPE)list: makefile dirs - (echo $(addprefix $(SUBDIR)/,$(SOURCE)) | xargs -n1 echo) > $@ -startup binary program clean: $(PO_DOMAINS)/$(MY_DOMAIN)/$(LOCAL).$(TYPE)list + (echo $(SRC) | xargs -n1 echo) > $@ +startup binary program clean update-po: $(PO_DOMAINS)/$(MY_DOMAIN)/$(LOCAL).$(TYPE)list veryclean: veryclean/$(LOCAL) veryclean/po/$(LOCAL): LIST := $(PO_DOMAINS)/$(MY_DOMAIN)/$(LOCAL).$(TYPE)list diff --git a/debian/changelog b/debian/changelog index a41380cdf..aeda80024 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +apt (0.9.5) UNRELEASED; urgency=low + + [ David Kalnischkies ] + * buildlib/podomain.mak: + - ensure that all sources end up in the srclist so that we don't + forget to extract half of the translation strings + + -- David Kalnischkies Mon, 21 May 2012 15:10:49 +0200 + apt (0.9.4) unstable; urgency=low [ David Kalnischkies ] -- cgit v1.2.3-70-g09d2 From 1c46aec47a9059d308e21391a8b8e92bd1c41737 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 21 May 2012 15:13:05 +0200 Subject: apply the correct metadata (package, version, mail) to all pot and po files --- buildlib/config.h.in | 3 +++ buildlib/environment.mak.in | 1 + configure.in | 3 +++ doc/makefile | 10 +++++++--- po/makefile | 6 +++--- 5 files changed, 17 insertions(+), 6 deletions(-) (limited to 'buildlib') diff --git a/buildlib/config.h.in b/buildlib/config.h.in index b07d4f77f..656705038 100644 --- a/buildlib/config.h.in +++ b/buildlib/config.h.in @@ -51,4 +51,7 @@ /* The version number string */ #undef PACKAGE_VERSION +/* The mail address to reach upstream */ +#undef PACKAGE_MAIL + #define APT_8_CLEANER_HEADERS diff --git a/buildlib/environment.mak.in b/buildlib/environment.mak.in index 0f0fac095..7ceae70ce 100644 --- a/buildlib/environment.mak.in +++ b/buildlib/environment.mak.in @@ -3,6 +3,7 @@ PACKAGE = @PACKAGE@ PACKAGE_VERSION = @PACKAGE_VERSION@ +PACKAGE_MAIL = @PACKAGE_MAIL@ # C++ compiler options CC = @CC@ diff --git a/configure.in b/configure.in index 2800fd2f3..f98f288b1 100644 --- a/configure.in +++ b/configure.in @@ -19,10 +19,13 @@ AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildli PACKAGE="apt" PACKAGE_VERSION="0.9.4" +PACKAGE_MAIL="APT Development Team " AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_DEFINE_UNQUOTED(PACKAGE_VERSION,"$PACKAGE_VERSION") +AC_DEFINE_UNQUOTED(PACKAGE_MAIL,"$PACKAGE_MAIL") AC_SUBST(PACKAGE) AC_SUBST(PACKAGE_VERSION) +AC_SUBST(PACKAGE_MAIL) dnl Check the archs, we want the target type. AC_CANONICAL_SYSTEM diff --git a/doc/makefile b/doc/makefile index 4c0a431fd..d9542b438 100644 --- a/doc/makefile +++ b/doc/makefile @@ -83,14 +83,18 @@ ifdef PO4A doc: po4a update-po: - po4a --previous --no-backups --force --no-translations po4a.conf + po4a --previous --no-backups --force --no-translations \ + --package-name='$(PACKAGE)' --package-version='$(PACKAGE_VERSION)' \ + --msgid-bugs-address='$(PACKAGE_MAIL)' po4a.conf po4a: - po4a --previous --no-backups po4a.conf + po4a --previous --no-backups \ + --package-name='$(PACKAGE)' --package-version='$(PACKAGE_VERSION)' \ + --msgid-bugs-address='$(PACKAGE_MAIL)' po4a.conf endif stats: - for i in po/*.po; do echo -n "$$i: "; msgfmt --statistics $$i; done + for i in po/*.po; do echo -n "$$i: "; msgfmt --output-file=/dev/null --statistics $$i; done ifdef DOXYGEN DOXYGEN_SOURCES = $(shell find $(BASE)/apt-pkg -not -name .\\\#* -and \( -name \*.cc -or -name \*.h \) ) diff --git a/po/makefile b/po/makefile index 46b75ff4f..ebf6c06d0 100644 --- a/po/makefile +++ b/po/makefile @@ -61,7 +61,7 @@ $(MOFILES) : $(PO_DOMAINS)/%.mo : $(PO_DOMAINS)/%.po cp $@ $(LOCALE)/$(notdir $*)/LC_MESSAGES/$(call GETDOMAIN,$*).mo stats: - for i in *.pot *.po; do echo -n "$$i: "; msgfmt --statistics $$i; done + for i in *.pot *.po; do echo -n "$$i: "; msgfmt --output-file=/dev/null --statistics $$i; done binary: $(POTFILES) $(MOFILES) @@ -69,8 +69,8 @@ $(PACKAGE)-all.pot: $(POTFILES) # we create our partial pot files without a header to avoid changing dates in *.mo files, # but we want a header for our master-pot file, so we use a dummy pot with nothing but the header $(XGETTEXT) --default-domain=$(PO)/$(PACKAGE)-dummy.pot --foreign --language=c \ - -o $(PO)/$(PACKAGE)-dummy.pot --force-po --package-name=$(PACKAGE) \ - --package-version=$(PACKAGE_VERSION) --msgid-bugs-address=deity@lists.debian.org /dev/null + -o $(PO)/$(PACKAGE)-dummy.pot --force-po --package-name='$(PACKAGE)' \ + --package-version='$(PACKAGE_VERSION)' --msgid-bugs-address='$(PACKAGE_MAIL)' /dev/null $(MSGCOMM) --more-than=0 $(PO)/$(PACKAGE)-dummy.pot $(POTFILES) --output=$(PACKAGE)-all.pot rm -f $(PO)/$(PACKAGE)-dummy.pot -- cgit v1.2.3-70-g09d2 From 5c1715d8f847a5a3d8b8128d2dcc8a7622a9df1b Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 21 May 2012 15:16:39 +0200 Subject: whatever this script did, it didn't for a long long time (it creates changelog from cvs) --- buildlib/mkChangeLog | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100755 buildlib/mkChangeLog (limited to 'buildlib') diff --git a/buildlib/mkChangeLog b/buildlib/mkChangeLog deleted file mode 100755 index 4164ec9d5..000000000 --- a/buildlib/mkChangeLog +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh - -NAMES="`sed -ne 's/'\''/'\''\\\\'\'''\''/g; - s/^.*CVS:\([^ ]\+\) \([^<]\+\) <\([^>]*\)>/\ - -u '\''\1:\2:\3'\''/gp' AUTHORS`" -OPTIONS="-l 78" - -# Generate the standard ChangeLog -echo CVSIGNORE=po rcs2log $OPTIONS $NAMES -eval CVSIGNORE=po rcs2log $OPTIONS $NAMES >> ChangeLog - -# Generate the po ChangeLog -#echo rcs2log $OPTIONS $NAMES po -#eval rcs2log $OPTIONS $NAMES po >> po/ChangeLog -- cgit v1.2.3-70-g09d2 From 65bf851838611139239805bee63a7cea4cb0a309 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 21 May 2012 16:50:52 +0200 Subject: * buildlib/inttypes.h.in: - remove inttypes.h compatibility as providing such a c99 types compatibility conflicts with the usage of c99 type long long --- COMPILING | 1 - buildlib/config.h.in | 14 ------------- buildlib/environment.mak.in | 1 - buildlib/inttypes.h.in | 50 --------------------------------------------- buildlib/makefile.in | 5 ----- buildlib/sizetable | 25 ----------------------- configure.in | 45 +--------------------------------------- debian/changelog | 3 +++ 8 files changed, 4 insertions(+), 140 deletions(-) delete mode 100644 buildlib/inttypes.h.in delete mode 100644 buildlib/sizetable (limited to 'buildlib') diff --git a/COMPILING b/COMPILING index 5ea5e52d1..bc934c846 100644 --- a/COMPILING +++ b/COMPILING @@ -36,7 +36,6 @@ functionality. Patches to make autoconf detect these cases and generate the required shims are OK. Current shims: - * C99 integer types 'inttypes.h' * sys/statvfs.h to convert from BSD/old-glibc statfs to SUS statvfs * rfc2553 hostname resolution (methods/rfc*), shims to normal gethostbyname. The more adventurous could steal the KAME IPv6 enabled resolvers for those diff --git a/buildlib/config.h.in b/buildlib/config.h.in index 656705038..85d3883fc 100644 --- a/buildlib/config.h.in +++ b/buildlib/config.h.in @@ -2,20 +2,6 @@ byte first (like Motorola and SPARC, unlike Intel and VAX). */ #undef WORDS_BIGENDIAN -/* The following 4 are only used by inttypes.h shim if the system lacks - inttypes.h */ -/* The number of bytes in a usigned char. */ -#undef SIZEOF_CHAR - -/* The number of bytes in a unsigned int. */ -#undef SIZEOF_INT - -/* The number of bytes in a unsigned long. */ -#undef SIZEOF_LONG - -/* The number of bytes in a unsigned short. */ -#undef SIZEOF_SHORT - /* Define if we have the timegm() function */ #undef HAVE_TIMEGM diff --git a/buildlib/environment.mak.in b/buildlib/environment.mak.in index 7ceae70ce..fc859951e 100644 --- a/buildlib/environment.mak.in +++ b/buildlib/environment.mak.in @@ -54,7 +54,6 @@ BDBLIB = @BDBLIB@ INTLLIBS = @INTLLIBS@ # Shim Headerfile control -HAVE_C9X = @HAVE_C9X@ HAVE_STATVFS = @HAVE_STATVFS@ HAVE_ZLIB = @HAVE_ZLIB@ HAVE_BZ2 = @HAVE_BZ2@ diff --git a/buildlib/inttypes.h.in b/buildlib/inttypes.h.in deleted file mode 100644 index 3b43b7672..000000000 --- a/buildlib/inttypes.h.in +++ /dev/null @@ -1,50 +0,0 @@ -/* This is an ISO C 9X header file. We omit this copy to the include - directory if the local platform does not have inttypes.h, it contains - [u]int[8,16,32]_t fixed width types */ - -#include - -#undef int32_t -#undef uint32_t -#undef int16_t -#undef uint16_t -#undef int8_t -#undef uint8_t - -/* Generate the fixed bit size types */ -#if SIZEOF_INT == 4 - typedef int int32_t; - typedef unsigned int uint32_t; -#else -# if SIZEOF_LONG == 4 - typedef long int32_t; - typedef unsigned long uint32_t; -# else -# if SIZEOF_SHORT == 4 - typedef short int32_t; - typedef unsigned short uint32_t; -# else -# error Must have a form of 32-bit integer -# endif -# endif -#endif - -#if SIZEOF_INT == 2 - typedef int int16_t; - typedef unsigned int uint16_t; -#else -# if SIZEOF_LONG == 2 - typedef long int16_t; - typedef unsigned long uint16_t; -# else -# if SIZEOF_SHORT == 2 - typedef short int16_t; - typedef unsigned short uint16_t; -# else -# error Must have a form of 16-bit integer -# endif -# endif -#endif - -typedef signed char int8_t; -typedef unsigned char uint8_t; diff --git a/buildlib/makefile.in b/buildlib/makefile.in index 756565f40..66144cfc6 100644 --- a/buildlib/makefile.in +++ b/buildlib/makefile.in @@ -31,11 +31,6 @@ maintainer-clean dist-clean pristine sanity distclean: .PHONY: dirs dirs: $(MAKE) -C $(SRCDIR) -f Makefile $@ -ifeq ($(HAVE_C9X),yes) - @rm -f include/inttypes.h > /dev/null 2>&1 -else - @cp -p $(SRCDIR)/buildlib/inttypes.h.in include/inttypes.h -endif ifeq ($(HAVE_STATVFS),yes) @rm -f include/statvfs.h > /dev/null 2>&1 else diff --git a/buildlib/sizetable b/buildlib/sizetable deleted file mode 100644 index 372ddd091..000000000 --- a/buildlib/sizetable +++ /dev/null @@ -1,25 +0,0 @@ -# -# This file lists common architectures for cross-compilation (CPUs, not -# OSs), and the endian-ness and relative type sizes. It is not needed for -# native compilation. -# -# If you wish to cross-compile APT, and your architecture is not listed -# here, you should add it, and submit it by email to the APT team at -# . -# -# This is used primarily for the MD5 algorithm. -# The format is:- -# CPU endian sizeof: char, int, short, long -i386 little 1 4 2 4 -amd64 little 1 4 2 8 -armeb big 1 4 2 4 -arm little 1 4 2 4 -alpha little 1 4 2 8 -mipsel little 1 4 2 4 -sparc big 1 4 2 4 -sparc64 big 1 4 2 8 -m68k big 1 4 2 4 -powerpc big 1 4 2 4 -mips big 1 4 2 4 -hppa big 1 4 2 4 -m32r big 1 4 2 4 diff --git a/configure.in b/configure.in index f98f288b1..d574c18e5 100644 --- a/configure.in +++ b/configure.in @@ -119,12 +119,6 @@ fi AC_MSG_RESULT($archset) AC_DEFINE_UNQUOTED(COMMON_ARCH,"$archset") -dnl We use C99 types if at all possible -AC_CACHE_CHECK([for C99 integer types],apt_cv_c9x_ints,[ - AC_TRY_COMPILE([#include ], - [uint8_t Foo1;uint16_t Foo2;uint32_t Foo3;], - apt_cv_c9x_ints=yes,apt_cv_c9x_ints=no)]) - dnl Single Unix Spec statvfs AC_CHECK_FUNC(statvfs,[HAVE_STATVFS=yes]) AC_SUBST(HAVE_STATVFS) @@ -144,46 +138,9 @@ dnl We should use the real timegm function if we have it. AC_CHECK_FUNC(timegm,AC_DEFINE(HAVE_TIMEGM)) AC_SUBST(HAVE_TIMEGM) -dnl Check the sizes etc. of the architecture -dnl This is stupid, it should just use the AC macros like it does below -dnl Cross compilers can either get a real C library or preload the cache -dnl with their size values. -changequote(,) -archline="`awk \" ! /^#|^\\\$/ {if (match(\\\"$archset\\\",\\\$1)) {print; exit}}\" $srcdir/buildlib/sizetable | cut -f 2- -d ' '`" -if test "x$archline" != "x"; then - changequote([,]) - set $archline - if test "$1" = "little"; then - ac_cv_c_bigendian=no - else - ac_cv_c_bigendian=yes - fi - size_char=$2 - size_int=$3 - size_short=$4 - size_long=$5 -fi - -dnl I wonder what AC_C_BIGENDIAN does if you cross compile... -dnl This is probably bogus, as above we only care if we have to build our own -dnl C9x types. -if test "$cross_compiling" = "yes" -a "x$archline" = "x"; then - AC_MSG_ERROR(When cross compiling, architecture must be present in sizetable) -fi +dnl Check the architecture AC_C_BIGENDIAN -dnl We do not need this if we have inttypes! -HAVE_C9X=yes -if test x"$apt_cv_c9x_ints" = x"no"; then - AC_CHECK_SIZEOF(char,$size_char) - AC_CHECK_SIZEOF(int,$size_int) - AC_CHECK_SIZEOF(short,$size_short) - AC_CHECK_SIZEOF(long,$size_long) - - HAVE_C9X= - AC_SUBST(HAVE_C9X) -fi - dnl HP-UX sux.. AC_MSG_CHECKING(for missing socklen_t) AC_EGREP_HEADER(socklen_t, sys/socket.h,[AC_MSG_RESULT(no)],[ diff --git a/debian/changelog b/debian/changelog index aeda80024..b23232c7b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,9 @@ apt (0.9.5) UNRELEASED; urgency=low * buildlib/podomain.mak: - ensure that all sources end up in the srclist so that we don't forget to extract half of the translation strings + * buildlib/inttypes.h.in: + - remove inttypes.h compatibility as providing such a c99 types + compatibility conflicts with the usage of c99 type long long -- David Kalnischkies Mon, 21 May 2012 15:10:49 +0200 -- cgit v1.2.3-70-g09d2 From 7f9692a9e91be568d8cb5208924b8e49d5a75e39 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 18 Jun 2012 12:33:53 +0200 Subject: * buildlib/configure.mak: - print a message detailing how to get config.guess and config.sub in case they are not in /usr/share/misc (Closes: #677312) --- buildlib/configure.mak | 29 ++++++++++++++++++++++++++++- debian/changelog | 3 +++ 2 files changed, 31 insertions(+), 1 deletion(-) (limited to 'buildlib') diff --git a/buildlib/configure.mak b/buildlib/configure.mak index c0d8e3c76..68d0535b4 100644 --- a/buildlib/configure.mak +++ b/buildlib/configure.mak @@ -12,15 +12,42 @@ # It would be a fairly good idea to run this after a cvs checkout. BUILDDIR=build -.PHONY: startup +.PHONY: startup missing-config-files startup: configure $(BUILDDIR)/config.status $(addprefix $(BUILDDIR)/,$(CONVERTED)) # use the files provided from the system instead of carry around # and use (most of the time outdated) copycats +ifeq (file-okay,$(shell test -r buildlib/config.sub && echo 'file-okay')) +buildlib/config.sub: +else + ifeq (file-okay,$(shell test -r /usr/share/misc/config.sub && echo 'file-okay')) buildlib/config.sub: ln -sf /usr/share/misc/config.sub buildlib/config.sub + else +buildlib/config.sub: missing-config-files + endif +endif + +ifeq (file-okay,$(shell test -r buildlib/config.guess && echo 'file-okay')) +buildlib/config.guess: +else + ifeq (file-okay,$(shell test -r /usr/share/misc/config.guess && echo 'file-okay')) buildlib/config.guess: ln -sf /usr/share/misc/config.guess buildlib/config.guess + else +buildlib/config.guess: missing-config-files + endif +endif + +missing-config-files: + @echo "APT needs 'config.guess' and 'config.sub' in buildlib/ for configuration." + @echo "On Debian systems these are available in the 'autotools-dev' package." + @echo + @echo "The latest versions can be acquired from the upstream git repository:" + @echo "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD" + @echo "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD" + exit 100 + configure: aclocal.m4 configure.in buildlib/config.guess buildlib/config.sub autoconf diff --git a/debian/changelog b/debian/changelog index 0e08534b6..ad5a4a1a3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,9 @@ apt (0.9.6.1) UNRELEASED; urgency=low * apt-pkg/pkgcache.cc: - do a string comparision for architecture checking in IsMultiArchImplicit as 'unique' strings in the pkgcache aren't unique (Closes: #677454) + * buildlib/configure.mak: + - print a message detailing how to get config.guess and config.sub + in case they are not in /usr/share/misc (Closes: #677312) -- David Kalnischkies Thu, 14 Jun 2012 15:45:13 +0200 -- cgit v1.2.3-70-g09d2 From 1098ae37273547d0b4c7d05c8c6b36db56c25443 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 29 Jun 2012 13:52:52 +0200 Subject: * debian/control: - 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 --- Makefile | 4 +-- buildlib/debiandoc.mak | 6 +++-- buildlib/defaults.mak | 2 +- buildlib/po4a_manpage.mak | 4 ++- debian/changelog | 6 ++++- debian/control | 4 +-- debian/rules | 10 +++---- doc/makefile | 66 ++++++++++++++++++++++++++++------------------- test/Makefile | 2 +- 9 files changed, 63 insertions(+), 41 deletions(-) (limited to 'buildlib') diff --git a/Makefile b/Makefile index 24f5b3e2b..98b6d337a 100644 --- a/Makefile +++ b/Makefile @@ -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 Mon, 25 Jun 2012 18:07:13 +0200 + -- David Kalnischkies 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 $@ -- cgit v1.2.3-70-g09d2