Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/x11/lib/expat Move version definitions (etc) into separate M...



details:   https://anonhg.NetBSD.org/src/rev/16e6d5737952
branches:  trunk
changeset: 551828:16e6d5737952
user:      lukem <lukem%NetBSD.org@localhost>
date:      Fri Sep 12 18:24:20 2003 +0000

description:
Move version definitions (etc) into separate Makefile.expatdefs,
so that other Makefiles can use them

diffstat:

 x11/lib/expat/Makefile           |  16 ++++++----------
 x11/lib/expat/Makefile.expatdefs |   8 ++++++++
 2 files changed, 14 insertions(+), 10 deletions(-)

diffs (46 lines):

diff -r 0ff12e8a2e97 -r 16e6d5737952 x11/lib/expat/Makefile
--- a/x11/lib/expat/Makefile    Fri Sep 12 17:55:40 2003 +0000
+++ b/x11/lib/expat/Makefile    Fri Sep 12 18:24:20 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1.1.1 2003/09/11 18:37:08 lukem Exp $
+#      $NetBSD: Makefile,v 1.2 2003/09/12 18:24:20 lukem Exp $
 
 .include <bsd.own.mk>
 
@@ -12,19 +12,15 @@
 INCS=  expat.h
 INCSDIR=${X11INCDIR}
 
-MAJOR_VERSION= 1
-MINOR_VERSION= 95
-MICRO_VERSION= 2
+.include "Makefile.expatdefs"
 
-CPPFLAGS+=     -DVERSION=\"${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}\"
-CPPFLAGS+=     -DXML_BYTE_ORDER=0
-CPPFLAGS+=     -I${DIST}
+CPPFLAGS+=     ${EXPAT_FLAGS} -I${DIST}
 
 expat.h: expat.h.in
        rm -f ${.TARGET}
-       sed -e 's/@EXPAT_MAJOR_VERSION@/${MAJOR_VERSION}/' \
-           -e 's/@EXPAT_MINOR_VERSION@/${MINOR_VERSION}/' \
-           -e 's/@EXPAT_EDIT@/${MICRO_VERSION}/' ${.ALLSRC} > ${.TARGET}
+       sed -e 's/@EXPAT_MAJOR_VERSION@/${EXPAT_MAJOR_VERSION}/' \
+           -e 's/@EXPAT_MINOR_VERSION@/${EXPAT_MINOR_VERSION}/' \
+           -e 's/@EXPAT_EDIT@/${EXPAT_MICRO_VERSION}/' ${.ALLSRC} > ${.TARGET}
 CLEANFILES+=   expat.h
 
 .include <bsd.lib.mk>
diff -r 0ff12e8a2e97 -r 16e6d5737952 x11/lib/expat/Makefile.expatdefs
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/lib/expat/Makefile.expatdefs  Fri Sep 12 18:24:20 2003 +0000
@@ -0,0 +1,8 @@
+#      $NetBSD: Makefile.expatdefs,v 1.1 2003/09/12 18:24:22 lukem Exp $
+
+EXPAT_MAJOR_VERSION=   1
+EXPAT_MINOR_VERSION=   95
+EXPAT_MICRO_VERSION=   2
+
+EXPAT_FLAGS=   -DXML_BYTE_ORDER=0 \
+               -DVERSION=\"${EXPAT_MAJOR_VERSION}.${EXPAT_MINOR_VERSION}.${EXPAT_MICRO_VERSION}\"



Home | Main Index | Thread Index | Old Index