Module Name:    src
Committed By:   christos
Date:           Sun Aug  6 20:32:41 UTC 2023

Modified Files:
        src/external/gpl3/gdb/bin/gdbtui: Makefile

Log Message:
copy the Makefile from gdb.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/external/gpl3/gdb/bin/gdbtui/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/gpl3/gdb/bin/gdbtui/Makefile
diff -u src/external/gpl3/gdb/bin/gdbtui/Makefile:1.15 src/external/gpl3/gdb/bin/gdbtui/Makefile:1.16
--- src/external/gpl3/gdb/bin/gdbtui/Makefile:1.15	Fri Sep 17 21:47:09 2021
+++ src/external/gpl3/gdb/bin/gdbtui/Makefile	Sun Aug  6 16:32:41 2023
@@ -1,15 +1,19 @@
-#	$NetBSD: Makefile,v 1.15 2021/09/18 01:47:09 christos Exp $
+#	$NetBSD: Makefile,v 1.16 2023/08/06 20:32:41 christos Exp $
+
 NOCTF=
+NOMAN=
+.include <bsd.own.mk>
 .include "../Makefile.inc"
 
-GDBARCHDIR=${.CURDIR}/../../lib/libgdb/arch/${GDB_MACHINE_ARCH}
+GDBLIBDIR=${.CURDIR}/../../lib
+GDBARCHDIR=${GDBLIBDIR}/libgdb/arch/${GDB_MACHINE_ARCH}
 .include "${GDBARCHDIR}/defs.mk"
 
 PROG=		gdbtui
 
-SRCS=		tui-main.c
+SRCS=		tui-main.c 
 CPPFLAGS+=	-I${.CURDIR} \
-		-I${.CURDIR}/../../lib/libgnulib/arch/${GDB_MACHINE_ARCH}/gnulib \
+		-I${GNULIBDIR}/libgnulib/arch/${GDB_MACHINE_ARCH}/gnulib \
 		-I${DIST}/gdb \
 		-I${DIST}/gdbsupport \
 		-I${DIST}/gdb/config \
@@ -18,75 +22,82 @@ CPPFLAGS+=	-I${.CURDIR} \
 		-I${DIST}/readline \
 		-I${DIST}/libdecnumber \
 		-I${DIST} \
-		-I${.CURDIR}/../../lib/libbfd/arch/${GDB_MACHINE_ARCH} \
-		-I${.CURDIR}/../../lib/libgdbsupport/arch/${GDB_MACHINE_ARCH} \
-		-I${.CURDIR}/../../lib/libgnulib/arch/${GDB_MACHINE_ARCH} \
-		-I${.CURDIR}/../../lib/libgnulib/arch/${GDB_MACHINE_ARCH}/gnulib/import \
+		-I${GDBLIBDIR}/libbfd/arch/${GDB_MACHINE_ARCH} \
+		-I${GDBLIBDIR}/libgdbsupport/arch/${GDB_MACHINE_ARCH} \
+		-I${GDBLIBDIR}/libgnulib/arch/${GDB_MACHINE_ARCH} \
+		-I${GDBLIBDIR}/libgnulib/arch/${GDB_MACHINE_ARCH}/gnulib/import \
 		-I${DIST}/bfd \
 		-I${DIST}/include \
 		${GCPPFLAGS:M-D*}
 
-NOMAN=		# defined
-
-.include <bsd.prog.mk>
+TEXINFO=	gdb.texinfo stabs.texinfo
+INFOFLAGS=	-I${DIST}/gdb/doc -I${DIST}/gdb/mi \
+		-I${DIST}/readline/readline/doc -I${.CURDIR}/.. -DGDBN=${GDBN}
+
+GDBvn.texi: ${DIST}/gdb/version.in
+	echo "@set GDBVN $$(${TOOL_CAT} ${.ALLSRC})" > ${.TARGET}
+
+gdb-cfg.texi: ${DIST}/gdb/doc/all-cfg.texi
+	${TOOL_CAT} ${.ALLSRC} > ${.TARGET}
+
+CLEANFILES+= GDBvn.texi gdb-cfg.texi
+stabs.info gdb.info: gdb-cfg.texi GDBvn.texi
+
+FILES=		netbsd.xml
+FILESDIR=	/usr/share/gdb/syscalls
+
+.include "../../Makefile.inc"
+.include <bsd.info.mk>
+
+PROGDPLIBS+= gdb ${GDBLIBDIR}/libgdb
+# XXX: modula2 won't load otherwise, since nothing brings the m2-objs in.
+LIBGDBDIR!=	cd ${GDBLIBDIR}/libgdb && ${PRINTOBJDIR}
+LDADD+=		${LIBGDBDIR}/m2-lang.o
+#LDADD+= -L${LIBGDBDIR} -Wl,--whole-archive -lgdb -Wl,-no-whole-archive
+#DPADD+= ${LIBGDBDIR}/libgdb.a
 
-# Force c++
-CWARNFLAGS.clang+=	-Wno-deprecated
-HOST_CC:=		${HOST_CXX}
-HOST_CFLAGS+=		${HOST_CXXFLAGS}
-CC:=			${CXX}
-CFLAGS:=		${CXXFLAGS} -std=gnu++11 -Wno-error=stack-protector
+# Simulator support
+.if ${GDB_MACHINE_ARCH} == powerpc || ${GDB_MACHINE_ARCH} == powerpcle || \
+    ${GDB_MACHINE_ARCH} == powerpc64
+PROGDPLIBS+= sim ${.CURDIR}/../lib/libsim
+.elif ${MACHINE_CPU} == xxmips
+PROGDPLIBS+= sim ${.CURDIR}/../lib/libsim
+.endif
 
