commit 3c83fe199bbc4c8ed7f5546e488f18ee2d251306
parent 03b5a252234261dafdc895d684cb533f11492fb6
Author: Kyle Milz <milz@imac.0x30.net>
Date: Thu, 4 Mar 2021 12:08:37 -0800
make: Makefile.inc is included by bsd.prog.mk
Diffstat:
8 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/Makefile.in b/Makefile.inc
diff --git a/bin/Makefile b/bin/Makefile
@@ -13,5 +13,4 @@ citrun_report: report.awk
chmod +x $@
-.include "../Makefile.in"
.include <bsd.prog.mk>
diff --git a/gl/Makefile b/gl/Makefile
@@ -37,5 +37,4 @@ CXXFLAGS += $(CXXFLAGS_PC)
LDADD !!= pkg-config --libs ${PKGS}
-.include "../Makefile.in"
.include <bsd.prog.mk>
diff --git a/include/Makefile b/include/Makefile
@@ -9,4 +9,4 @@ clean:
rm -f citrun_h.h
-.include "../Makefile.in"
+.include "../Makefile.inc"
diff --git a/inst/Makefile b/inst/Makefile
@@ -35,8 +35,5 @@ SRCS = main.cc \
action.cc \
visitor.cc
-#depend:
-# ${CXX} ${CPPFLAGS} ${CXXFLAGS} -E -M ${SRCS} ${C_SRCS} > .depend
-.include "../Makefile.in"
.include <bsd.prog.mk>
diff --git a/lib/Makefile b/lib/Makefile
@@ -1,7 +1,8 @@
CFLAGS += -ansi -fPIC
-LIB = citrun
-SRCS = unix.c citrun.c
+
+LIB = citrun
+SRCS += unix.c
+SRCS += citrun.c
-.include "../Makefile.in"
.include <bsd.lib.mk>
diff --git a/share/Makefile b/share/Makefile
@@ -6,4 +6,4 @@ ${COMPILERS}: ../inst/citrun_inst
ln -s citrun_inst $@
-.include "../Makefile.in"
+.include "../Makefile.inc"
diff --git a/term/Makefile b/term/Makefile
@@ -2,5 +2,5 @@ PROG= citrun_term
SRCS= term.cc
CPPFLAGS+= -I../gl
-.include "../Makefile.in"
+
.include <bsd.prog.mk>