summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/dhcp/dhcp/fixsepbuild.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-connectivity/dhcp/dhcp/fixsepbuild.patch')
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp/fixsepbuild.patch97
1 files changed, 0 insertions, 97 deletions
diff --git a/meta/recipes-connectivity/dhcp/dhcp/fixsepbuild.patch b/meta/recipes-connectivity/dhcp/dhcp/fixsepbuild.patch
deleted file mode 100644
index 2f44147ad6..0000000000
--- a/meta/recipes-connectivity/dhcp/dhcp/fixsepbuild.patch
+++ /dev/null
@@ -1,97 +0,0 @@
1Fix out of tree builds
2
3Upstream-Status: Pending
4
5RP 2013/03/21
6
7Rebase to 4.3.4
8
9Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
10---
11 client/Makefile.am | 4 ++--
12 common/Makefile.am | 3 ++-
13 dhcpctl/Makefile.am | 2 ++
14 omapip/Makefile.am | 1 +
15 relay/Makefile.am | 2 +-
16 server/Makefile.am | 2 +-
17 6 files changed, 9 insertions(+), 5 deletions(-)
18
19diff --git a/client/Makefile.am b/client/Makefile.am
20index 2cb83d8..4730bb3 100644
21--- a/client/Makefile.am
22+++ b/client/Makefile.am
23@@ -7,11 +7,11 @@ SUBDIRS = . tests
24 BINDLIBDIR = @BINDDIR@/lib
25
26 AM_CPPFLAGS = -DCLIENT_PATH='"PATH=$(sbindir):/sbin:/bin:/usr/sbin:/usr/bin"' \
27- -DLOCALSTATEDIR='"$(localstatedir)"'
28+ -DLOCALSTATEDIR='"$(localstatedir)"' -I$(top_srcdir)/includes
29
30 dist_sysconf_DATA = dhclient.conf.example
31 sbin_PROGRAMS = dhclient
32-dhclient_SOURCES = clparse.c dhclient.c dhc6.c \
33+dhclient_SOURCES = $(srcdir)/clparse.c $(srcdir)/dhclient.c $(srcdir)/dhc6.c \
34 scripts/bsdos scripts/freebsd scripts/linux scripts/macos \
35 scripts/netbsd scripts/nextstep scripts/openbsd \
36 scripts/solaris scripts/openwrt
37diff --git a/common/Makefile.am b/common/Makefile.am
38index 113aee8..0f24fbb 100644
39--- a/common/Makefile.am
40+++ b/common/Makefile.am
41@@ -1,4 +1,5 @@
42-AM_CPPFLAGS = -I$(top_srcdir) -DLOCALSTATEDIR='"@localstatedir@"'
43+AM_CPPFLAGS = -I$(top_srcdir)/includes -I$(top_srcdir) -DLOCALSTATEDIR='"@localstatedir@"'
44+
45 AM_CFLAGS = $(LDAP_CFLAGS)
46
47 noinst_LIBRARIES = libdhcp.a
48diff --git a/dhcpctl/Makefile.am b/dhcpctl/Makefile.am
49index ceb0de1..ba8dd8b 100644
50--- a/dhcpctl/Makefile.am
51+++ b/dhcpctl/Makefile.am
52@@ -1,5 +1,7 @@
53 BINDLIBDIR = @BINDDIR@/lib
54
55+AM_CPPFLAGS = -I$(top_srcdir)/includes -I$(top_srcdir)
56+
57 bin_PROGRAMS = omshell
58 lib_LIBRARIES = libdhcpctl.a
59 noinst_PROGRAMS = cltest
60diff --git a/omapip/Makefile.am b/omapip/Makefile.am
61index 446a594..dd1afa0 100644
62--- a/omapip/Makefile.am
63+++ b/omapip/Makefile.am
64@@ -1,4 +1,5 @@
65 BINDLIBDIR = @BINDDIR@/lib
66+AM_CPPFLAGS = -I$(top_srcdir)/includes
67
68 lib_LIBRARIES = libomapi.a
69 noinst_PROGRAMS = svtest
70diff --git a/relay/Makefile.am b/relay/Makefile.am
71index 3060eca..6d652f6 100644
72--- a/relay/Makefile.am
73+++ b/relay/Makefile.am
74@@ -1,6 +1,6 @@
75 BINDLIBDIR = @BINDDIR@/lib
76
77-AM_CPPFLAGS = -DLOCALSTATEDIR='"@localstatedir@"'
78+AM_CPPFLAGS = -DLOCALSTATEDIR='"@localstatedir@"' -I$(top_srcdir)/includes
79
80 sbin_PROGRAMS = dhcrelay
81 dhcrelay_SOURCES = dhcrelay.c
82diff --git a/server/Makefile.am b/server/Makefile.am
83index 54feedf..3990b9c 100644
84--- a/server/Makefile.am
85+++ b/server/Makefile.am
86@@ -6,7 +6,7 @@ SUBDIRS = . tests
87
88 BINDLIBDIR = @BINDDIR@/lib
89
90-AM_CPPFLAGS = -I.. -DLOCALSTATEDIR='"@localstatedir@"'
91+AM_CPPFLAGS = -I$(top_srcdir) -DLOCALSTATEDIR='"@localstatedir@"' -I$(top_srcdir)/includes
92
93 dist_sysconf_DATA = dhcpd.conf.example
94 sbin_PROGRAMS = dhcpd
95--
962.8.1
97