summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gnu/lib/libg++/libg++/Makefile9
-rw-r--r--gnu/usr.bin/groff/Makefile.g++9
-rw-r--r--gnu/usr.bin/groff/eqn/Makefile2
-rw-r--r--gnu/usr.bin/groff/groff/Makefile2
-rw-r--r--gnu/usr.bin/groff/grops/Makefile2
-rw-r--r--gnu/usr.bin/groff/grotty/Makefile2
-rw-r--r--gnu/usr.bin/groff/libdriver/Makefile2
-rw-r--r--gnu/usr.bin/groff/libgroff/Makefile2
-rw-r--r--gnu/usr.bin/groff/pic/Makefile2
-rw-r--r--gnu/usr.bin/groff/tbl/Makefile2
-rw-r--r--gnu/usr.bin/groff/troff/Makefile2
11 files changed, 17 insertions, 19 deletions
diff --git a/gnu/lib/libg++/libg++/Makefile b/gnu/lib/libg++/libg++/Makefile
index 231c76abf04..0da5682ecab 100644
--- a/gnu/lib/libg++/libg++/Makefile
+++ b/gnu/lib/libg++/libg++/Makefile
@@ -11,16 +11,15 @@ CFLAGS+=-I$(.CURDIR)/../g++-include
.ifmake (depend)
CFLAGS+=-+
.endif
-GXX= g++
-GXXFLAGS= ${CFLAGS} -felide-constructors
+CXXFLAGS+=-felide-constructors
.cc.o:
- $(GXX) $(GXXFLAGS) -c $(.IMPSRC)
+ $(CXX) $(CXXFLAGS) -c $(.IMPSRC)
@$(LD) -x -r $(.TARGET)
@mv a.out $(.TARGET)
.cc.po:
- $(GXX) -p $(GXXFLAGS) -c $(.IMPSRC) -o $(.TARGET)
+ $(CXX) -p $(CXXFLAGS) -c $(.IMPSRC) -o $(.TARGET)
@$(LD) -X -r $(.TARGET)
@mv a.out $(.TARGET)
@@ -29,7 +28,7 @@ GXXFLAGS= ${CFLAGS} -felide-constructors
#
LIB= g++
-GXXFLAGS+= -I$(.CURDIR)/../g++-include -DHAVE_VPRINTF -DHAVE_VSCANF \
+CXXFLAGS+= -I$(.CURDIR)/../g++-include -DHAVE_VPRINTF -DHAVE_VSCANF \
-DHAVE_SETVBUF -DHAVE_SETLINEBUF -DHAVE_GETPAGESIZE
SRCS= AllocRing.cc Obstack.cc File.cc ostream.cc istream.cc \
streambuf.cc filebuf.cc Filebuf.cc open.cc PlotFile.cc \
diff --git a/gnu/usr.bin/groff/Makefile.g++ b/gnu/usr.bin/groff/Makefile.g++
index fff4fda81ce..869828f7178 100644
--- a/gnu/usr.bin/groff/Makefile.g++
+++ b/gnu/usr.bin/groff/Makefile.g++
@@ -4,20 +4,19 @@
# Define g++ compilation rules.
#
-GXX= g++
-GXXFLAGS= ${CFLAGS} -felide-constructors
+CXXFLAGS+= -felide-constructors
LDXX= /usr/libexec/ld++
# Temporary, to achieve linking
-CC= g++
+CC= ${CXX}
.SUFFIXES: .cc
.cc.o:
- $(GXX) $(GXXFLAGS) -c $(.IMPSRC)
+ $(CXX) $(CXXFLAGS) -c $(.IMPSRC)
.y.o:
$(YACC) $(YFLAGS) $(.IMPSRC)
mv y.tab.c $(.PREFIX).cc
mv y.tab.h $(.PREFIX).tab.h
- $(GXX) $(GXXFLAGS) -c $(.PREFIX).cc
+ $(CXX) $(CXXFLAGS) -c $(.PREFIX).cc
-rm -f $(.PREFIX).cc
diff --git a/gnu/usr.bin/groff/eqn/Makefile b/gnu/usr.bin/groff/eqn/Makefile
index d4add62d9d3..102dab54d49 100644
--- a/gnu/usr.bin/groff/eqn/Makefile
+++ b/gnu/usr.bin/groff/eqn/Makefile
@@ -9,7 +9,7 @@ SRCS= box.cc delim.cc eqn.y lex.cc limit.cc list.cc \
sqrt.cc text.cc
LDADD+= $(.CURDIR)/../libgroff/obj/libgroff.a
# Delete the -Ig++-include after we fix libg++ and install it
-GXXFLAGS+= -I. -I$(.CURDIR) -I$(.CURDIR)/../libgroff \
+CXXFLAGS+= -I. -I$(.CURDIR) -I$(.CURDIR)/../libgroff \
-I$(.CURDIR)/../../../lib/libg++/g++-include
CLEANFILES+= eqn.tab.h
diff --git a/gnu/usr.bin/groff/groff/Makefile b/gnu/usr.bin/groff/groff/Makefile
index cddee8e0530..a237693245e 100644
--- a/gnu/usr.bin/groff/groff/Makefile
+++ b/gnu/usr.bin/groff/groff/Makefile
@@ -6,7 +6,7 @@ PROG= groff
SRCS= groff.cc
LDADD+= $(.CURDIR)/../libgroff/obj/libgroff.a
# Nuke -Ig++-include when we finally install libg++.
-GXXFLAGS+= -I$(.CURDIR)/../libgroff \
+CXXFLAGS+= -I$(.CURDIR)/../libgroff \
-I$(.CURDIR)/../../../lib/libg++/g++-include
afterinstall:
diff --git a/gnu/usr.bin/groff/grops/Makefile b/gnu/usr.bin/groff/grops/Makefile
index 8d92954ee1b..17241f16cce 100644
--- a/gnu/usr.bin/groff/grops/Makefile
+++ b/gnu/usr.bin/groff/grops/Makefile
@@ -7,7 +7,7 @@ SRCS= ps.cc
LDADD+= $(.CURDIR)/../libdriver/obj/libdriver.a \
$(.CURDIR)/../libgroff/obj/libgroff.a -lm
# Nuke -Ig++-include when we finally install libg++.
-GXXFLAGS+= -I$(.CURDIR)/../libdriver -I$(.CURDIR)/../libgroff \
+CXXFLAGS+= -I$(.CURDIR)/../libdriver -I$(.CURDIR)/../libgroff \
-I$(.CURDIR)/../../../lib/libg++/g++-include
afterinstall:
diff --git a/gnu/usr.bin/groff/grotty/Makefile b/gnu/usr.bin/groff/grotty/Makefile
index 7759643abbf..653b3c6ebe6 100644
--- a/gnu/usr.bin/groff/grotty/Makefile
+++ b/gnu/usr.bin/groff/grotty/Makefile
@@ -7,7 +7,7 @@ SRCS= grotty.cc
LDADD+= $(.CURDIR)/../libdriver/obj/libdriver.a \
$(.CURDIR)/../libgroff/obj/libgroff.a -lm
# Nuke -Ig++-include when we finally install libg++.
-GXXFLAGS+= -I$(.CURDIR)/../libdriver -I$(.CURDIR)/../libgroff \
+CXXFLAGS+= -I$(.CURDIR)/../libdriver -I$(.CURDIR)/../libgroff \
-I$(.CURDIR)/../../../lib/libg++/g++-include
afterinstall:
diff --git a/gnu/usr.bin/groff/libdriver/Makefile b/gnu/usr.bin/groff/libdriver/Makefile
index b7d400d1853..ffd62bf4615 100644
--- a/gnu/usr.bin/groff/libdriver/Makefile
+++ b/gnu/usr.bin/groff/libdriver/Makefile
@@ -4,7 +4,7 @@
LIB= driver
SRCS= input.cc printer.cc
-GXXFLAGS+= -I$(.CURDIR) -I$(.CURDIR)/../libgroff \
+CXXFLAGS+= -I$(.CURDIR) -I$(.CURDIR)/../libgroff \
-I$(.CURDIR)/../../../lib/libg++/g++-include
NOMAN= noman
NOPROFILE= noprofile
diff --git a/gnu/usr.bin/groff/libgroff/Makefile b/gnu/usr.bin/groff/libgroff/Makefile
index 0576ccec653..17b6c9d2005 100644
--- a/gnu/usr.bin/groff/libgroff/Makefile
+++ b/gnu/usr.bin/groff/libgroff/Makefile
@@ -9,7 +9,7 @@ SRCS= assert.cc change_lf.cc cmap.cc cset.cc errarg.cc \
iftoa.cc itoa.cc lf.cc lineno.cc nametoindex.cc \
new.cc progname.cc ptable.cc string.cc strsave.cc \
version.cc
-GXXFLAGS+= -I$(.CURDIR) -I$(.CURDIR)/../../../lib/libg++/g++-include \
+CXXFLAGS+= -I$(.CURDIR) -I$(.CURDIR)/../../../lib/libg++/g++-include \
-DFONTPATH=\"$(FONTDIR)\"
NOMAN= noman
NOPROFILE= noprofile
diff --git a/gnu/usr.bin/groff/pic/Makefile b/gnu/usr.bin/groff/pic/Makefile
index 0402fd62b36..03624f9dff7 100644
--- a/gnu/usr.bin/groff/pic/Makefile
+++ b/gnu/usr.bin/groff/pic/Makefile
@@ -8,7 +8,7 @@ SRCS= common.cc main.cc object.cc output.cc \
pic.y key.cc lex.cc tex.cc troff.cc
LDADD+= $(.CURDIR)/../libgroff/obj/libgroff.a -lm
# Delete the -Ig++-include after we fix libg++ and install it
-GXXFLAGS+= -I. -I$(.CURDIR) -I$(.CURDIR)/../libgroff \
+CXXFLAGS+= -I. -I$(.CURDIR) -I$(.CURDIR)/../libgroff \
-I$(.CURDIR)/../../../lib/libg++/g++-include
CLEANFILES+= pic.tab.h
diff --git a/gnu/usr.bin/groff/tbl/Makefile b/gnu/usr.bin/groff/tbl/Makefile
index a32a5d06dcc..8c4f8471110 100644
--- a/gnu/usr.bin/groff/tbl/Makefile
+++ b/gnu/usr.bin/groff/tbl/Makefile
@@ -7,7 +7,7 @@ PROG= tbl
SRCS= main.cc table.cc
LDADD+= $(.CURDIR)/../libgroff/obj/libgroff.a
# Delete the -Ig++-include after we fix libg++ and install it
-GXXFLAGS+= -I$(.CURDIR) -I$(.CURDIR)/../libgroff \
+CXXFLAGS+= -I$(.CURDIR) -I$(.CURDIR)/../libgroff \
-I$(.CURDIR)/../../../lib/libg++/g++-include
.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/troff/Makefile b/gnu/usr.bin/groff/troff/Makefile
index 0b92c9a96fb..45b21cbd8b2 100644
--- a/gnu/usr.bin/groff/troff/Makefile
+++ b/gnu/usr.bin/groff/troff/Makefile
@@ -9,7 +9,7 @@ SRCS= column.cc dictionary.cc div.cc env.cc input.cc \
node.cc number.cc reg.cc symbol.cc
LDADD+= $(.CURDIR)/../libgroff/obj/libgroff.a -lm
# Delete the -Ig++-include after we fix libg++ and install it
-GXXFLAGS+= -I$(.CURDIR) -I$(.CURDIR)/../libgroff \
+CXXFLAGS+= -I$(.CURDIR) -I$(.CURDIR)/../libgroff \
-I$(.CURDIR)/../../../lib/libg++/g++-include \
-DMACROPATH=\"/usr/share/tmac\" -DSTORE_WIDTH \
-DHYPHENFILE=\"$(HYPHENDIR)/hyphen\"