diff options
| author | tv <tv@NetBSD.org> | 1998-04-03 02:20:28 +0000 |
|---|---|---|
| committer | tv <tv@NetBSD.org> | 1998-04-03 02:20:28 +0000 |
| commit | de3cddeaa77f76f499b5bddaa04edfc8ecbbfc46 (patch) | |
| tree | 2175653bcbf56453740654be43861193a7732aac | |
| parent | 3d26c2dbf1738864f805f5d6134cfb26ddfa6a92 (diff) | |
- make f771 work with CC1_SHLIB: move files that aren't actually "common"
and referencing externs in non-common code to the appropriate modules
- add -DLANG_SPECIFIC_DRIVER for g++ and g77 as required by a "GNU build"
- Cleanup: $() -> ${}
| -rw-r--r-- | gnu/usr.bin/egcs/Makefile.cc1 | 6 | ||||
| -rw-r--r-- | gnu/usr.bin/egcs/Makefile.inc | 34 | ||||
| -rw-r--r-- | gnu/usr.bin/egcs/cc/Makefile | 4 | ||||
| -rw-r--r-- | gnu/usr.bin/egcs/cc1/Makefile | 4 | ||||
| -rw-r--r-- | gnu/usr.bin/egcs/cc1obj/Makefile | 8 | ||||
| -rw-r--r-- | gnu/usr.bin/egcs/cc1plus/Makefile | 10 | ||||
| -rw-r--r-- | gnu/usr.bin/egcs/common/Makefile | 106 | ||||
| -rw-r--r-- | gnu/usr.bin/egcs/cpp/Makefile | 6 | ||||
| -rw-r--r-- | gnu/usr.bin/egcs/f771/Makefile | 30 | ||||
| -rw-r--r-- | gnu/usr.bin/egcs/g++/Makefile | 10 | ||||
| -rw-r--r-- | gnu/usr.bin/egcs/g77/Makefile | 8 | ||||
| -rw-r--r-- | gnu/usr.bin/egcs/libgcc/Makefile | 6 | ||||
| -rw-r--r-- | gnu/usr.bin/egcs/libobjc/Makefile | 4 |
13 files changed, 118 insertions, 118 deletions
diff --git a/gnu/usr.bin/egcs/Makefile.cc1 b/gnu/usr.bin/egcs/Makefile.cc1 index 182afc82ab4..1b36e773862 100644 --- a/gnu/usr.bin/egcs/Makefile.cc1 +++ b/gnu/usr.bin/egcs/Makefile.cc1 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.cc1,v 1.2 1998/04/01 21:51:26 mrg Exp $ +# $NetBSD: Makefile.cc1,v 1.3 1998/04/03 02:20:28 tv Exp $ NOMAN= @@ -6,7 +6,7 @@ BINDIR= /usr/libexec YFLAGS= -LDADD+= -L$(COMMONOBJ) -lcc1 -DPADD+= $(COMMONOBJ)/libcc1.a +LDADD+= -L${COMMONOBJ} -lcc1 +DPADD+= ${COMMONOBJ}/libcc1.a .include <bsd.prog.mk> diff --git a/gnu/usr.bin/egcs/Makefile.inc b/gnu/usr.bin/egcs/Makefile.inc index bca08c67c05..b848008e91c 100644 --- a/gnu/usr.bin/egcs/Makefile.inc +++ b/gnu/usr.bin/egcs/Makefile.inc @@ -1,37 +1,37 @@ -# $NetBSD: Makefile.inc,v 1.3 1998/04/02 06:33:31 mrg Exp $ +# $NetBSD: Makefile.inc,v 1.4 1998/04/03 02:20:29 tv Exp $ .if !defined(GCC_MAKEFILE_INC) GCC_MAKEFILE_INC=1 -DIST= $(.CURDIR)/../../../dist/gcc -COMMON= $(.CURDIR)/../common -COMMONOBJ!=cd $(.CURDIR)/../common; \ +DIST= ${.CURDIR}/../../../dist/gcc +COMMON= ${.CURDIR}/../common +COMMONOBJ!=cd ${.CURDIR}/../common; \ printf "xxx: .MAKE\n\t@echo \$${.OBJDIR}\n" | ${MAKE} -s -f- -CPPFLAGS+=-I$(.CURDIR) \ - -I$(COMMON) \ - -I$(COMMONOBJ) \ - -I$(.CURDIR)/../arch \ - -I$(.CURDIR)/../arch/$(MACHINE_ARCH) \ - -I$(DIST) \ - -I$(DIST)/config \ - -I$(DIST)/config/$(MACHINE_ARCH) \ +CPPFLAGS+=-I${.CURDIR} \ + -I${COMMON} \ + -I${COMMONOBJ} \ + -I${.CURDIR}/../arch \ + -I${.CURDIR}/../arch/${MACHINE_ARCH} \ + -I${DIST} \ + -I${DIST}/config \ + -I${DIST}/config/${MACHINE_ARCH} \ -DMD_EXEC_PREFIX=\"/usr/libexec/\" \ -DMD_STARTFILE_PREFIX=\"/usr/lib/\" \ -DIN_GCC -DNETBSD_NATIVE LDADD+= -lgnumalloc -DPADD+= $(LIBGNUMALLOC) +DPADD+= ${LIBGNUMALLOC} -.PATH: $(DIST) $(DIST)/config $(DIST)/config/$(MACHINE_ARCH) \ - $(COMMON) $(COMMONOBJ) +.PATH: ${DIST} ${DIST}/config ${DIST}/config/${MACHINE_ARCH} \ + ${COMMON} ${COMMONOBJ} # XXX version=egcs-2.90.27 target_alias=${MACHINE_ARCH}-netbsd CPPFLAGS+= \ - -DDEFAULT_TARGET_VERSION=\"$(version)\" \ - -DDEFAULT_TARGET_MACHINE=\"$(target_alias)\" \ + -DDEFAULT_TARGET_VERSION=\"${version}\" \ + -DDEFAULT_TARGET_MACHINE=\"${target_alias}\" \ # XXX .endif diff --git a/gnu/usr.bin/egcs/cc/Makefile b/gnu/usr.bin/egcs/cc/Makefile index d81a038d715..9e3543e79a6 100644 --- a/gnu/usr.bin/egcs/cc/Makefile +++ b/gnu/usr.bin/egcs/cc/Makefile @@ -1,5 +1,5 @@ -# from: @(#)Makefile 6.2 (Berkeley) 3/25/91 -# $NetBSD: Makefile,v 1.2 1998/03/30 04:15:36 mrg Exp $ +# from: @{#}Makefile 6.2 (Berkeley) 3/25/91 +# $NetBSD: Makefile,v 1.3 1998/04/03 02:20:29 tv Exp $ PROG= gcc SRCS= gcc.c obstack.c version.c pexecute.c choose-temp.c diff --git a/gnu/usr.bin/egcs/cc1/Makefile b/gnu/usr.bin/egcs/cc1/Makefile index cf7aa463726..220e848acfa 100644 --- a/gnu/usr.bin/egcs/cc1/Makefile +++ b/gnu/usr.bin/egcs/cc1/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.2 1998/04/02 06:39:51 mrg Exp $ +# $NetBSD: Makefile,v 1.3 1998/04/03 02:20:29 tv Exp $ PROG= cc1 -SRCS= c-parse.y +SRCS= c-common.c c-decl.c c-lang.c c-lex.c c-parse.y c-typeck.c .include "../Makefile.cc1" diff --git a/gnu/usr.bin/egcs/cc1obj/Makefile b/gnu/usr.bin/egcs/cc1obj/Makefile index 74e50cfa149..32b7eead232 100644 --- a/gnu/usr.bin/egcs/cc1obj/Makefile +++ b/gnu/usr.bin/egcs/cc1obj/Makefile @@ -1,12 +1,12 @@ -# $NetBSD: Makefile,v 1.4 1998/04/02 06:39:52 mrg Exp $ +# $NetBSD: Makefile,v 1.5 1998/04/03 02:20:29 tv Exp $ PROG= cc1obj -SRCS= objc-parse.y objc-act.c +SRCS= c-common.c c-decl.c c-lex.c c-typeck.c objc-parse.y objc-act.c # XXX needs to be before dist/gcc or tree.c comes from the # wrong place.. -.PATH: $(.CURDIR)/../../../dist/gcc/objc +.PATH: ${.CURDIR}/../../../dist/gcc/objc .include "../Makefile.cc1" -CPPFLAGS+= -I$(DIST)/objc +CPPFLAGS+= -I${DIST}/objc diff --git a/gnu/usr.bin/egcs/cc1plus/Makefile b/gnu/usr.bin/egcs/cc1plus/Makefile index b85082c997b..0ac0c76ffe2 100644 --- a/gnu/usr.bin/egcs/cc1plus/Makefile +++ b/gnu/usr.bin/egcs/cc1plus/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.3 1998/04/01 21:13:24 tv Exp $ +# $NetBSD: Makefile,v 1.4 1998/04/03 02:20:29 tv Exp $ PROG= cc1plus -SRCS= call.c class.c cvt.c decl.c decl2.c errfn.c error.c except.c \ +SRCS= c-common.c 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 parse.c pt.c ptree.c \ repo.c rtti.c search.c sig.c spew.c tree.c typeck.c typeck2.c \ xref.c @@ -13,15 +13,15 @@ CLEANFILES+= parse.c parse.h parse.h: parse.c parse.c: parse.y - $(YACC) -d $(.IMPSRC) + ${YACC} -d ${.IMPSRC} grep '^#define[ ]*YYEMPTY' y.tab.c >>y.tab.h mv -f y.tab.c parse.c mv -f y.tab.h parse.h # XXX needs to be before dist/gcc or tree.c comes from the # wrong place.. -.PATH: $(.CURDIR)/../../../dist/gcc/cp +.PATH: ${.CURDIR}/../../../dist/gcc/cp .include "../Makefile.cc1" -CPPFLAGS+= -I. -I$(DIST)/cp +CPPFLAGS+= -I. -I${DIST}/cp diff --git a/gnu/usr.bin/egcs/common/Makefile b/gnu/usr.bin/egcs/common/Makefile index 30f8eea5515..f70f0da2e3e 100644 --- a/gnu/usr.bin/egcs/common/Makefile +++ b/gnu/usr.bin/egcs/common/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 1998/04/02 03:33:31 tv Exp $ +# $NetBSD: Makefile,v 1.5 1998/04/03 02:20:29 tv Exp $ .include "../Makefile.inc" @@ -13,18 +13,18 @@ CPICFLAGS=-fPIC -DPIC NOPIC= .endif -MD= $(DIST)/config/$(MACHINE_ARCH)/$(MACHINE_ARCH).md +MD= ${DIST}/config/${MACHINE_ARCH}/${MACHINE_ARCH}.md -BCDEF= $(DIST)/bytecode.def -CPPFLAGS+= -DTARGET_NAME=\"$(target_alias)\" +BCDEF= ${DIST}/bytecode.def +CPPFLAGS+= -DTARGET_NAME=\"${target_alias}\" -.PATH: $(DIST) +.PATH: ${DIST} SRCS= \ - $(MACHINE_ARCH).c alias.c bc-arity.h bc-emit.c bc-opcode.h \ - bc-opname.h bc-optab.c bitmap.c c-aux-info.c c-common.c \ - c-convert.c c-decl.c c-iterate.c c-lang.c c-lex.c c-parse.h c-pragma.c \ - c-typeck.c caller-save.c calls.c combine.c convert.c cse.c dbxout.c \ + ${MACHINE_ARCH}.c alias.c bc-arity.h bc-emit.c bc-opcode.h \ + bc-opname.h bc-optab.c bitmap.c c-aux-info.c \ + c-convert.c c-iterate.c c-parse.h c-pragma.c \ + caller-save.c calls.c combine.c convert.c cse.c dbxout.c \ dwarf2out.c dwarfout.c emit-rtl.c explow.c expmed.c expr.c except.c \ final.c flow.c fold-const.c function.c getpwd.c global.c insn-attr.h \ insn-attrtab.c insn-codes.h insn-config.h insn-emit.c insn-extract.c \ @@ -36,133 +36,133 @@ SRCS= \ sdbout.c stmt.c stor-layout.c stupid.c toplev.c tree.c unroll.c \ varasm.c version.c xcoffout.c -insn-attr.h: genattr $(MD) - ./genattr $(MD) > insn-attr.h +insn-attr.h: genattr ${MD} + ./genattr ${MD} > insn-attr.h CLEANFILES += insn-attr.h genattr genattr.o -insn-flags.h: genflags $(MD) - ./genflags $(MD) > insn-flags.h +insn-flags.h: genflags ${MD} + ./genflags ${MD} > insn-flags.h CLEANFILES += insn-flags.h genflags genflags.o -insn-codes.h: gencodes $(MD) - ./gencodes $(MD) > insn-codes.h +insn-codes.h: gencodes ${MD} + ./gencodes ${MD} > insn-codes.h CLEANFILES += insn-codes.h gencodes gencodes.o -insn-config.h: genconfig $(MD) - ./genconfig $(MD) > insn-config.h +insn-config.h: genconfig ${MD} + ./genconfig ${MD} > insn-config.h CLEANFILES += insn-config.h genconfig genconfig.o -bc-opcode.h: bi-opcode $(BCDEF) - ./bi-opcode < $(BCDEF) > bc-opcode.h +bc-opcode.h: bi-opcode ${BCDEF} + ./bi-opcode < ${BCDEF} > bc-opcode.h CLEANFILES += bc-opcode.h bi-opcode bi-opcode.o -bc-opname.h: bi-opname $(BCDEF) - ./bi-opname < $(BCDEF) > bc-opname.h +bc-opname.h: bi-opname ${BCDEF} + ./bi-opname < ${BCDEF} > bc-opname.h CLEANFILES += bc-opname.h bi-opname bi-opname.o -bc-arity.h: bi-arity $(BCDEF) - ./bi-arity < $(BCDEF) > bc-arity.h +bc-arity.h: bi-arity ${BCDEF} + ./bi-arity < ${BCDEF} > bc-arity.h CLEANFILES += bc-arity.h bi-arity bi-arity.o -insn-peep.c: genpeep $(MD) - ./genpeep $(MD) > insn-peep.c +insn-peep.c: genpeep ${MD} + ./genpeep ${MD} > insn-peep.c CLEANFILES += insn-peep.c genpeep genpeep.o -insn-opinit.c: genopinit $(MD) - ./genopinit $(MD) > insn-opinit.c +insn-opinit.c: genopinit ${MD} + ./genopinit ${MD} > insn-opinit.c CLEANFILES += insn-opinit.c genopinit genopinit.o -insn-recog.c: genrecog $(MD) - ./genrecog $(MD) > insn-recog.c +insn-recog.c: genrecog ${MD} + ./genrecog ${MD} > insn-recog.c CLEANFILES += insn-recog.c genrecog genrecog.o -insn-extract.c: genextract $(MD) - ./genextract $(MD) > insn-extract.c +insn-extract.c: genextract ${MD} + ./genextract ${MD} > insn-extract.c CLEANFILES += insn-extract.c genextract genextract.o -insn-output.c: genoutput $(MD) - ./genoutput $(MD) > insn-output.c +insn-output.c: genoutput ${MD} + ./genoutput ${MD} > insn-output.c CLEANFILES += insn-output.c genoutput genoutput.o -insn-emit.c: genemit $(MD) - ./genemit $(MD) > insn-emit.c +insn-emit.c: genemit ${MD} + ./genemit ${MD} > insn-emit.c CLEANFILES += insn-emit.c genemit genemit.o -insn-attrtab.c: genattrtab $(MD) - ./genattrtab $(MD) > insn-attrtab.c +insn-attrtab.c: genattrtab ${MD} + ./genattrtab ${MD} > insn-attrtab.c CLEANFILES += insn-attrtab.c genattrtab genattrtab.o genattr.o: genattr.c genattr: genattr.o rtl.o obstack.o - $(CC) -o genattr genattr.o rtl.o obstack.o + ${CC} -o genattr genattr.o rtl.o obstack.o genflags.o: genflags.c genflags: genflags.o rtl.o obstack.o - $(CC) -o genflags genflags.o rtl.o obstack.o + ${CC} -o genflags genflags.o rtl.o obstack.o gencodes.o: gencodes.c gencodes: gencodes.o rtl.o obstack.o - $(CC) -o gencodes gencodes.o rtl.o obstack.o + ${CC} -o gencodes gencodes.o rtl.o obstack.o genconfig.o: genconfig.c genconfig: genconfig.o rtl.o obstack.o - $(CC) -o genconfig genconfig.o rtl.o obstack.o + ${CC} -o genconfig genconfig.o rtl.o obstack.o genpeep.o: genpeep.c genpeep: genpeep.o rtl.o obstack.o - $(CC) -o genpeep genpeep.o rtl.o obstack.o + ${CC} -o genpeep genpeep.o rtl.o obstack.o genopinit.o: genopinit.c genopinit: genopinit.o rtl.o obstack.o - $(CC) -o genopinit genopinit.o rtl.o obstack.o + ${CC} -o genopinit genopinit.o rtl.o obstack.o genrecog.o: genrecog.c genrecog: genrecog.o rtl.o obstack.o - $(CC) -o genrecog genrecog.o rtl.o obstack.o + ${CC} -o genrecog genrecog.o rtl.o obstack.o genextract.o: genextract.c genextract: genextract.o rtl.o obstack.o - $(CC) -o genextract genextract.o rtl.o obstack.o + ${CC} -o genextract genextract.o rtl.o obstack.o genoutput.o: genoutput.c genoutput: genoutput.o rtl.o obstack.o - $(CC) -o genoutput genoutput.o rtl.o obstack.o + ${CC} -o genoutput genoutput.o rtl.o obstack.o genemit.o: genemit.c genemit: genemit.o rtl.o obstack.o - $(CC) -o genemit genemit.o rtl.o obstack.o + ${CC} -o genemit genemit.o rtl.o obstack.o genattrtab.o: genattrtab.c insn-config.h genattrtab: genattrtab.o rtl.o obstack.o print-rtl.o rtlanal.o - $(CC) -o genattrtab genattrtab.o rtl.o obstack.o print-rtl.o rtlanal.o + ${CC} -o genattrtab genattrtab.o rtl.o obstack.o print-rtl.o rtlanal.o bi-opcode.o: bi-opcode.c bi-opcode: bi-opcode.o bi-parser.o bi-lexer.o bi-reverse.o obstack.o - $(CC) -o bi-opcode bi-opcode.o bi-parser.o bi-lexer.o bi-reverse.o obstack.o + ${CC} -o bi-opcode bi-opcode.o bi-parser.o bi-lexer.o bi-reverse.o obstack.o CLEANFILES+= bi-reverse.o bi-opname.o: bi-opname.c bi-opname: bi-opname.o bi-parser.o bi-lexer.o bi-reverse.o obstack.o - $(CC) -o bi-opname bi-opname.o bi-parser.o bi-lexer.o bi-reverse.o obstack.o + ${CC} -o bi-opname bi-opname.o bi-parser.o bi-lexer.o bi-reverse.o obstack.o bi-arity.o: bi-arity.c bi-arity: bi-arity.o bi-parser.o bi-lexer.o bi-reverse.o obstack.o - $(CC) -o bi-arity bi-arity.o bi-parser.o bi-lexer.o bi-reverse.o obstack.o + ${CC} -o bi-arity bi-arity.o bi-parser.o bi-lexer.o bi-reverse.o obstack.o CLEANFILES += bi-lexer.o bi-parser.o bi-parser.c bi-parser.h @@ -170,7 +170,7 @@ bi-lexer.o: bi-parser.h bi-parser.h: bi-parser.c bi-parser.c: bi-parser.y - $(YACC) -b bi -d $(.IMPSRC) + ${YACC} -b bi -d ${.IMPSRC} mv -f bi.tab.c bi-parser.c mv -f bi.tab.h bi-parser.h @@ -180,7 +180,7 @@ c-lex.o: c-parse.h c-parse.h: c-parse.c c-parse.c: c-parse.y - $(YACC) -b c -d $(.IMPSRC) + ${YACC} -b c -d ${.IMPSRC} mv -f c.tab.c c-parse.c mv -f c.tab.h c-parse.h diff --git a/gnu/usr.bin/egcs/cpp/Makefile b/gnu/usr.bin/egcs/cpp/Makefile index 83defc79e57..536e4afc2a5 100644 --- a/gnu/usr.bin/egcs/cpp/Makefile +++ b/gnu/usr.bin/egcs/cpp/Makefile @@ -1,5 +1,5 @@ -# from: @(#)Makefile 6.4 (Berkeley) 2/21/91 -# $NetBSD: Makefile,v 1.5 1998/04/02 06:45:53 mrg Exp $ +# from: @{#}Makefile 6.4 (Berkeley) 2/21/91 +# $NetBSD: Makefile,v 1.6 1998/04/03 02:20:30 tv Exp $ PROG= cpp BINDIR= /usr/libexec @@ -18,6 +18,6 @@ FILESMODE=${BINMODE} MAN= cccp.1 MLINKS= cccp.1 cpp.1 cccp.1 gcpp.1 -.PATH: $(.OBJDIR) +.PATH: ${.OBJDIR} .include <bsd.prog.mk> diff --git a/gnu/usr.bin/egcs/f771/Makefile b/gnu/usr.bin/egcs/f771/Makefile index 3eea8bfc20c..d9971cb33df 100644 --- a/gnu/usr.bin/egcs/f771/Makefile +++ b/gnu/usr.bin/egcs/f771/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 1998/03/31 05:04:18 mrg Exp $ +# $NetBSD: Makefile,v 1.3 1998/04/03 02:20:30 tv Exp $ PROG= f771 SRCS= bad.c bit.c bld.c com.c data.c equiv.c expr.c global.c implic.c \ @@ -8,24 +8,24 @@ SRCS= bad.c bit.c bld.c com.c data.c equiv.c expr.c global.c implic.c \ FINIFILES=str-1t.j str-1t.h str-2t.j str-2t.h str-fo.j str-fo.h str-io.j \ str-io.h str-nq.j str-nq.h str-op.j str-op.h str-ot.j str-ot.h -F= $(.CURDIR)/../../../dist/gcc/f +F= ${.CURDIR}/../../../dist/gcc/f -$(FINIFILES): fini - ./fini $(F)/str-1t.fin str-1t.j str-1t.h - ./fini $(F)/str-2t.fin str-2t.j str-2t.h - ./fini $(F)/str-fo.fin str-fo.j str-fo.h - ./fini $(F)/str-io.fin str-io.j str-io.h - ./fini $(F)/str-nq.fin str-nq.j str-nq.h - ./fini $(F)/str-op.fin str-op.j str-op.h - ./fini $(F)/str-ot.fin str-ot.j str-ot.h +${FINIFILES}: fini + ./fini ${F}/str-1t.fin str-1t.j str-1t.h + ./fini ${F}/str-2t.fin str-2t.j str-2t.h + ./fini ${F}/str-fo.fin str-fo.j str-fo.h + ./fini ${F}/str-io.fin str-io.j str-io.h + ./fini ${F}/str-nq.fin str-nq.j str-nq.h + ./fini ${F}/str-op.fin str-op.j str-op.h + ./fini ${F}/str-ot.fin str-ot.j str-ot.h fini: fini.o proj.o - $(CC) -o fini fini.o proj.o + ${CC} -o fini fini.o proj.o -st.c sta.c stb.c stc.c std.c ste.c stt.c stu.c stw.c: $(FINIFILES) +st.c sta.c stb.c stc.c std.c ste.c stt.c stu.c stw.c: ${FINIFILES} -CPPFLAGS+= -I$(F) -I. -CLEANFILES+= $(FINIFILES) fini fini.o -.PATH: $(F) +CPPFLAGS+= -I${F} -I. +CLEANFILES+= ${FINIFILES} fini fini.o +.PATH: ${F} .include "../Makefile.cc1" diff --git a/gnu/usr.bin/egcs/g++/Makefile b/gnu/usr.bin/egcs/g++/Makefile index d3162898b60..4fcd6152329 100644 --- a/gnu/usr.bin/egcs/g++/Makefile +++ b/gnu/usr.bin/egcs/g++/Makefile @@ -1,10 +1,10 @@ -# from: @(#)Makefile 6.2 (Berkeley) 3/25/91 -# $NetBSD: Makefile,v 1.2 1998/03/30 04:15:36 mrg Exp $ +# from: @{#}Makefile 6.2 (Berkeley) 3/25/91 +# $NetBSD: Makefile,v 1.3 1998/04/03 02:20:30 tv Exp $ PROG= g++ SRCS= gcc.c obstack.c version.c g++spec.c choose-temp.c pexecute.c BINDIR= /usr/bin -CPPFLAGS+= -DGCC_NAME=\"/usr/bin/cc\" +CPPFLAGS+= -DGCC_NAME=\"/usr/bin/cc\" -DLANG_SPECIFIC_DRIVER LINKS+= ${BINDIR}/g++ ${BINDIR}/c++ @@ -13,5 +13,5 @@ MLINKS= g++.1 c++.1 .include <bsd.prog.mk> -.PATH: $(DIST)/cp -CPPFLAGS+= -I$(DIST)/cp +.PATH: ${DIST}/cp +CPPFLAGS+= -I${DIST}/cp diff --git a/gnu/usr.bin/egcs/g77/Makefile b/gnu/usr.bin/egcs/g77/Makefile index f9e92c106eb..042862a483e 100644 --- a/gnu/usr.bin/egcs/g77/Makefile +++ b/gnu/usr.bin/egcs/g77/Makefile @@ -1,5 +1,5 @@ -# from: @(#)Makefile 6.2 (Berkeley) 3/25/91 -# $NetBSD: Makefile,v 1.3 1998/04/02 01:11:06 tv Exp $ +# from: @{#}Makefile 6.2 (Berkeley) 3/25/91 +# $NetBSD: Makefile,v 1.4 1998/04/03 02:20:30 tv Exp $ PROG= g77 SRCS= gcc.c g77spec.c version.c choose-temp.c pexecute.c obstack.c @@ -12,5 +12,5 @@ MLINKS= g77.1 f77.1 .include <bsd.prog.mk> -.PATH: $(DIST)/f $(DIST) -CPPFLAGS+= -I$(DIST)/f -I$(DIST) +.PATH: ${DIST}/f ${DIST} +CPPFLAGS+= -I${DIST}/f -I${DIST} -DLANG_SPECIFIC_DRIVER diff --git a/gnu/usr.bin/egcs/libgcc/Makefile b/gnu/usr.bin/egcs/libgcc/Makefile index c0619ffb379..3624c77a2b6 100644 --- a/gnu/usr.bin/egcs/libgcc/Makefile +++ b/gnu/usr.bin/egcs/libgcc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 1998/04/02 06:38:12 mrg Exp $ +# $NetBSD: Makefile,v 1.6 1998/04/03 02:20:30 tv Exp $ .PATH: ${.CURDIR}/../../../dist/gcc/cp ${.CURDIR}/../../../dist/gcc/cp/inc LIB= gcc @@ -24,12 +24,12 @@ LIB2OBJS+=__gcc_bcmp.o _varargs.o _eprintf.o _op_new.o _new_handler.o \ _op_delete.o _bb.o _shtab.o _clear_cache.o _trampoline.o __main.o \ _exit.o _ctors.o _op_vdel.o _op_vnew.o _pure.o __dummy.o -HAVE_GCC28!= $(CXX) --version | egrep "^(2\.8|egcs)" ; echo +HAVE_GCC28!= ${CXX} --version | egrep "^(2\.8|egcs)" ; echo # Extra code to include in libgcc2 for C++ support. .if !defined(EGCS_BOOTSTRAP) && ${HAVE_GCC28} != "" SRCS+= tinfo.cc tinfo2.cc new.cc new1.cc new2.cc exception.cc -CXXFLAGS+= -I$(DIST)/cp/inc +CXXFLAGS+= -I${DIST}/cp/inc LIB2OBJS+= _eh.o INCS= exception new new.h typeinfo INCSDIR= /usr/include/g++ diff --git a/gnu/usr.bin/egcs/libobjc/Makefile b/gnu/usr.bin/egcs/libobjc/Makefile index 916e92a8916..e7fef1e96f7 100644 --- a/gnu/usr.bin/egcs/libobjc/Makefile +++ b/gnu/usr.bin/egcs/libobjc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 1998/03/29 11:34:24 mrg Exp $ +# $NetBSD: Makefile,v 1.2 1998/04/03 02:20:31 tv Exp $ LIB= objc INCSDIR=/usr/include/objc @@ -14,4 +14,4 @@ SRCS= NXConstStr.m Object.m Protocol.m archive.c class.c \ .include <bsd.lib.mk> -.PATH: $(DIST)/objc +.PATH: ${DIST}/objc |
