summaryrefslogtreecommitdiff
path: root/examples/tools
diff options
context:
space:
mode:
Diffstat (limited to 'examples/tools')
-rw-r--r--examples/tools/Makefile8
-rw-r--r--examples/tools/expect.out31
-rw-r--r--examples/tools/libs/bar/linkme.mk5
-rw-r--r--examples/tools/libs/foo/linkme.mk5
-rw-r--r--examples/tools/libs/qux/linkme.mk5
-rw-r--r--examples/tools/tools/prog1/Makefile1
-rw-r--r--examples/tools/tools/prog2/Makefile1
-rw-r--r--examples/tools/tools/prog3/Makefile3
-rw-r--r--examples/tools/tools/prog4/Makefile1
9 files changed, 5 insertions, 55 deletions
diff --git a/examples/tools/Makefile b/examples/tools/Makefile
index 5077390..6d59113 100644
--- a/examples/tools/Makefile
+++ b/examples/tools/Makefile
@@ -1,7 +1,7 @@
-SUBPRJ = libs/foo:tools/prog1
-SUBPRJ += libs/bar:tools/prog2
-SUBPRJ += libs/foo:tools/prog3 libs/bar:tools/prog3
-SUBPRJ += libs/qux:tools/prog4
+LIBDEPS = libs/foo:tools/prog1
+LIBDEPS += libs/bar:tools/prog2
+LIBDEPS += libs/foo:tools/prog3 libs/bar:tools/prog3
+LIBDEPS += libs/qux:tools/prog4
# target "check" is used for testing because "test" is used by mk-configure
TARGETS = check
diff --git a/examples/tools/expect.out b/examples/tools/expect.out
index df742fd..3ffe8cd 100644
--- a/examples/tools/expect.out
+++ b/examples/tools/expect.out
@@ -47,16 +47,13 @@ check ===> tools/prog1
/objdir/libs/bar/bar.h
/objdir/libs/bar/bar.o
/objdir/libs/bar/libbar.a
-/objdir/libs/bar/linkme.mk
/objdir/libs/foo/Makefile
/objdir/libs/foo/foo.c
/objdir/libs/foo/foo.h
/objdir/libs/foo/foo.o
/objdir/libs/foo/libfoo.a
-/objdir/libs/foo/linkme.mk
/objdir/libs/qux/Makefile
/objdir/libs/qux/libqux.a
-/objdir/libs/qux/linkme.mk
/objdir/libs/qux/qux.c
/objdir/libs/qux/qux.h
/objdir/libs/qux/qux.h.in
@@ -143,13 +140,10 @@ LD: prog4
/objdir/libs/bar/Makefile
/objdir/libs/bar/bar.c
/objdir/libs/bar/bar.h
-/objdir/libs/bar/linkme.mk
/objdir/libs/foo/Makefile
/objdir/libs/foo/foo.c
/objdir/libs/foo/foo.h
-/objdir/libs/foo/linkme.mk
/objdir/libs/qux/Makefile
-/objdir/libs/qux/linkme.mk
/objdir/libs/qux/qux.c
/objdir/libs/qux/qux.h.in
/objdir/test.mk
@@ -168,13 +162,10 @@ LD: prog4
/objdir/libs/bar/Makefile
/objdir/libs/bar/bar.c
/objdir/libs/bar/bar.h
-/objdir/libs/bar/linkme.mk
/objdir/libs/foo/Makefile
/objdir/libs/foo/foo.c
/objdir/libs/foo/foo.h
-/objdir/libs/foo/linkme.mk
/objdir/libs/qux/Makefile
-/objdir/libs/qux/linkme.mk
/objdir/libs/qux/qux.c
/objdir/libs/qux/qux.h.in
/objdir/test.mk
@@ -197,15 +188,12 @@ LD: prog4
/objdir/libs/bar/Makefile
/objdir/libs/bar/bar.c
/objdir/libs/bar/bar.h
-/objdir/libs/bar/linkme.mk
/objdir/libs/foo/Makefile
/objdir/libs/foo/foo.c
/objdir/libs/foo/foo.h
/objdir/libs/foo/foo.o
/objdir/libs/foo/libfoo.a
-/objdir/libs/foo/linkme.mk
/objdir/libs/qux/Makefile
-/objdir/libs/qux/linkme.mk
/objdir/libs/qux/qux.c
/objdir/libs/qux/qux.h.in
/objdir/test.mk
@@ -230,15 +218,12 @@ LD: prog4
/objdir/libs/bar/Makefile
/objdir/libs/bar/bar.c
/objdir/libs/bar/bar.h
-/objdir/libs/bar/linkme.mk
/objdir/libs/foo/Makefile
/objdir/libs/foo/foo.c
/objdir/libs/foo/foo.h
/objdir/libs/foo/foo.o
/objdir/libs/foo/libfoo.a
-/objdir/libs/foo/linkme.mk
/objdir/libs/qux/Makefile
-/objdir/libs/qux/linkme.mk
/objdir/libs/qux/qux.c
/objdir/libs/qux/qux.h.in
/objdir/test.mk
@@ -263,15 +248,12 @@ LD: prog4
/objdir/libs/bar/Makefile
/objdir/libs/bar/bar.c
/objdir/libs/bar/bar.h
-/objdir/libs/bar/linkme.mk
/objdir/libs/foo/Makefile
/objdir/libs/foo/foo.c
/objdir/libs/foo/foo.h
/objdir/libs/foo/foo.o
/objdir/libs/foo/libfoo.a
-/objdir/libs/foo/linkme.mk
/objdir/libs/qux/Makefile
-/objdir/libs/qux/linkme.mk
/objdir/libs/qux/qux.c
/objdir/libs/qux/qux.h.in
/objdir/test.mk
@@ -298,13 +280,10 @@ LD: prog4
/objdir/libs/bar/bar.h
/objdir/libs/bar/bar.o
/objdir/libs/bar/libbar.a
-/objdir/libs/bar/linkme.mk
/objdir/libs/foo/Makefile
/objdir/libs/foo/foo.c
/objdir/libs/foo/foo.h
-/objdir/libs/foo/linkme.mk
/objdir/libs/qux/Makefile
-/objdir/libs/qux/linkme.mk
/objdir/libs/qux/qux.c
/objdir/libs/qux/qux.h.in
/objdir/test.mk
@@ -331,13 +310,10 @@ LD: prog4
/objdir/libs/bar/bar.h
/objdir/libs/bar/bar.o
/objdir/libs/bar/libbar.a
-/objdir/libs/bar/linkme.mk
/objdir/libs/foo/Makefile
/objdir/libs/foo/foo.c
/objdir/libs/foo/foo.h
-/objdir/libs/foo/linkme.mk
/objdir/libs/qux/Makefile
-/objdir/libs/qux/linkme.mk
/objdir/libs/qux/qux.c
/objdir/libs/qux/qux.h.in
/objdir/test.mk
@@ -364,15 +340,12 @@ LD: prog4
/objdir/libs/bar/bar.h
/objdir/libs/bar/bar.o
/objdir/libs/bar/libbar.a
-/objdir/libs/bar/linkme.mk
/objdir/libs/foo/Makefile
/objdir/libs/foo/foo.c
/objdir/libs/foo/foo.h
/objdir/libs/foo/foo.o
/objdir/libs/foo/libfoo.a
-/objdir/libs/foo/linkme.mk
/objdir/libs/qux/Makefile
-/objdir/libs/qux/linkme.mk
/objdir/libs/qux/qux.c
/objdir/libs/qux/qux.h.in
/objdir/test.mk
@@ -400,14 +373,11 @@ LD: prog4
/objdir/libs/bar/Makefile
/objdir/libs/bar/bar.c
/objdir/libs/bar/bar.h
-/objdir/libs/bar/linkme.mk
/objdir/libs/foo/Makefile
/objdir/libs/foo/foo.c
/objdir/libs/foo/foo.h
-/objdir/libs/foo/linkme.mk
/objdir/libs/qux/Makefile
/objdir/libs/qux/libqux.a
-/objdir/libs/qux/linkme.mk
/objdir/libs/qux/qux.c
/objdir/libs/qux/qux.h
/objdir/libs/qux/qux.h.in
@@ -488,6 +458,7 @@ errorcheck
filelist
install
installdirs
+mkgen
obj
test
uninstall
diff --git a/examples/tools/libs/bar/linkme.mk b/examples/tools/libs/bar/linkme.mk
deleted file mode 100644
index 6d6ad74..0000000
--- a/examples/tools/libs/bar/linkme.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-PATH.bar := ${.PARSEDIR}
-
-CPPFLAGS += -I${PATH.bar}
-DPLIBDIRS += ${PATH.bar}
-LDADD0 += -lbar
diff --git a/examples/tools/libs/foo/linkme.mk b/examples/tools/libs/foo/linkme.mk
deleted file mode 100644
index 841ff33..0000000
--- a/examples/tools/libs/foo/linkme.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-PATH.foo := ${.PARSEDIR}
-
-CPPFLAGS += -I${PATH.foo}
-DPLIBDIRS += ${PATH.foo}
-LDADD0 += -lfoo
diff --git a/examples/tools/libs/qux/linkme.mk b/examples/tools/libs/qux/linkme.mk
deleted file mode 100644
index ebf405e..0000000
--- a/examples/tools/libs/qux/linkme.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-PATH.qux := ${.PARSEDIR}
-
-CPPFLAGS += -I${PATH.qux}
-DPLIBDIRS += ${PATH.qux}
-LDADD0 += -lqux
diff --git a/examples/tools/tools/prog1/Makefile b/examples/tools/tools/prog1/Makefile
index bca4588..bf306a3 100644
--- a/examples/tools/tools/prog1/Makefile
+++ b/examples/tools/tools/prog1/Makefile
@@ -8,5 +8,4 @@ MKC_REQD = 0.10.0
check:
@: do something useful
-.include "../../libs/foo/linkme.mk"
.include <mkc.prog.mk>
diff --git a/examples/tools/tools/prog2/Makefile b/examples/tools/tools/prog2/Makefile
index 63ab936..e80873a 100644
--- a/examples/tools/tools/prog2/Makefile
+++ b/examples/tools/tools/prog2/Makefile
@@ -8,5 +8,4 @@ MKC_REQD = 0.10.0
check:
@: do something useful
-.include "../../libs/bar/linkme.mk"
.include <mkc.prog.mk>
diff --git a/examples/tools/tools/prog3/Makefile b/examples/tools/tools/prog3/Makefile
index b361032..093e2d2 100644
--- a/examples/tools/tools/prog3/Makefile
+++ b/examples/tools/tools/prog3/Makefile
@@ -8,7 +8,4 @@ MKC_REQD = 0.10.0
check:
@: do something useful
-.include "../../libs/foo/linkme.mk"
-.include "../../libs/bar/linkme.mk"
-
.include <mkc.prog.mk>
diff --git a/examples/tools/tools/prog4/Makefile b/examples/tools/tools/prog4/Makefile
index 307f490..1d3ebf0 100644
--- a/examples/tools/tools/prog4/Makefile
+++ b/examples/tools/tools/prog4/Makefile
@@ -7,5 +7,4 @@ MKC_REQD = 0.10.0
check:
@: do something useful
-.include "../../libs/qux/linkme.mk"
.include <mkc.prog.mk>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-24 05:28:40 +0000