summaryrefslogtreecommitdiff
path: root/buildlib
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2012-05-22 16:07:49 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2012-05-22 16:07:49 +0200
commit800694cbf33e206935dc9e6e8fa6e9a036b8efad (patch)
tree1557d96ee0f463a020b11604146be66fb9809a31 /buildlib
parent6c0c0387e616f8d04f00916fbd1fe899acd265cd (diff)
parent1351329e376a8dbe7780693693d0f3db0ec749fa (diff)
merged (and resolved a bunch of conflicts) of the debian-sid branch
Diffstat (limited to 'buildlib')
-rw-r--r--buildlib/config.h.in29
-rw-r--r--buildlib/configure.mak11
-rw-r--r--buildlib/copy.mak2
-rw-r--r--buildlib/defaults.mak2
-rw-r--r--buildlib/environment.mak.in6
-rw-r--r--buildlib/inttypes.h.in50
-rw-r--r--buildlib/makefile.in5
-rw-r--r--buildlib/manpage.mak3
-rwxr-xr-xbuildlib/mkChangeLog14
-rw-r--r--buildlib/po4a_manpage.mak8
-rw-r--r--buildlib/podomain.mak4
-rw-r--r--buildlib/sizetable25
12 files changed, 33 insertions, 126 deletions
diff --git a/buildlib/config.h.in b/buildlib/config.h.in
index 4798fe3f5..85d3883fc 100644
--- a/buildlib/config.h.in
+++ b/buildlib/config.h.in
@@ -2,23 +2,15 @@
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
+/* Define if we have the zlib library for gzip */
+#undef HAVE_ZLIB
+
+/* Define if we have the bz2 library for bzip2 */
+#undef HAVE_BZ2
+
/* These two are used by the statvfs shim for glibc2.0 and bsd */
/* Define if we have sys/vfs.h */
#undef HAVE_VFS_H
@@ -39,10 +31,13 @@
/* Define the arch name string */
#undef COMMON_ARCH
-/* The version number string */
-#undef VERSION
-
/* The package name string */
#undef PACKAGE
+/* 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/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/defaults.mak b/buildlib/defaults.mak
index edb089160..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
-headers library clean veryclean program test:
+startup headers library clean veryclean program test update-po manpages:
veryclean:
echo Very Clean done for $(SUBDIR)
diff --git a/buildlib/environment.mak.in b/buildlib/environment.mak.in
index fdac3e6c3..fc859951e 100644
--- a/buildlib/environment.mak.in
+++ b/buildlib/environment.mak.in
@@ -2,6 +2,8 @@
# if you want you can edit it, just don't re-run configure.
PACKAGE = @PACKAGE@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PACKAGE_MAIL = @PACKAGE_MAIL@
# C++ compiler options
CC = @CC@
@@ -52,9 +54,9 @@ BDBLIB = @BDBLIB@
INTLLIBS = @INTLLIBS@
# Shim Headerfile control
-HAVE_C9X = @HAVE_C9X@
HAVE_STATVFS = @HAVE_STATVFS@
-HAVE_TIMEGM = @HAVE_TIMEGM@
+HAVE_ZLIB = @HAVE_ZLIB@
+HAVE_BZ2 = @HAVE_BZ2@
NEED_SOCKLEN_T_DEFINE = @NEED_SOCKLEN_T_DEFINE@
# Shared library things
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 <config.h>
-
-#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/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/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
diff --git a/buildlib/po4a_manpage.mak b/buildlib/po4a_manpage.mak
index 404bb57a5..1dedd0dcd 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)
@@ -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 "/<!-- LANGUAGE -->/ i\
+<xsl:param name=\"l10n.gentext.default.language\" select=\"'$(LC)'\" />" ../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/buildlib/podomain.mak b/buildlib/podomain.mak
index 511a5cae2..cca7d55be 100644
--- a/buildlib/podomain.mak
+++ b/buildlib/podomain.mak
@@ -12,9 +12,9 @@ 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
+$(PO_DOMAINS)/$(MY_DOMAIN)/$(LOCAL).$(TYPE)list: makefile dirs
(echo $(SRC) | xargs -n1 echo) > $@
-binary program clean: $(PO_DOMAINS)/$(MY_DOMAIN)/$(LOCAL).$(TYPE)list
+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/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
-# <apt@packages.debian.org>.
-#
-# 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