Module Name: src
Committed By: mrg
Date: Wed Jul 3 09:30:22 UTC 2024
Modified Files:
src/external/mit/xorg/bin/bitmap: Makefile
src/external/mit/xorg/bin/bitmap/atobm: Makefile
src/external/mit/xorg/bin/bitmap/bmtoa: Makefile
Added Files:
src/external/mit/xorg/bin/bitmap: Makefile.common
Log Message:
adapt to new bitmap.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/bin/bitmap/Makefile
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/bin/bitmap/Makefile.common
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/xorg/bin/bitmap/atobm/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/bitmap/bmtoa/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/bitmap/Makefile
diff -u src/external/mit/xorg/bin/bitmap/Makefile:1.5 src/external/mit/xorg/bin/bitmap/Makefile:1.6
--- src/external/mit/xorg/bin/bitmap/Makefile:1.5 Mon Jul 11 08:05:08 2022
+++ src/external/mit/xorg/bin/bitmap/Makefile Wed Jul 3 09:30:22 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2022/07/11 08:05:08 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2024/07/03 09:30:22 mrg Exp $
.include <bsd.own.mk>
@@ -12,11 +12,7 @@ FILES= Dashes Down Excl FlipHoriz FlipVe
RotateRight Stipple Term Up
FILESDIR=${X11INCDIR}/X11/bitmaps
-CPPFLAGS+= -DHAVE_MKSTEMP -DHAVE_LRINT
-
-LDADD+= -lXaw -lXmu -lXt -lSM -lICE -lXpm -lXext -lX11 -lm
-DPADD+= ${LIBXAW} ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} \
- ${LIBXPM} ${LIBXEXT} ${LIBX11} ${LIBM}
+.include "Makefile.common"
SUBDIR= bmtoa atobm app-defaults
Index: src/external/mit/xorg/bin/bitmap/atobm/Makefile
diff -u src/external/mit/xorg/bin/bitmap/atobm/Makefile:1.1.1.1 src/external/mit/xorg/bin/bitmap/atobm/Makefile:1.2
--- src/external/mit/xorg/bin/bitmap/atobm/Makefile:1.1.1.1 Tue Jul 29 05:01:22 2008
+++ src/external/mit/xorg/bin/bitmap/atobm/Makefile Wed Jul 3 09:30:22 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2024/07/03 09:30:22 mrg Exp $
NOMAN= 1
@@ -6,9 +6,7 @@ NOMAN= 1
PROG= atobm
-LDADD+= -lXaw -lXmu -lXt -lSM -lICE -lXpm -lXext -lX11 -lm
-DPADD+= ${LIBXAW} ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} \
- ${LIBXPM} ${LIBXEXT} ${LIBX11} ${LIBM}
+.include "../Makefile.common"
.PATH: ${X11SRCDIR.bitmap}
Index: src/external/mit/xorg/bin/bitmap/bmtoa/Makefile
diff -u src/external/mit/xorg/bin/bitmap/bmtoa/Makefile:1.2 src/external/mit/xorg/bin/bitmap/bmtoa/Makefile:1.3
--- src/external/mit/xorg/bin/bitmap/bmtoa/Makefile:1.2 Wed Apr 13 21:48:21 2016
+++ src/external/mit/xorg/bin/bitmap/bmtoa/Makefile Wed Jul 3 09:30:22 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2016/04/13 21:48:21 christos Exp $
+# $NetBSD: Makefile,v 1.3 2024/07/03 09:30:22 mrg Exp $
NOMAN= 1
@@ -6,10 +6,7 @@ NOMAN= 1
PROG= bmtoa
-CPPFLAGS+=-DHAVE_MKSTEMP
-LDADD+= -lXaw -lXmu -lXt -lSM -lICE -lXpm -lXext -lX11 -lm
-DPADD+= ${LIBXAW} ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} \
- ${LIBXPM} ${LIBXEXT} ${LIBX11} ${LIBM}
+.include "../Makefile.common"
.PATH: ${X11SRCDIR.bitmap}
Added files:
Index: src/external/mit/xorg/bin/bitmap/Makefile.common
diff -u /dev/null src/external/mit/xorg/bin/bitmap/Makefile.common:1.1
--- /dev/null Wed Jul 3 09:30:22 2024
+++ src/external/mit/xorg/bin/bitmap/Makefile.common Wed Jul 3 09:30:22 2024
@@ -0,0 +1,9 @@
+# $NetBSD: Makefile.common,v 1.1 2024/07/03 09:30:22 mrg Exp $
+
+# common makefile fragment for bitmap components
+
+LDADD+= -lXaw -lXmu -lXt -lSM -lICE -lXpm -lXext -lX11 -lm
+DPADD+= ${LIBXAW} ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} \
+ ${LIBXPM} ${LIBXEXT} ${LIBX11} ${LIBM}
+
+CPPFLAGS+=-DHAVE_MKSTEMP -DHAVE_LRINT -DPACKAGE_STRING=\"${PACKAGE_STRING}\"
