1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
|
diff --git a/lib/libcam/Makefile b/lib/libcam/Makefile
index 9a21dde..0815f0a 100644
--- a/lib/libcam/Makefile
+++ b/lib/libcam/Makefile
@@ -8,6 +8,7 @@ INCS= camlib.h
DPADD= ${LIBSBUF}
LDADD= -lsbuf
+LDFLAGS+= -L${.OBJDIR}/../libsbuf
MAN= cam.3 cam_cdbparse.3
diff --git a/lib/libdwarf/Makefile b/lib/libdwarf/Makefile
index dbd7895..607b1f6 100644
--- a/lib/libdwarf/Makefile
+++ b/lib/libdwarf/Makefile
@@ -21,6 +21,7 @@ SRCS= \
INCS= dwarf.h libdwarf.h
CFLAGS+= -I${.CURDIR}
+CFLAGS+= -I${.CURDIR}/../libelf
SHLIB_MAJOR= 3
diff --git a/lib/libproc/Makefile b/lib/libproc/Makefile
index 4449c06..f024cf0 100644
--- a/lib/libproc/Makefile
+++ b/lib/libproc/Makefile
@@ -14,6 +14,7 @@ SRCS= proc_bkpt.c \
INCS= libproc.h
CFLAGS+= -I${.CURDIR}
+CFLAGS+= -I${.CURDIR}/../libelf
.if ${MK_LIBCPLUSPLUS} != "no"
LDADD+= -lcxxrt
@@ -27,4 +28,7 @@ SHLIB_MAJOR= 2
WITHOUT_MAN=
+LDADD+= -lelf
+LDFLAGS+= -L${.OBJDIR}/../libelf
+
.include <bsd.lib.mk>
diff --git a/lib/libprocstat/Makefile b/lib/libprocstat/Makefile
index af5a775..c01aa05 100644
--- a/lib/libprocstat/Makefile
+++ b/lib/libprocstat/Makefile
@@ -16,6 +16,8 @@ VERSION_DEF= ${.CURDIR}/Versions.def
SYMBOL_MAPS= ${.CURDIR}/Symbol.map
INCS= libprocstat.h
+CFLAGS+= -I${.CURDIR}/../libelf
+LDFLAGS+= -L${.OBJDIR}/../libelf
CFLAGS+= -I. -I${.CURDIR} -D_KVM_VNODE
SHLIB_MAJOR= 1
diff --git a/lib/librtld_db/Makefile b/lib/librtld_db/Makefile
index 2815a07..e992662 100644
--- a/lib/librtld_db/Makefile
+++ b/lib/librtld_db/Makefile
@@ -10,5 +10,8 @@ SRCS= rtld_db.c
INCS= rtld_db.h
CFLAGS+= -I${.CURDIR}
+CFLAGS+= -I${.CURDIR}/../libelf
+LDADD+= -lutil -lproc
+LDFLAGS+= -L${.OBJDIR}/../libutil -L${.OBJDIR}/../libproc
.include <bsd.lib.mk>
diff --git a/lib/libtelnet/Makefile b/lib/libtelnet/Makefile
index 1cf52a0..3d25fae 100644
--- a/lib/libtelnet/Makefile
+++ b/lib/libtelnet/Makefile
@@ -13,6 +13,8 @@ INTERNALLIB=
SRCS= genget.c getent.c misc.c
CFLAGS+= -I${TELNETDIR}
+CFLAGS+= -I${.CURDIR}/../libmp
+
WARNS?= 2
.if !defined(RELEASE_CRUNCH)
diff --git a/lib/libexecinfo/Makefile b/lib/libexecinfo/Makefile
index 30a1dfb..9f8a99c 100644
--- a/lib/libexecinfo/Makefile
+++ b/lib/libexecinfo/Makefile
@@ -10,8 +10,10 @@ SHLIB_MAJOR= 1
INCS= execinfo.h
SRCS= backtrace.c symtab.c unwind.c
+CFLAGS+= -I${.CURDIR}/../libelf
DPADD= ${LIBELF}
LDADD= -lelf
+LDFLAGS+= -L${.OBJDIR}/../libelf
MAN= backtrace.3
|