summaryrefslogtreecommitdiff
path: root/examples/hello_dictd
diff options
context:
space:
mode:
Diffstat (limited to 'examples/hello_dictd')
-rw-r--r--examples/hello_dictd/Makefile20
-rw-r--r--examples/hello_dictd/dict/Makefile3
-rw-r--r--examples/hello_dictd/dictd/Makefile3
-rw-r--r--examples/hello_dictd/dictfmt/Makefile3
-rw-r--r--examples/hello_dictd/dictzip/Makefile4
-rw-r--r--examples/hello_dictd/expect.out231
-rw-r--r--examples/hello_dictd/libcommon/Makefile2
-rw-r--r--examples/hello_dictd/libcommon/linkme.mk5
-rw-r--r--examples/hello_dictd/libdz/dz.c8
-rw-r--r--examples/hello_dictd/libdz/linkme.mk5
-rw-r--r--examples/hello_dictd/libmaa/linkme.mk5
-rw-r--r--examples/hello_dictd/test.mk39
12 files changed, 233 insertions, 95 deletions
diff --git a/examples/hello_dictd/Makefile b/examples/hello_dictd/Makefile
index fe7e319..5c4c567 100644
--- a/examples/hello_dictd/Makefile
+++ b/examples/hello_dictd/Makefile
@@ -1,12 +1,14 @@
-SUBPRJ = libcommon:dict
-SUBPRJ += libcommon:dictd
-SUBPRJ += libcommon:dictzip
-SUBPRJ += libcommon:dictfmt
-SUBPRJ += libmaa:dict
-SUBPRJ += libmaa:dictd
-SUBPRJ += libmaa:dictzip
-SUBPRJ += libmaa:dictfmt
-SUBPRJ += libdz:dictzip
+LIBDEPS = libcommon:dict
+LIBDEPS += libcommon:dictd
+LIBDEPS += libcommon:dictzip
+LIBDEPS += libcommon:dictfmt
+LIBDEPS += libmaa:dict
+LIBDEPS += libmaa:dictd
+LIBDEPS += libmaa:dictzip
+LIBDEPS += libmaa:dictfmt
+LIBDEPS += libdz:dictzip
+
+INTERNALLIBS += libcommon
# Subproject "doc" has no dependencies
SUBPRJ += doc
diff --git a/examples/hello_dictd/dict/Makefile b/examples/hello_dictd/dict/Makefile
index b7e3e1c..17f232f 100644
--- a/examples/hello_dictd/dict/Makefile
+++ b/examples/hello_dictd/dict/Makefile
@@ -3,7 +3,4 @@ MAN = dict.1
WARNS = 4
-.include "../libcommon/linkme.mk"
-.include "../libmaa/linkme.mk"
-
.include <mkc.prog.mk>
diff --git a/examples/hello_dictd/dictd/Makefile b/examples/hello_dictd/dictd/Makefile
index 1f3d8ca..325df68 100644
--- a/examples/hello_dictd/dictd/Makefile
+++ b/examples/hello_dictd/dictd/Makefile
@@ -3,7 +3,4 @@ MAN = dictd.8
WARNS = 4
-.include "../libcommon/linkme.mk"
-.include "../libmaa/linkme.mk"
-
.include <mkc.prog.mk>
diff --git a/examples/hello_dictd/dictfmt/Makefile b/examples/hello_dictd/dictfmt/Makefile
index a34d541..c30ed3e 100644
--- a/examples/hello_dictd/dictfmt/Makefile
+++ b/examples/hello_dictd/dictfmt/Makefile
@@ -3,7 +3,4 @@ MAN = dictfmt.1
WARNS = 4
-.include "../libcommon/linkme.mk"
-.include "../libmaa/linkme.mk"
-
.include <mkc.prog.mk>
diff --git a/examples/hello_dictd/dictzip/Makefile b/examples/hello_dictd/dictzip/Makefile
index db50d14..456bb00 100644
--- a/examples/hello_dictd/dictzip/Makefile
+++ b/examples/hello_dictd/dictzip/Makefile
@@ -3,8 +3,4 @@ MAN = dictzip.1
WARNS = 4
-.include "../libcommon/linkme.mk"
-.include "../libdz/linkme.mk"
-.include "../libmaa/linkme.mk"
-
.include <mkc.prog.mk>
diff --git a/examples/hello_dictd/expect.out b/examples/hello_dictd/expect.out
index 462d425..9c3f7f1 100644
--- a/examples/hello_dictd/expect.out
+++ b/examples/hello_dictd/expect.out
@@ -20,10 +20,11 @@ dictzip: fake4=4
dictzip: fake5=5
dictzip: fake6=6
=========== nm ============
-libmaa fake4
-libmaa fake5
-libmaa fake6
-libdz fake3
+symbol fake4
+symbol fake5
+symbol fake6
+=
+symbol fake3
=========== all ============
/objdir/Makefile
/objdir/Makefile.inc
@@ -71,10 +72,12 @@ libdz fake3
/objdir/libcommon/Makefile
/objdir/libcommon/iswalnum.c
/objdir/libcommon/iswalnum.o
+/objdir/libcommon/iswalnum.os
/objdir/libcommon/libcommon.a
-/objdir/libcommon/linkme.mk
+/objdir/libcommon/libcommon_pic.a
/objdir/libcommon/str.c
/objdir/libcommon/str.o
+/objdir/libcommon/str.os
/objdir/libdz/Makefile
/objdir/libdz/dz.c
/objdir/libdz/dz.o
@@ -84,14 +87,12 @@ libdz fake3
/objdir/libdz/libdz.so
/objdir/libdz/libdz.so.1
/objdir/libdz/libdz.so.1.0
-/objdir/libdz/linkme.mk
/objdir/libmaa/Makefile
/objdir/libmaa/export.sym
/objdir/libmaa/libmaa.a
/objdir/libmaa/libmaa.so
/objdir/libmaa/libmaa.so.1
/objdir/libmaa/libmaa.so.1.2.0
-/objdir/libmaa/linkme.mk
/objdir/libmaa/log.c
/objdir/libmaa/log.o
/objdir/libmaa/log.os
@@ -102,6 +103,25 @@ libdz fake3
/objdir/libmaa/set.o
/objdir/libmaa/set.os
/objdir/test.mk
+========= INTERNALLIBS ==========
+installdirs ===> examples/hello_dictd/libmaa
+installdirs ===> examples/hello_dictd/dict
+installdirs ===> examples/hello_dictd/dictd
+installdirs ===> examples/hello_dictd/libdz
+installdirs ===> examples/hello_dictd/dictzip
+installdirs ===> examples/hello_dictd/dictfmt
+install ===> examples/hello_dictd/libmaa
+install ===> examples/hello_dictd/dict
+install ===> examples/hello_dictd/dictd
+install ===> examples/hello_dictd/libdz
+install ===> examples/hello_dictd/dictzip
+install ===> examples/hello_dictd/dictfmt
+uninstall ===> examples/hello_dictd/libmaa
+uninstall ===> examples/hello_dictd/dict
+uninstall ===> examples/hello_dictd/dictd
+uninstall ===> examples/hello_dictd/libdz
+uninstall ===> examples/hello_dictd/dictzip
+uninstall ===> examples/hello_dictd/dictfmt
========= installdirs ==========
/objdir/prefix
/objdir/prefix/bin
@@ -169,10 +189,12 @@ libdz fake3
/objdir/libcommon/Makefile
/objdir/libcommon/iswalnum.c
/objdir/libcommon/iswalnum.o
+/objdir/libcommon/iswalnum.os
/objdir/libcommon/libcommon.a
-/objdir/libcommon/linkme.mk
+/objdir/libcommon/libcommon_pic.a
/objdir/libcommon/str.c
/objdir/libcommon/str.o
+/objdir/libcommon/str.os
/objdir/libdz/Makefile
/objdir/libdz/dz.c
/objdir/libdz/dz.o
@@ -182,14 +204,12 @@ libdz fake3
/objdir/libdz/libdz.so
/objdir/libdz/libdz.so.1
/objdir/libdz/libdz.so.1.0
-/objdir/libdz/linkme.mk
/objdir/libmaa/Makefile
/objdir/libmaa/export.sym
/objdir/libmaa/libmaa.a
/objdir/libmaa/libmaa.so
/objdir/libmaa/libmaa.so.1
/objdir/libmaa/libmaa.so.1.2.0
-/objdir/libmaa/linkme.mk
/objdir/libmaa/log.c
/objdir/libmaa/log.o
/objdir/libmaa/log.os
@@ -221,15 +241,12 @@ libdz fake3
/objdir/hello_dictd.test.out.tmp
/objdir/libcommon/Makefile
/objdir/libcommon/iswalnum.c
-/objdir/libcommon/linkme.mk
/objdir/libcommon/str.c
/objdir/libdz/Makefile
/objdir/libdz/dz.c
/objdir/libdz/export.sym
-/objdir/libdz/linkme.mk
/objdir/libmaa/Makefile
/objdir/libmaa/export.sym
-/objdir/libmaa/linkme.mk
/objdir/libmaa/log.c
/objdir/libmaa/prime.c
/objdir/libmaa/set.c
@@ -255,15 +272,12 @@ libdz fake3
/objdir/hello_dictd.test.out.tmp
/objdir/libcommon/Makefile
/objdir/libcommon/iswalnum.c
-/objdir/libcommon/linkme.mk
/objdir/libcommon/str.c
/objdir/libdz/Makefile
/objdir/libdz/dz.c
/objdir/libdz/export.sym
-/objdir/libdz/linkme.mk
/objdir/libmaa/Makefile
/objdir/libmaa/export.sym
-/objdir/libmaa/linkme.mk
/objdir/libmaa/log.c
/objdir/libmaa/prime.c
/objdir/libmaa/set.c
@@ -296,17 +310,14 @@ libdz fake3
/objdir/libcommon
/objdir/libcommon/Makefile
/objdir/libcommon/iswalnum.c
-/objdir/libcommon/linkme.mk
/objdir/libcommon/str.c
/objdir/libdz
/objdir/libdz/Makefile
/objdir/libdz/dz.c
/objdir/libdz/export.sym
-/objdir/libdz/linkme.mk
/objdir/libmaa
/objdir/libmaa/Makefile
/objdir/libmaa/export.sym
-/objdir/libmaa/linkme.mk
/objdir/libmaa/log.c
/objdir/libmaa/prime.c
/objdir/libmaa/set.c
@@ -350,17 +361,14 @@ obj1 does not exist
/objdir/libcommon
/objdir/libcommon/Makefile
/objdir/libcommon/iswalnum.c
-/objdir/libcommon/linkme.mk
/objdir/libcommon/str.c
/objdir/libdz
/objdir/libdz/Makefile
/objdir/libdz/dz.c
/objdir/libdz/export.sym
-/objdir/libdz/linkme.mk
/objdir/libmaa
/objdir/libmaa/Makefile
/objdir/libmaa/export.sym
-/objdir/libmaa/linkme.mk
/objdir/libmaa/log.c
/objdir/libmaa/prime.c
/objdir/libmaa/set.c
@@ -410,15 +418,12 @@ obj1 does not exist
/objdir/hello_dictd.test.out.tmp
/objdir/libcommon/Makefile
/objdir/libcommon/iswalnum.c
-/objdir/libcommon/linkme.mk
/objdir/libcommon/str.c
/objdir/libdz/Makefile
/objdir/libdz/dz.c
/objdir/libdz/export.sym
-/objdir/libdz/linkme.mk
/objdir/libmaa/Makefile
/objdir/libmaa/export.sym
-/objdir/libmaa/linkme.mk
/objdir/libmaa/log.c
/objdir/libmaa/prime.c
/objdir/libmaa/set.c
@@ -452,21 +457,21 @@ obj1 does not exist
/objdir/libcommon/Makefile
/objdir/libcommon/iswalnum.c
/objdir/libcommon/iswalnum.o
+/objdir/libcommon/iswalnum.os
/objdir/libcommon/libcommon.a
-/objdir/libcommon/linkme.mk
+/objdir/libcommon/libcommon_pic.a
/objdir/libcommon/str.c
/objdir/libcommon/str.o
+/objdir/libcommon/str.os
/objdir/libdz/Makefile
/objdir/libdz/dz.c
/objdir/libdz/export.sym
-/objdir/libdz/linkme.mk
/objdir/libmaa/Makefile
/objdir/libmaa/export.sym
/objdir/libmaa/libmaa.a
/objdir/libmaa/libmaa.so
/objdir/libmaa/libmaa.so.1
/objdir/libmaa/libmaa.so.1.2.0
-/objdir/libmaa/linkme.mk
/objdir/libmaa/log.c
/objdir/libmaa/log.o
/objdir/libmaa/log.os
@@ -506,21 +511,21 @@ obj1 does not exist
/objdir/libcommon/Makefile
/objdir/libcommon/iswalnum.c
/objdir/libcommon/iswalnum.o
+/objdir/libcommon/iswalnum.os
/objdir/libcommon/libcommon.a
-/objdir/libcommon/linkme.mk
+/objdir/libcommon/libcommon_pic.a
/objdir/libcommon/str.c
/objdir/libcommon/str.o
+/objdir/libcommon/str.os
/objdir/libdz/Makefile
/objdir/libdz/dz.c
/objdir/libdz/export.sym
-/objdir/libdz/linkme.mk
/objdir/libmaa/Makefile
/objdir/libmaa/export.sym
/objdir/libmaa/libmaa.a
/objdir/libmaa/libmaa.so
/objdir/libmaa/libmaa.so.1
/objdir/libmaa/libmaa.so.1.2.0
-/objdir/libmaa/linkme.mk
/objdir/libmaa/log.c
/objdir/libmaa/log.o
/objdir/libmaa/log.os
@@ -592,15 +597,12 @@ obj1 does not exist
/objdir/hello_dictd.test.out.tmp
/objdir/libcommon/Makefile
/objdir/libcommon/iswalnum.c
-/objdir/libcommon/linkme.mk
/objdir/libcommon/str.c
/objdir/libdz/Makefile
/objdir/libdz/dz.c
/objdir/libdz/export.sym
-/objdir/libdz/linkme.mk
/objdir/libmaa/Makefile
/objdir/libmaa/export.sym
-/objdir/libmaa/linkme.mk
/objdir/libmaa/log.c
/objdir/libmaa/prime.c
/objdir/libmaa/set.c
@@ -626,15 +628,12 @@ obj1 does not exist
/objdir/hello_dictd.test.out.tmp
/objdir/libcommon/Makefile
/objdir/libcommon/iswalnum.c
-/objdir/libcommon/linkme.mk
/objdir/libcommon/str.c
/objdir/libdz/Makefile
/objdir/libdz/dz.c
/objdir/libdz/export.sym
-/objdir/libdz/linkme.mk
/objdir/libmaa/Makefile
/objdir/libmaa/export.sym
-/objdir/libmaa/linkme.mk
/objdir/libmaa/log.c
/objdir/libmaa/prime.c
/objdir/libmaa/set.c
@@ -683,21 +682,173 @@ obj1 does not exist
/objdir/libcommon/Makefile
/objdir/libcommon/iswalnum.c
/objdir/libcommon/iswalnum.o
+/objdir/libcommon/iswalnum.os
/objdir/libcommon/libcommon.a
-/objdir/libcommon/linkme.mk
+/objdir/libcommon/libcommon_pic.a
/objdir/libcommon/str.c
/objdir/libcommon/str.o
+/objdir/libcommon/str.os
/objdir/libdz/Makefile
/objdir/libdz/dz.c
/objdir/libdz/export.sym
-/objdir/libdz/linkme.mk
/objdir/libmaa/Makefile
/objdir/libmaa/export.sym
/objdir/libmaa/libmaa.a
/objdir/libmaa/libmaa.so
/objdir/libmaa/libmaa.so.1
/objdir/libmaa/libmaa.so.1.2.0
-/objdir/libmaa/linkme.mk
+/objdir/libmaa/log.c
+/objdir/libmaa/log.o
+/objdir/libmaa/log.os
+/objdir/libmaa/prime.c
+/objdir/libmaa/prime.o
+/objdir/libmaa/prime.os
+/objdir/libmaa/set.c
+/objdir/libmaa/set.o
+/objdir/libmaa/set.os
+/objdir/test.mk
+=========== all with MKPIE=yes ============
+/objdir/Makefile
+/objdir/Makefile.inc
+/objdir/_mkc_compiler_type.err
+/objdir/_mkc_compiler_type.res
+/objdir/_mkc_funclib_deflate.c
+/objdir/_mkc_funclib_deflate.err
+/objdir/_mkc_funclib_deflate.res
+/objdir/_mkc_funclib_deflate_z.c
+/objdir/_mkc_funclib_deflate_z.err
+/objdir/_mkc_funclib_deflate_z.res
+/objdir/_mkc_header_zlib_h.c
+/objdir/_mkc_header_zlib_h.err
+/objdir/_mkc_header_zlib_h.res
+/objdir/_mkc_prog_cc.err
+/objdir/_mkc_prog_cc.res
+/objdir/dict/Makefile
+/objdir/dict/dict
+/objdir/dict/dict.1
+/objdir/dict/dict.c
+/objdir/dict/dict.cat1
+/objdir/dict/dict.o
+/objdir/dictd/Makefile
+/objdir/dictd/dictd
+/objdir/dictd/dictd.8
+/objdir/dictd/dictd.c
+/objdir/dictd/dictd.cat8
+/objdir/dictd/dictd.o
+/objdir/dictfmt/Makefile
+/objdir/dictfmt/dictfmt
+/objdir/dictfmt/dictfmt.1
+/objdir/dictfmt/dictfmt.c
+/objdir/dictfmt/dictfmt.cat1
+/objdir/dictfmt/dictfmt.o
+/objdir/dictzip/Makefile
+/objdir/dictzip/dictzip
+/objdir/dictzip/dictzip.1
+/objdir/dictzip/dictzip.c
+/objdir/dictzip/dictzip.cat1
+/objdir/dictzip/dictzip.o
+/objdir/doc/Makefile
+/objdir/doc/doc.txt
+/objdir/expect.out
+/objdir/hello_dictd.test.out.tmp
+/objdir/libcommon/Makefile
+/objdir/libcommon/iswalnum.c
+/objdir/libcommon/iswalnum.o
+/objdir/libcommon/iswalnum.os
+/objdir/libcommon/libcommon.a
+/objdir/libcommon/libcommon_pic.a
+/objdir/libcommon/str.c
+/objdir/libcommon/str.o
+/objdir/libcommon/str.os
+/objdir/libdz/Makefile
+/objdir/libdz/dz.c
+/objdir/libdz/dz.o
+/objdir/libdz/dz.os
+/objdir/libdz/export.sym
+/objdir/libdz/libdz.a
+/objdir/libdz/libdz.so
+/objdir/libdz/libdz.so.1
+/objdir/libdz/libdz.so.1.0
+/objdir/libmaa/Makefile
+/objdir/libmaa/export.sym
+/objdir/libmaa/libmaa.a
+/objdir/libmaa/libmaa.so
+/objdir/libmaa/libmaa.so.1
+/objdir/libmaa/libmaa.so.1.2.0
+/objdir/libmaa/log.c
+/objdir/libmaa/log.o
+/objdir/libmaa/log.os
+/objdir/libmaa/prime.c
+/objdir/libmaa/prime.o
+/objdir/libmaa/prime.os
+/objdir/libmaa/set.c
+/objdir/libmaa/set.o
+/objdir/libmaa/set.os
+/objdir/test.mk
+=========== all with STATICLIBS=everything... ============
+/objdir/Makefile
+/objdir/Makefile.inc
+/objdir/_mkc_compiler_type.err
+/objdir/_mkc_compiler_type.res
+/objdir/_mkc_funclib_deflate.c
+/objdir/_mkc_funclib_deflate.err
+/objdir/_mkc_funclib_deflate.res
+/objdir/_mkc_funclib_deflate_z.c
+/objdir/_mkc_funclib_deflate_z.err
+/objdir/_mkc_funclib_deflate_z.res
+/objdir/_mkc_header_zlib_h.c
+/objdir/_mkc_header_zlib_h.err
+/objdir/_mkc_header_zlib_h.res
+/objdir/_mkc_prog_cc.err
+/objdir/_mkc_prog_cc.res
+/objdir/dict/Makefile
+/objdir/dict/dict
+/objdir/dict/dict.1
+/objdir/dict/dict.c
+/objdir/dict/dict.cat1
+/objdir/dict/dict.o
+/objdir/dictd/Makefile
+/objdir/dictd/dictd
+/objdir/dictd/dictd.8
+/objdir/dictd/dictd.c
+/objdir/dictd/dictd.cat8
+/objdir/dictd/dictd.o
+/objdir/dictfmt/Makefile
+/objdir/dictfmt/dictfmt
+/objdir/dictfmt/dictfmt.1
+/objdir/dictfmt/dictfmt.c
+/objdir/dictfmt/dictfmt.cat1
+/objdir/dictfmt/dictfmt.o
+/objdir/dictzip/Makefile
+/objdir/dictzip/dictzip
+/objdir/dictzip/dictzip.1
+/objdir/dictzip/dictzip.c
+/objdir/dictzip/dictzip.cat1
+/objdir/dictzip/dictzip.o
+/objdir/doc/Makefile
+/objdir/doc/doc.txt
+/objdir/expect.out
+/objdir/hello_dictd.test.out.tmp
+/objdir/libcommon/Makefile
+/objdir/libcommon/iswalnum.c
+/objdir/libcommon/iswalnum.o
+/objdir/libcommon/iswalnum.os
+/objdir/libcommon/libcommon.a
+/objdir/libcommon/libcommon_pic.a
+/objdir/libcommon/str.c
+/objdir/libcommon/str.o
+/objdir/libcommon/str.os
+/objdir/libdz/Makefile
+/objdir/libdz/dz.c
+/objdir/libdz/dz.o
+/objdir/libdz/dz.os
+/objdir/libdz/export.sym
+/objdir/libdz/libdz.a
+/objdir/libdz/libdz_pic.a
+/objdir/libmaa/Makefile
+/objdir/libmaa/export.sym
+/objdir/libmaa/libmaa.a
+/objdir/libmaa/libmaa_pic.a
/objdir/libmaa/log.c
/objdir/libmaa/log.o
/objdir/libmaa/log.os
diff --git a/examples/hello_dictd/libcommon/Makefile b/examples/hello_dictd/libcommon/Makefile
index 33e4167..c3c5253 100644
--- a/examples/hello_dictd/libcommon/Makefile
+++ b/examples/hello_dictd/libcommon/Makefile
@@ -5,6 +5,4 @@ SRCS = str.c iswalnum.c # and others
WARNS = 4
-MKINSTALL = no
-
.include <mkc.lib.mk>
diff --git a/examples/hello_dictd/libcommon/linkme.mk b/examples/hello_dictd/libcommon/linkme.mk
deleted file mode 100644
index 84c543c..0000000
--- a/examples/hello_dictd/libcommon/linkme.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-PATH.common := ${.PARSEDIR}
-
-CPPFLAGS += -I${PATH.common}
-DPLIBDIRS += ${PATH.common}
-LDADD0 += -lcommon
diff --git a/examples/hello_dictd/libdz/dz.c b/examples/hello_dictd/libdz/dz.c
index 1fbe98e..81442b5 100644
--- a/examples/hello_dictd/libdz/dz.c
+++ b/examples/hello_dictd/libdz/dz.c
@@ -5,10 +5,10 @@ int fake3 (void)
return 3;
}
-/* fake must not be exported */
-int fake2 (void);
+/* fake22 must not be exported */
+int fake22 (void);
-int fake2 (void)
+int fake22 (void)
{
- return 2;
+ return 22;
}
diff --git a/examples/hello_dictd/libdz/linkme.mk b/examples/hello_dictd/libdz/linkme.mk
deleted file mode 100644
index 5904614..0000000
--- a/examples/hello_dictd/libdz/linkme.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-PATH.dz := ${.PARSEDIR}
-
-CPPFLAGS += -I${PATH.dz}
-DPLIBDIRS += ${PATH.dz}
-LDADD0 += -ldz
diff --git a/examples/hello_dictd/libmaa/linkme.mk b/examples/hello_dictd/libmaa/linkme.mk
deleted file mode 100644
index 9d1456e..0000000
--- a/examples/hello_dictd/libmaa/linkme.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-PATH.maa := ${.PARSEDIR}
-
-CPPFLAGS += -I${PATH.maa}
-DPLIBDIRS += ${PATH.maa}
-LDADD0 += -lmaa
diff --git a/examples/hello_dictd/test.mk b/examples/hello_dictd/test.mk
index 2ec6e83..7081e20 100644
--- a/examples/hello_dictd/test.mk
+++ b/examples/hello_dictd/test.mk
@@ -1,5 +1,7 @@
next_level != expr ${.MAKE.LEVEL} + 1
+run_nm := env NM=${NM:Q} OPSYS=${OPSTS:Q} mkc_test_nm
+
.PHONY : test_output
test_output :
@set -e; \
@@ -9,7 +11,8 @@ test_output :
rm -rf ${.OBJDIR}${PREFIX}; \
LD_LIBRARY_PATH=${.CURDIR}/libdz:${.CURDIR}/libmaa:$$LD_LIBRARY_PATH; \
DYLD_LIBRARY_PATH=${.CURDIR}/libdz:${.CURDIR}/libmaa:$$LD_LIBRARY_PATH; \
- export LD_LIBRARY_PATH DYLD_LIBRARY_PATH; \
+ LIBRARY_PATH=$$LIBRARY_PATH:$$LD_LIBRARY_PATH; \
+ export LD_LIBRARY_PATH DYLD_LIBRARY_PATH LIBRARY_PATH; \
${.CURDIR}/dict/dict; \
${.CURDIR}/dictd/dictd; \
${.CURDIR}/dictfmt/dictfmt; \
@@ -17,17 +20,12 @@ test_output :
\
echo =========== nm ============; \
case ${OPSYS} in \
- OpenBSD) \
- ${NM} ${.CURDIR}/libmaa/libmaa*.so | awk '$$2=="T" {print "libmaa " $$3}'; \
- ${NM} ${.CURDIR}/libdz/libdz*.so | awk '$$2=="T" {print "libdz " $$3}';; \
- *BSD|SunOS|DragonFly) \
- ${NM} -P ${.CURDIR}/libmaa/libmaa*.so | awk 'NF==4 && $$2=="T" {print "libmaa " $$1}'; \
- ${NM} -P ${.CURDIR}/libdz/libdz*.so | awk 'NF==4 && $$2=="T" {print "libdz " $$1}';; \
- Linux) \
- ${NM} -P ${.CURDIR}/libmaa/libmaa*.so | awk 'NF==4 && $$2 ~ /^[DT]$$/ {print "libmaa " $$1}'; \
- ${NM} -P ${.CURDIR}/libdz/libdz*.so | awk 'NF==4 && $$2 ~ /^[DT]$$/ {print "libdz " $$1}';; \
+ *BSD|DragonFly|SunOS|Linux) \
+ ${run_nm} ${OBJDIR_libmaa}/libmaa*.so; \
+ echo =; \
+ ${run_nm} ${OBJDIR_libdz}/libdz*.so;; \
*) \
- printf 'libmaa fake4\nlibmaa fake5\nlibmaa fake6\nlibdz fake3\n';; \
+ printf 'symbol fake4\nsymbol fake5\nsymbol fake6\n=\nsymbol fake3\n';; \
esac; \
\
echo =========== all ============; \
@@ -35,6 +33,11 @@ test_output :
find ${.OBJDIR} -type f -o -type l | \
mkc_test_helper "${PREFIX}" "${.OBJDIR}"; \
\
+ echo ========= INTERNALLIBS ==========; \
+ { ${MAKE} ${MAKEFLAGS} installdirs DESTDIR=${.OBJDIR}; \
+ ${MAKE} ${MAKEFLAGS} install DESTDIR=${.OBJDIR}; \
+ ${MAKE} ${MAKEFLAGS} uninstall DESTDIR=${.OBJDIR}; } 2>&1 | awk '/^(un)?install/'; \
+ rm -rf ${.OBJDIR}${PREFIX} ${.OBJDIR}/usr ${.OBJDIR}/home ${.OBJDIR}/Users; \
echo ========= installdirs ==========; \
${MAKE} ${MAKEFLAGS} installdirs DESTDIR=${.OBJDIR} > /dev/null; \
find ${.OBJDIR}${PREFIX} -type f -o -type l -o -type d | \
@@ -64,7 +67,7 @@ test_output :
${MAKE} ${MAKEFLAGS} distclean > /dev/null; \
find ${.OBJDIR} -type f -o -type l | \
mkc_test_helper "${PREFIX}" "${.OBJDIR}"; \
- rm -rf ${.OBJDIR}${PREFIX} ${.OBJDIR}/usr ${.OBJDIR}/home; \
+ rm -rf ${.OBJDIR}${PREFIX} ${.OBJDIR}/usr ${.OBJDIR}/home ${.OBJDIR}/Users; \
echo =========== MKOBJDIRS=auto ============; \
env TARGETS=fake ${MAKE} ${MAKEFLAGS} fake \
MKCHECKS=no MAKEOBJDIRPREFIX=${.OBJDIR}/obj1 > /dev/null; \
@@ -168,6 +171,18 @@ test_output :
mkc_test_helper "${PREFIX}" "${.OBJDIR}"; \
unset NOSUBDIR; \
\
+ echo =========== all with MKPIE=yes ============; \
+ ${MAKE} ${MAKEFLAGS} distclean > /dev/null; \
+ ${MAKE} ${MAKEFLAGS} -j4 all MKPIE=yes > /dev/null; \
+ find ${.OBJDIR} -type f -o -type l | \
+ mkc_test_helper "${PREFIX}" "${.OBJDIR}"; \
+ \
+ echo =========== all with STATICLIBS=everything... ============; \
+ ${MAKE} ${MAKEFLAGS} distclean > /dev/null; \
+ env STATICLIBS='libmaa libdz' ${MAKE} ${MAKEFLAGS} -j4 all > /dev/null; \
+ find ${.OBJDIR} -type f -o -type l | \
+ mkc_test_helper "${PREFIX}" "${.OBJDIR}"; \
+ \
echo =========== print_deps ============; \
${MAKE} ${MAKEFLAGS} print_deps | grep -E '^(all|test)'; \
echo =====; \
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-28 07:19:34 +0000