aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathan Scott <nathans@sgi.com>2002-04-13 00:11:02 +0000
committerNathan Scott <nathans@sgi.com>2002-04-13 00:11:02 +0000
commit3100958f6e12d42b5757c5628b64eacd476d068a (patch)
tree1f4cd1ec4adf7d1b3ee529078912e0ad444a43f8
parentaa08322b99510f8b95096e3a15dcc5d385e9e8d5 (diff)
downloaddmapi-dev-3100958f6e12d42b5757c5628b64eacd476d068a.tar.gz
bump version number, build updates to fix a cflags propogation issue
which was recently introduced.
-rw-r--r--VERSION2
-rw-r--r--debian/changelog6
-rw-r--r--doc/CHANGES3
-rw-r--r--include/builddefs.in11
-rw-r--r--include/buildmacros11
5 files changed, 21 insertions, 12 deletions
diff --git a/VERSION b/VERSION
index 1772b38..6b81001 100644
--- a/VERSION
+++ b/VERSION
@@ -3,5 +3,5 @@
#
PKG_MAJOR=2
PKG_MINOR=0
-PKG_REVISION=1
+PKG_REVISION=2
PKG_BUILD=0
diff --git a/debian/changelog b/debian/changelog
index a6102c2..6884d00 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+dmapi (2.0.2-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Nathan Scott <nathans@debian.org> Sat, 13 Apr 2002 09:45:06 +1000
+
dmapi (2.0.1-1) unstable; urgency=low
* New upstream release
diff --git a/doc/CHANGES b/doc/CHANGES
index 610ae1f..b7e22cb 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,3 +1,6 @@
+dmapi-2.0.2 (13 April 2002)
+ - Minor build system updates
+
dmapi-2.0.0 (07 February 2002)
- Major release to coincide with switch to new extended
attributes system call interfaces
diff --git a/include/builddefs.in b/include/builddefs.in
index f73fb6e..adda4ae 100644
--- a/include/builddefs.in
+++ b/include/builddefs.in
@@ -32,6 +32,9 @@
# @configure_input@
#
+ifndef _BUILDDEFS_INCLUDED_
+_BUILDDEFS_INCLUDED_ = 1
+
DEBUG = @debug_build@
OPTIMIZER = @opt_build@
MALLOCLIB = @malloc_lib@
@@ -73,3 +76,11 @@ CFLAGS += $(OPTIMIZER) $(DEBUG) -funsigned-char -Wall \
-DVERSION=\"$(PKG_VERSION)\" -D_FILE_OFFSET_BITS=64
include $(TOPDIR)/include/buildmacros
+
+endif
+
+#
+# For targets that should always be rebuilt,
+# define a target that is never up-to-date.
+# Targets needing this should depend on $(_FORCE)
+_FORCE = __force_build
diff --git a/include/buildmacros b/include/buildmacros
index 001397e..26f90f4 100644
--- a/include/buildmacros
+++ b/include/buildmacros
@@ -30,9 +30,6 @@
# http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
#
-ifndef _BUILDMACROS_INCLUDED_
-_BUILDMACROS_INCLUDED_ = 1
-
BUILDRULES = $(TOPDIR)/include/buildrules
# LCFLAGS, LLDFLAGS, LLDLIBS, LSRCFILES and LDIRT may be specified in
@@ -168,11 +165,3 @@ SOURCE_MAKERULE = \
$(MAKEF) DIR=$$DIR/$$d -C $$d $@ || exit $$?; \
fi; \
done
-
-endif
-
-#
-# For targets that should always be rebuilt,
-# define a target that is never up-to-date.
-# Targets needing this should depend on $(_FORCE)
-_FORCE = __force_build