From owner-p4-projects@FreeBSD.ORG Sun Apr 11 21:13:11 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 127B416A4D2; Sun, 11 Apr 2004 21:13:11 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D8C4716A4D0 for ; Sun, 11 Apr 2004 21:13:10 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 99BC043D55 for ; Sun, 11 Apr 2004 21:13:10 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i3C4DAGe001222 for ; Sun, 11 Apr 2004 21:13:10 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i3C4DAMG001219 for perforce@freebsd.org; Sun, 11 Apr 2004 21:13:10 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Sun, 11 Apr 2004 21:13:10 -0700 (PDT) Message-Id: <200404120413.i3C4DAMG001219@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 50906 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Apr 2004 04:13:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=50906 Change 50906 by marcel@marcel_nfs on 2004/04/11 21:12:09 Use ${TARGET_SUBDIR} instead of ${.CURDIR}/${TARGET_ARCH} or just ${TARGET_ARCH} for makefile inclusions. There are currently 2 exceptions, both are ${.CURDIR}/../bfd/${TARGET_ARCH}. Ideally these should be abstracted as well so that we can select a subdir that's different from ${TARGET_ARCH}. Think variations of a single platforms (as in big-endian and little-endian). Affected files ... .. //depot/projects/gdb/gnu/usr.bin/gdb/bfd/Makefile#3 edit .. //depot/projects/gdb/gnu/usr.bin/gdb/gdb/Makefile#8 edit .. //depot/projects/gdb/gnu/usr.bin/gdb/libiberty/Makefile#3 edit .. //depot/projects/gdb/gnu/usr.bin/gdb/opcodes/Makefile#2 edit Differences ... ==== //depot/projects/gdb/gnu/usr.bin/gdb/bfd/Makefile#3 (text+ko) ==== @@ -15,13 +15,13 @@ merge.c opncls.c reloc.c section.c simple.c srec.c stab-syms.c \ stabs.c syms.c targets.c tekhex.c ${GENSRCS} -.include "${TARGET_ARCH}/Makefile" +.include "${TARGET_SUBDIR}/Makefile" CLEANFILES+= ${GENSRCS} CFLAGS+= -DHAVE_CONFIG_H CFLAGS+= -I. -CFLAGS+= -I${.CURDIR}/${TARGET_ARCH} +CFLAGS+= -I${TARGET_SUBDIR} CFLAGS+= -I${CNTRB_GDB}/bfd CFLAGS+= -I${CNTRB_GDB}/include ==== //depot/projects/gdb/gnu/usr.bin/gdb/gdb/Makefile#8 (text+ko) ==== @@ -44,7 +44,7 @@ ui-file.c ui-out.c user-regs.c utils.c valarith.c valops.c \ valprint.c values.c varobj.c wrapper.c ${GENSRCS} -.include "${TARGET_ARCH}/Makefile" +.include "${TARGET_SUBDIR}/Makefile" CLEANFILES+= ${GENSRCS} ==== //depot/projects/gdb/gnu/usr.bin/gdb/libiberty/Makefile#3 (text+ko) ==== @@ -17,7 +17,7 @@ CFLAGS+= -DHAVE_CONFIG_H CFLAGS+= -I. -CFLAGS+= -I${.CURDIR}/${TARGET_ARCH} +CFLAGS+= -I${TARGET_SIBDIR} CFLAGS+= -I${CNTRB_GDB}/libiberty CFLAGS+= -I${CNTRB_GDB}/include ==== //depot/projects/gdb/gnu/usr.bin/gdb/opcodes/Makefile#2 (text+ko) ==== @@ -10,13 +10,13 @@ GENSRCS= SRCS= dis-buf.c dis-init.c disassemble.c ${GENSRCS} -.include "${TARGET_ARCH}/Makefile" +.include "${TARGET_SUBDIR}/Makefile" CLEANFILES+= ${GENSRCS} CFLAGS+= -DHAVE_CONFIG_H CFLAGS+= -I. -CFLAGS+= -I${.CURDIR}/${TARGET_ARCH} +CFLAGS+= -I${TARGET_SUBDIR} CFLAGS+= -I${.CURDIR}/../bfd/${TARGET_ARCH} CFLAGS+= -I${CNTRB_GDB}/include