[src/trunk]: src/external/mit/xorg/lib make libXaw6 build with the new libXt ...

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/74b315d19497
branches:  trunk
changeset: 378874:74b315d19497
user:      mrg <mrg%NetBSD.org@localhost>
date:      Mon Apr 26 21:53:53 2021 +0000

description:
make libXaw6 build with the new libXt as well.  consolidate common code.

diffstat:

 external/mit/xorg/lib/libXaw/Makefile        |  28 ++++++++--------------------
 external/mit/xorg/lib/libXaw/Makefile.common |  21 +++++++++++++++++++++
 external/mit/xorg/lib/libXaw6/Makefile       |  15 +++------------
 3 files changed, 32 insertions(+), 32 deletions(-)

diffs (102 lines):

diff -r a4ac90507377 -r 74b315d19497 external/mit/xorg/lib/libXaw/Makefile
--- a/external/mit/xorg/lib/libXaw/Makefile     Mon Apr 26 21:43:19 2021 +0000
+++ b/external/mit/xorg/lib/libXaw/Makefile     Mon Apr 26 21:53:53 2021 +0000
@@ -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
 
-
-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
+.include "Makefile.common"
 
-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
diff -r a4ac90507377 -r 74b315d19497 external/mit/xorg/lib/libXaw/Makefile.common
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/mit/xorg/lib/libXaw/Makefile.common      Mon Apr 26 21:53:53 2021 +0000
@@ -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
diff -r a4ac90507377 -r 74b315d19497 external/mit/xorg/lib/libXaw6/Makefile
--- a/external/mit/xorg/lib/libXaw6/Makefile    Mon Apr 26 21:43:19 2021 +0000
+++ b/external/mit/xorg/lib/libXaw6/Makefile    Mon Apr 26 21:53:53 2021 +0000
@@ -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}\"
+.include "../libXaw/Makefile.common"
 
-LIBDPLIBS=\
-       Xmu     ${.CURDIR}/../libXmu \
-       Xt      ${.CURDIR}/../libXt \
-       SM      ${.CURDIR}/../libSM \
-       ICE     ${.CURDIR}/../libICE \
-       Xext    ${.CURDIR}/../libXext \
-       X11     ${.CURDIR}/../libX11/dynamic
+CPPFLAGS+=     -DOLDXAW
 
 PKGCONFIG=     xaw6
 PKGDIST=       ${LIBOLD}