-LIBCTFDIR!=	     cd ${.CURDIR}/../../lib/libctf	   && ${PRINTOBJDIR}
-LIBGNULIBDIR!=	     cd ${.CURDIR}/../../lib/libgnulib	   && ${PRINTOBJDIR}
-LIBGDBSUPPORTDIR!=   cd ${.CURDIR}/../../lib/libgdbsupport && ${PRINTOBJDIR}
-LIBOPCODESDIR!=	     cd ${.CURDIR}/../../lib/libopcodes	   && ${PRINTOBJDIR}
-LIBBFDDIR!=	     cd ${.CURDIR}/../../lib/libbfd	   && ${PRINTOBJDIR}
-LIBIBERTYDIR!=	     cd ${.CURDIR}/../../lib/libiberty	   && ${PRINTOBJDIR}
-LIBGDBDIR!=	     cd ${.CURDIR}/../../lib/libgdb	   && ${PRINTOBJDIR}
-LIBDECNUMBERDIR!=    cd ${.CURDIR}/../../lib/libdecnumber  && ${PRINTOBJDIR}
+PROGDPLIBS+= opcodes ${GDBLIBDIR}/libopcodes \
+    bfd ${GDBLIBDIR}/libbfd \
+    decnumber ${GDBLIBDIR}/libdecnumber \
+    gdbsupport ${GDBLIBDIR}/libgdbsupport \
+    backtrace ${GDBLIBDIR}/libbacktrace \
+    sframe ${GDBLIBDIR}/libsframe \
+    ctf ${GDBLIBDIR}/libctf \
+    gnulib ${GDBLIBDIR}/libgnulib \
+    iberty ${GDBLIBDIR}/libiberty
 
 .if ${USE_LIBEDIT} == yes
-LIBEDIT=-ledit
+LDADD+= -ledit
+DPADD+= ${LIBEDIT}
 .else
-LIBRLDIR!=  cd ${.CURDIR}/../../lib/libreadline && ${PRINTOBJDIR}
-LIBRL= -L${LIBRLDIR} -lreadline
-LIBRLDP=    ${LIBRLDIR}/libreadline.a
+PROGDPLIBS+= readline ${GDBLIBDIR}/libreadline
 .endif
 
-LDADD+= -L${LIBGDBDIR} -lgdb
-DPADD+= ${LIBGDBDIR}/libgdb.a
-
-# Simulator support
-.if ${GDB_MACHINE_ARCH} == powerpc || ${GDB_MACHINE_ARCH} == powerpcle || \
-    ${GDB_MACHINE_ARCH} == powerpc64
-SIMOBJ!=	cd ${.CURDIR}/../../lib/libsim && ${PRINTOBJDIR}
-LDADD+=		-L${SIMOBJ} -lsim
-DPADD+=		${SIMOBJ}/libsim.a
-.elif ${MACHINE_CPU} == xxmips
-SIMOBJ!=	cd ${.CURDIR}/../../lib/libsim && ${PRINTOBJDIR}
-LDADD+=		-L${SIMOBJ} -lsim
-DPADD+=		${SIMOBJ}/libsim.a
-.endif
+.include <bsd.prog.mk>
 
-LDADD+= -L${LIBOPCODESDIR} -lopcodes \
-	-L${LIBBFDDIR} -lbfd \
-	-L${LIBDECNUMBERDIR} -ldecnumber \
-	-L${LIBGDBSUPPORTDIR} -lgdbsupport \
-	-L${LIBCTFDIR} -lctf \
-	-L${LIBGNULIBDIR} -lgnulib \
-	${LIBRL} \
-	-lterminfo \
-	-L${LIBIBERTYDIR} -liberty
-
-DPADD+=	${LIBOPCODESDIR}/libopcodes.a \
-	${LIBBFDDIR}/libbfd.a \
-	${LIBRLDP} \
-	${LIBTERMINFO} \
-	${LIBIBERTYDIR}/libiberty.a
+LIBGMP!=	cd ${.CURDIR}/../../../../lgpl3/gmp/lib/libgmp && ${PRINTOBJDIR}
+LDADD+= -L${LIBGMP} -lgmp
+DPADD+= ${LIBGMP}/libgmp.a
+
+LDADD+=	-lexpat -llzma -lz -lcurses -lterminfo -lintl -lm -lkvm -lutil -lpthread
+DPADD+=	${LIBEXPAT} ${LIBLZMA} ${LIBZ} ${LIBCURSES} ${LIBTERMINFO} ${LIBINTL} \
+    ${LIBM} ${LIBKVM} ${LIBUTIL} ${LIBPTHREAD}
 
-LDADD+=		-lexpat -llzma -lz -lcurses -lintl -lm -lkvm -lutil -lpthread
-DPADD+=		${LIBEXPAT} ${LIBLZMA} ${LIBZ} ${LIBCURSES} ${LIBINTL} ${LIBM} ${LIBKVM} ${LIBUTIL} ${LIBPTHREAD}
+# Force c++
+CWARNFLAGS.clang+=	-Wno-deprecated
+HOST_CC:=		${HOST_CXX}
+HOST_CFLAGS+=		${HOST_CXXFLAGS}
+CC:=			${CXX}
+CFLAGS:=		${CXXFLAGS} -std=gnu++11 -Wno-error=stack-protector
 
 .PATH: ${DIST}/gdb ${DIST}/gdb/mi ${DIST}/gdb/cli ${DIST}/gdb/tui \
-    ${DIST}/gdb/signals ${DIST}/gdb/doc ${.CURDIR}/../arch/${GDB_MACHINE_ARCH}
+    ${DIST}/gdb/signals ${DIST}/gdb/syscalls ${DIST}/gdb/doc \
+    ${.CURDIR}/../arch/${GDB_MACHINE_ARCH}

Reply via email to