diff options
-rw-r--r-- | gnu/usr.bin/cc/Makefile | 4 | ||||
-rw-r--r-- | gnu/usr.bin/cc/Makefile.inc | 4 | ||||
-rw-r--r-- | gnu/usr.bin/cc/c++/Makefile | 8 | ||||
-rw-r--r-- | gnu/usr.bin/cc/c++filt/Makefile | 8 | ||||
-rw-r--r-- | gnu/usr.bin/cc/cc/Makefile | 12 | ||||
-rw-r--r-- | gnu/usr.bin/cc/cc1/Makefile | 8 | ||||
-rw-r--r-- | gnu/usr.bin/cc/cc1obj/Makefile | 10 | ||||
-rw-r--r-- | gnu/usr.bin/cc/cc1plus/Makefile | 16 | ||||
-rw-r--r-- | gnu/usr.bin/cc/cc_drv/Makefile | 5 | ||||
-rw-r--r-- | gnu/usr.bin/cc/cc_int/Makefile | 5 | ||||
-rw-r--r-- | gnu/usr.bin/cc/cc_tools/Makefile | 14 | ||||
-rw-r--r-- | gnu/usr.bin/cc/doc/Makefile | 4 | ||||
-rw-r--r-- | gnu/usr.bin/cc/f77/Makefile | 4 | ||||
-rw-r--r-- | gnu/usr.bin/cc/f771/Makefile | 2 | ||||
-rw-r--r-- | gnu/usr.bin/cc/f77doc/Makefile | 2 |
15 files changed, 44 insertions, 62 deletions
diff --git a/gnu/usr.bin/cc/Makefile b/gnu/usr.bin/cc/Makefile index 79013fb..e88fd23 100644 --- a/gnu/usr.bin/cc/Makefile +++ b/gnu/usr.bin/cc/Makefile @@ -1,6 +1,4 @@ -# -# $Id: Makefile,v 1.13 1999/04/18 09:34:01 obrien Exp $ -# +# $Id: Makefile,v 1.14 1999/04/25 17:09:48 obrien Exp $ # The order of some of these are rather important. Some depend on previous # subdirs. diff --git a/gnu/usr.bin/cc/Makefile.inc b/gnu/usr.bin/cc/Makefile.inc index b8fc6de..88ef219 100644 --- a/gnu/usr.bin/cc/Makefile.inc +++ b/gnu/usr.bin/cc/Makefile.inc @@ -1,6 +1,4 @@ -# -# $Id: Makefile.inc,v 1.35 1999/07/29 09:49:29 obrien Exp $ -# +# $Id: Makefile.inc,v 1.36 1999/08/01 15:44:50 obrien Exp $ .include "../Makefile.inc" diff --git a/gnu/usr.bin/cc/c++/Makefile b/gnu/usr.bin/cc/c++/Makefile index ba11cc2..ac0d082 100644 --- a/gnu/usr.bin/cc/c++/Makefile +++ b/gnu/usr.bin/cc/c++/Makefile @@ -1,13 +1,11 @@ -# -# $Id: Makefile,v 1.10 1999/04/04 16:36:31 obrien Exp $ -# +# $Id: Makefile,v 1.11 1999/04/18 09:39:38 obrien Exp $ .include "../Makefile.inc" .PATH: ${GCCDIR}/cp ${GCCDIR} -PROG = c++ -SRCS = gcc.c g++spec.c +PROG= c++ +SRCS= gcc.c g++spec.c LINKS= ${BINDIR}/c++ ${BINDIR}/g++ LINKS+= ${BINDIR}/c++ ${BINDIR}/CC NOMAN= 1 diff --git a/gnu/usr.bin/cc/c++filt/Makefile b/gnu/usr.bin/cc/c++filt/Makefile index 215d119..ef84835 100644 --- a/gnu/usr.bin/cc/c++filt/Makefile +++ b/gnu/usr.bin/cc/c++filt/Makefile @@ -1,13 +1,11 @@ -# -# $Id: Makefile,v 1.7 1999/08/08 07:30:02 bde Exp $ -# +# $Id: Makefile,v 1.8 1999/08/08 07:31:47 bde Exp $ .include "../Makefile.inc" .PATH: ${GCCDIR} -PROG = c++filt -SRCS = cplus-dem.c getopt.c getopt1.c underscore.c +PROG= c++filt +SRCS= cplus-dem.c getopt.c getopt1.c underscore.c BINDIR= /usr/libexec/${OBJFORMAT} NOMAN= 1 CFLAGS+= -DMAIN -DIN_GCC -DVERSION=\"$(version)\" diff --git a/gnu/usr.bin/cc/cc/Makefile b/gnu/usr.bin/cc/cc/Makefile index ac0dc50..384eca6 100644 --- a/gnu/usr.bin/cc/cc/Makefile +++ b/gnu/usr.bin/cc/cc/Makefile @@ -1,17 +1,15 @@ -# -# $Id: Makefile,v 1.14 1999/04/04 16:36:32 obrien Exp $ -# +# $Id: Makefile,v 1.15 1999/04/18 09:39:37 obrien Exp $ .include "../Makefile.inc" .PATH: ${GCCDIR} -PROG = cc -MAN1 = gcc.1 -SRCS = gcc.c +PROG= cc +MAN1= gcc.1 +SRCS= gcc.c LINKS= ${BINDIR}/cc ${BINDIR}/gcc -MLINKS= gcc.1 cc.1 gcc.1 c++.1 gcc.1 g++.1 gcc.1 CC.1 +MLINKS= gcc.1 cc.1 gcc.1 c++.1 gcc.1 g++.1 gcc.1 CC.1 DPADD+= ${LIBCC_DRV} LDADD+= ${LIBCC_DRV} diff --git a/gnu/usr.bin/cc/cc1/Makefile b/gnu/usr.bin/cc/cc1/Makefile index 091203e..93f7ed6 100644 --- a/gnu/usr.bin/cc/cc1/Makefile +++ b/gnu/usr.bin/cc/cc1/Makefile @@ -1,13 +1,11 @@ -# -# $Id: Makefile,v 1.14 1999/03/05 04:55:03 obrien Exp $ -# +# $Id: Makefile,v 1.13 1999/04/04 16:36:32 obrien Exp $ .include "../Makefile.inc" .PATH: ../cc_tools ${GCCDIR} -PROG = cc1 -SRCS = c-parse.c \ +PROG= cc1 +SRCS= c-parse.c \ c-aux-info.c c-common.c c-convert.c c-decl.c c-iterate.c c-lang.c \ c-lex.c c-pragma.c c-typeck.c BINDIR= /usr/libexec diff --git a/gnu/usr.bin/cc/cc1obj/Makefile b/gnu/usr.bin/cc/cc1obj/Makefile index 71245e8..a9c5e1b 100644 --- a/gnu/usr.bin/cc/cc1obj/Makefile +++ b/gnu/usr.bin/cc/cc1obj/Makefile @@ -1,15 +1,13 @@ -# -# $Id: Makefile,v 1.7 1999/03/05 04:55:03 obrien Exp $ -# +# $Id: Makefile,v 1.6 1999/04/04 16:36:33 obrien Exp $ .include "../Makefile.inc" .PATH: ../cc_tools ${GCCDIR}/objc ${GCCDIR} -PROG = cc1obj -SRCS = objc-parse.c objc-act.c +PROG= cc1obj +SRCS= objc-parse.c objc-act.c # Ugh, compiled twice... -SRCS += c-aux-info.c c-common.c c-convert.c c-decl.c c-iterate.c c-lex.c \ +SRCS+= c-aux-info.c c-common.c c-convert.c c-decl.c c-iterate.c c-lex.c \ c-pragma.c c-typeck.c BINDIR= /usr/libexec NOMAN= 1 diff --git a/gnu/usr.bin/cc/cc1plus/Makefile b/gnu/usr.bin/cc/cc1plus/Makefile index 5589d82..17c4d63 100644 --- a/gnu/usr.bin/cc/cc1plus/Makefile +++ b/gnu/usr.bin/cc/cc1plus/Makefile @@ -1,16 +1,14 @@ -# -# $Id: Makefile,v 1.17 1999/08/01 15:44:51 obrien Exp $ -# +# $Id: Makefile,v 1.18 1999/08/14 22:44:36 obrien Exp $ .include "../Makefile.inc" .PATH: ${GCCDIR}/cp -YACC= bison --broken-undeftoken-init +YACC= bison --broken-undeftoken-init -PROG = cc1plus -SRCS = parse.c parse.h -SRCS += call.c class.c cvt.c decl.c decl2.c errfn.c error.c except.c expr.c \ +PROG= cc1plus +SRCS= parse.c parse.h +SRCS+= call.c class.c cvt.c decl.c decl2.c errfn.c error.c except.c expr.c \ friend.c init.c lex.c method.c pt.c ptree.c repo.c rtti.c \ search.c semantics.c sig.c spew.c tree.c typeck.c typeck2.c xref.c BINDIR= /usr/libexec @@ -31,7 +29,7 @@ CPPHDRS= exception new new.h typeinfo beforeinstall: ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ - ${CPPHDRS:S;^;${GCCDIR}/cp/inc/;} \ - ${DESTDIR}/usr/include/g++ + ${CPPHDRS:S;^;${GCCDIR}/cp/inc/;} \ + ${DESTDIR}/usr/include/g++ .include <bsd.prog.mk> diff --git a/gnu/usr.bin/cc/cc_drv/Makefile b/gnu/usr.bin/cc/cc_drv/Makefile index ed14c0b..8dddbba 100644 --- a/gnu/usr.bin/cc/cc_drv/Makefile +++ b/gnu/usr.bin/cc/cc_drv/Makefile @@ -1,6 +1,5 @@ -# -# $Id: Makefile,v 1.1 1999/04/04 16:36:34 obrien Exp $ -# +# $Id: Makefile,v 1.2 1999/04/04 20:29:43 imp Exp $ + .include "../Makefile.inc" .PATH: ../cc_tools ${GCCDIR} diff --git a/gnu/usr.bin/cc/cc_int/Makefile b/gnu/usr.bin/cc/cc_int/Makefile index 32a6669..938a04d 100644 --- a/gnu/usr.bin/cc/cc_int/Makefile +++ b/gnu/usr.bin/cc/cc_int/Makefile @@ -1,6 +1,5 @@ -# -# $Id: Makefile,v 1.19 1999/04/22 20:12:21 obrien Exp $ -# +# $Id: Makefile,v 1.20 1999/04/25 17:23:28 obrien Exp $ + .include "../Makefile.inc" .PATH: ../cc_tools ${GCCDIR}/config/${GCC_ARCH} ${GCCDIR} diff --git a/gnu/usr.bin/cc/cc_tools/Makefile b/gnu/usr.bin/cc/cc_tools/Makefile index 7666119..e5f8b31 100644 --- a/gnu/usr.bin/cc/cc_tools/Makefile +++ b/gnu/usr.bin/cc/cc_tools/Makefile @@ -1,6 +1,4 @@ -# -# $Id: Makefile,v 1.34 1999/07/28 07:22:06 obrien Exp $ -# +# $Id: Makefile,v 1.35 1999/08/14 22:40:01 obrien Exp $ # # This could probably be merged with ../cc_int/Makefile, but bsd.lib.mk @@ -12,7 +10,7 @@ # ../Makefile.inc will put an absolute path to our objdir in CFLAGS. # Prevent mkdep from using it, so that we don't have to give rules for # aliases of generated headers. -# + CFLAGS+= -I. .include "../Makefile.inc" @@ -78,14 +76,14 @@ GENSRCS+= genrtl.c genrtl.h # C hash codes c-gperf.h: c-parse.gperf gperf -p -j1 -i 1 -g -o -t -G -N is_reserved_word -k1,3,$$ \ - ${GCCDIR}/c-parse.gperf > ${.TARGET} + ${GCCDIR}/c-parse.gperf > ${.TARGET} GENSRCS+= c-gperf.h #----------------------------------------------------------------------- # C++ hash codes hash.h: gxx.gperf gperf -p -j1 -g -o -t -N is_reserved_word '-k1,4,7,$$' \ - ${GCCDIR}/cp/gxx.gperf >hash.h + ${GCCDIR}/cp/gxx.gperf >hash.h GENSRCS+= hash.h #----------------------------------------------------------------------- @@ -155,6 +153,10 @@ tconfig.h: tm.h: echo '#include "${GCC_ARCH}/${GCC_ARCH}.h"' > ${.TARGET} +.if ${GCC_ARCH} == "i386" + echo '#include "${GCC_ARCH}/att.h"' >> ${.TARGET} +.endif + echo '#include "svr4.h"' >> ${.TARGET} echo '#include "${GCC_ARCH}/freebsd.h"' >> ${.TARGET} .if ${GCC_ARCH} == "i386" echo '#include "${GCC_ARCH}/perform.h"' >> ${.TARGET} diff --git a/gnu/usr.bin/cc/doc/Makefile b/gnu/usr.bin/cc/doc/Makefile index 48ecf4b..b3b88b6 100644 --- a/gnu/usr.bin/cc/doc/Makefile +++ b/gnu/usr.bin/cc/doc/Makefile @@ -1,10 +1,10 @@ -# $Id: Makefile,v 1.7 1997/12/17 19:57:35 bde Exp $ +# $Id: Makefile,v 1.8 1999/04/05 07:10:13 obrien Exp $ .include "../Makefile.inc" .PATH: ${GCCDIR}/cp ${GCCDIR} -INFO = gcc cpp gxxint +INFO= gcc cpp gxxint INFOSECTION= "Gcc Documentation" INFOENTRY_gcc= "* gcc: (gcc). The EGCS GNU C compiler." diff --git a/gnu/usr.bin/cc/f77/Makefile b/gnu/usr.bin/cc/f77/Makefile index 54a6f8e..2e5342c 100644 --- a/gnu/usr.bin/cc/f77/Makefile +++ b/gnu/usr.bin/cc/f77/Makefile @@ -1,6 +1,4 @@ -# -# $Id: Makefile,v 1.6 1999/04/18 09:39:37 obrien Exp $ -# +# $Id: Makefile,v 1.7 1999/04/18 09:42:56 obrien Exp $ .include "../Makefile.inc" diff --git a/gnu/usr.bin/cc/f771/Makefile b/gnu/usr.bin/cc/f771/Makefile index 6b6ad78..6218439 100644 --- a/gnu/usr.bin/cc/f771/Makefile +++ b/gnu/usr.bin/cc/f771/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.6 1999/03/05 04:55:03 obrien Exp $ +# $Id: Makefile,v 1.1 1999/04/18 09:33:25 obrien Exp $ .include "${.CURDIR}/../Makefile.inc" diff --git a/gnu/usr.bin/cc/f77doc/Makefile b/gnu/usr.bin/cc/f77doc/Makefile index 09a1f27..30a4a1e 100644 --- a/gnu/usr.bin/cc/f77doc/Makefile +++ b/gnu/usr.bin/cc/f77doc/Makefile @@ -1,4 +1,4 @@ -# $Id$ +# $Id: Makefile,v 1.1 1999/04/25 17:09:48 obrien Exp $ .include "../Makefile.inc" |