Module Name: src
Committed By: mrg
Date: Mon Apr 26 21:53:54 UTC 2021
Modified Files:
src/external/mit/xorg/lib/libXaw: Makefile
src/external/mit/xorg/lib/libXaw6: Makefile
Added Files:
src/external/mit/xorg/lib/libXaw: Makefile.common
Log Message:
make libXaw6 build with the new libXt as well. consolidate common code.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/external/mit/xorg/lib/libXaw/Makefile
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/lib/libXaw/Makefile.common
cvs rdiff -u -r1.10 -r1.11 src/external/mit/xorg/lib/libXaw6/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/lib/libXaw/Makefile
diff -u src/external/mit/xorg/lib/libXaw/Makefile:1.15 src/external/mit/xorg/lib/libXaw/Makefile:1.16
--- src/external/mit/xorg/lib/libXaw/Makefile:1.15 Mon Apr 26 21:43:19 2021
+++ src/external/mit/xorg/lib/libXaw/Makefile Mon Apr 26 21:53:53 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2021/04/26 21:43:19 mrg Exp $
+# $NetBSD: Makefile,v 1.16 2021/04/26 21:53:53 mrg Exp $
.include <bsd.own.mk>
@@ -49,23 +49,14 @@ INCS= AllWidgets.h AsciiSink.h AsciiSink
INCSDIR=${X11INCDIR}/X11/Xaw
+.include "Makefile.common"
-CPPFLAGS+= -DHAVE_WCHAR_H -DHAVE_WCTYPE_H -DNO_WIDEC_H -DHAVE_ISWALNUM
-CPPFLAGS+= -DHAVE_GETPAGESIZE
-CPPFLAGS+= -DHAVE_UNISTD_H
-CPPFLAGS+= -D_CONST_X_STRING=1
-CPPFLAGS+= -DPROJECT_ROOT=\"${X11ROOTDIR}\" -DXAW7
-CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/Xaw
-CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/extensions
-
-LIBDPLIBS=\
- Xmu ${.CURDIR}/../libXmu \
- Xt ${.CURDIR}/../libXt \
- SM ${.CURDIR}/../libSM \
- ICE ${.CURDIR}/../libICE \
- Xpm ${.CURDIR}/../libXpm \
- Xext ${.CURDIR}/../libXext \
- X11 ${.CURDIR}/../libX11/dynamic
+CPPFLAGS+= -DXAW7 \
+ -I${DESTDIR}${X11INCDIR}/X11/Xaw \
+ -I${DESTDIR}${X11INCDIR}/X11/extensions
+
+LIBDPLIBS+=\
+ Xpm ${.CURDIR}/../libXpm
PKGCONFIG= xaw7
PKGDIST= ${LIBOLD}
@@ -77,6 +68,3 @@ X11EXTRAMANTRANSFORMS+= \
.include <bsd.lib.mk>
CWARNFLAGS.clang+= -Wno-format
-
-COPTS.Pixmap.c+= -Wno-discarded-qualifiers
-COPTS.TextAction.c+= -Wno-discarded-qualifiers
Index: src/external/mit/xorg/lib/libXaw6/Makefile
diff -u src/external/mit/xorg/lib/libXaw6/Makefile:1.10 src/external/mit/xorg/lib/libXaw6/Makefile:1.11
--- src/external/mit/xorg/lib/libXaw6/Makefile:1.10 Tue Jan 7 07:27:50 2020
+++ src/external/mit/xorg/lib/libXaw6/Makefile Mon Apr 26 21:53:54 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2020/01/07 07:27:50 mrg Exp $
+# $NetBSD: Makefile,v 1.11 2021/04/26 21:53:54 mrg Exp $
NOCHECKVER= yes # we want to install an older version ...
MKLINKLIB= no
@@ -19,18 +19,9 @@ SRCS= Actions.c AllWidgets.c AsciiSink.c
TextSrc.c TextTr.c Toggle.c Tree.c Vendor.c Viewport.c \
XawI18n.c XawIm.c XawInit.c
-CPPFLAGS+= -DHAVE_WCHAR_H -DHAVE_WCTYPE_H -DNO_WIDEC_H -DOLDXAW \
- -DHAVE_GETPAGESIZE \
- -DHAVE_UNISTD_H \
- -DHAVE_ISWALNUM -DPROJECT_ROOT=\"${X11ROOTDIR}\"
-
-LIBDPLIBS=\
- Xmu ${.CURDIR}/../libXmu \
- Xt ${.CURDIR}/../libXt \
- SM ${.CURDIR}/../libSM \
- ICE ${.CURDIR}/../libICE \
- Xext ${.CURDIR}/../libXext \
- X11 ${.CURDIR}/../libX11/dynamic
+.include "../libXaw/Makefile.common"
+
+CPPFLAGS+= -DOLDXAW
PKGCONFIG= xaw6
PKGDIST= ${LIBOLD}
Added files:
Index: src/external/mit/xorg/lib/libXaw/Makefile.common
diff -u /dev/null src/external/mit/xorg/lib/libXaw/Makefile.common:1.1
--- /dev/null Mon Apr 26 21:53:54 2021
+++ src/external/mit/xorg/lib/libXaw/Makefile.common Mon Apr 26 21:53:53 2021
@@ -0,0 +1,21 @@
+# $NetBSD: Makefile.common,v 1.1 2021/04/26 21:53:53 mrg Exp $
+
+CPPFLAGS+= -DHAVE_WCHAR_H \
+ -DHAVE_WCTYPE_H \
+ -DNO_WIDEC_H \
+ -DHAVE_ISWALNUM \
+ -DHAVE_GETPAGESIZE \
+ -DHAVE_UNISTD_H \
+ -D_CONST_X_STRING=1 \
+ -DPROJECT_ROOT=\"${X11ROOTDIR}\"
+
+LIBDPLIBS=\
+ Xmu ${.CURDIR}/../libXmu \
+ Xt ${.CURDIR}/../libXt \
+ SM ${.CURDIR}/../libSM \
+ ICE ${.CURDIR}/../libICE \
+ Xext ${.CURDIR}/../libXext \
+ X11 ${.CURDIR}/../libX11/dynamic
+
+COPTS.Pixmap.c+= -Wno-discarded-qualifiers
+COPTS.TextAction.c+= -Wno-discarded-qualifiers
