diff options
| author | mycroft <mycroft@NetBSD.org> | 1993-07-17 13:43:50 +0000 |
|---|---|---|
| committer | mycroft <mycroft@NetBSD.org> | 1993-07-17 13:43:50 +0000 |
| commit | 8d7d3883e32b163b68c38dd3e6cb0de9a0a9c9c5 (patch) | |
| tree | c0742ec65b5f2b541a7ba0a2e1b70995f03c8ba9 /gnu | |
| parent | 0032cf1c20de5221dccfcabf1385d8970052cf0c (diff) | |
Fix C++ dependencies for good. `make depend' is now done in two passes--one
of C files and one for C++ files. No need to specify `-+' in your Makefile,
as it is now done automatically.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/lib/libg++/libg++/Makefile | 10 | ||||
| -rw-r--r-- | gnu/usr.bin/groff/Makefile.cfg | 3 |
2 files changed, 3 insertions, 10 deletions
diff --git a/gnu/lib/libg++/libg++/Makefile b/gnu/lib/libg++/libg++/Makefile index f687679f4d3..069796f8813 100644 --- a/gnu/lib/libg++/libg++/Makefile +++ b/gnu/lib/libg++/libg++/Makefile @@ -15,13 +15,9 @@ SRCS= AllocRing.cc Obstack.cc builtin.cc \ sbufvscan.C stdiostream.C floatconv.C outfloat.C iomanip.C \ insque.c strerror.c -# Use C++ compiler for everything. -CC= ${CXX} -.if target(depend) -CFLAGS+= -+ -.endif -CFLAGS+= -nostdinc++ -I$(.CURDIR) -I$(.CURDIR)/../g++-include \ - -I$(.CURDIR)/../iostream -I$(.CURDIR)/../libiberty +CXXFLAGS+= -nostdinc++ -I$(.CURDIR)/../g++-include \ + -I$(.CURDIR)/../iostream +CFLAGS+= -I$(.CURDIR) -I$(.CURDIR)/../libiberty NOMAN= noman .PATH: $(.CURDIR)/../iostream $(.CURDIR)/../libiberty diff --git a/gnu/usr.bin/groff/Makefile.cfg b/gnu/usr.bin/groff/Makefile.cfg index bd4939b6136..ee4efb84640 100644 --- a/gnu/usr.bin/groff/Makefile.cfg +++ b/gnu/usr.bin/groff/Makefile.cfg @@ -17,9 +17,6 @@ LIBBIB= $(.CURDIR)/../libbib/obj/libbib.a LIBBIB= $(.CURDIR)/../libbib/libbib.a .endif -.if make(depend) -CFLAGS+= -+ -.endif CFLAGS+= -DHAVE_UNISTD_H=1\ -DHAVE_DIRENT_H=1\ -DHAVE_LIMITS_H=1\ |
