Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 1 | From cccec0344d68dac4100b6f260ee24e7c2da9dfda Mon Sep 17 00:00:00 2001 |
| 2 | From: Hongxu Jia <hongxu.jia@windriver.com> |
| 3 | Date: Tue, 15 Aug 2017 15:08:22 +0800 |
| 4 | Subject: [PATCH 04/11] Fix out of tree builds |
| 5 | |
| 6 | Upstream-Status: Pending |
| 7 | |
| 8 | RP 2013/03/21 |
| 9 | |
| 10 | Rebase to 4.3.6 |
| 11 | |
| 12 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> |
| 13 | --- |
| 14 | client/Makefile.am | 4 ++-- |
| 15 | common/Makefile.am | 3 ++- |
| 16 | dhcpctl/Makefile.am | 2 ++ |
| 17 | omapip/Makefile.am | 1 + |
| 18 | relay/Makefile.am | 2 +- |
| 19 | server/Makefile.am | 2 +- |
| 20 | 6 files changed, 9 insertions(+), 5 deletions(-) |
| 21 | |
| 22 | diff --git a/client/Makefile.am b/client/Makefile.am |
| 23 | index 2cb83d8..4730bb3 100644 |
| 24 | --- a/client/Makefile.am |
| 25 | +++ b/client/Makefile.am |
| 26 | @@ -7,11 +7,11 @@ SUBDIRS = . tests |
| 27 | BINDLIBDIR = @BINDDIR@/lib |
| 28 | |
| 29 | AM_CPPFLAGS = -DCLIENT_PATH='"PATH=$(sbindir):/sbin:/bin:/usr/sbin:/usr/bin"' \ |
| 30 | - -DLOCALSTATEDIR='"$(localstatedir)"' |
| 31 | + -DLOCALSTATEDIR='"$(localstatedir)"' -I$(top_srcdir)/includes |
| 32 | |
| 33 | dist_sysconf_DATA = dhclient.conf.example |
| 34 | sbin_PROGRAMS = dhclient |
| 35 | -dhclient_SOURCES = clparse.c dhclient.c dhc6.c \ |
| 36 | +dhclient_SOURCES = $(srcdir)/clparse.c $(srcdir)/dhclient.c $(srcdir)/dhc6.c \ |
| 37 | scripts/bsdos scripts/freebsd scripts/linux scripts/macos \ |
| 38 | scripts/netbsd scripts/nextstep scripts/openbsd \ |
| 39 | scripts/solaris scripts/openwrt |
| 40 | diff --git a/common/Makefile.am b/common/Makefile.am |
| 41 | index 113aee8..0f24fbb 100644 |
| 42 | --- a/common/Makefile.am |
| 43 | +++ b/common/Makefile.am |
| 44 | @@ -1,4 +1,5 @@ |
| 45 | -AM_CPPFLAGS = -I$(top_srcdir) -DLOCALSTATEDIR='"@localstatedir@"' |
| 46 | +AM_CPPFLAGS = -I$(top_srcdir)/includes -I$(top_srcdir) -DLOCALSTATEDIR='"@localstatedir@"' |
| 47 | + |
| 48 | AM_CFLAGS = $(LDAP_CFLAGS) |
| 49 | |
| 50 | noinst_LIBRARIES = libdhcp.a |
| 51 | diff --git a/dhcpctl/Makefile.am b/dhcpctl/Makefile.am |
| 52 | index ceb0de1..ba8dd8b 100644 |
| 53 | --- a/dhcpctl/Makefile.am |
| 54 | +++ b/dhcpctl/Makefile.am |
| 55 | @@ -1,5 +1,7 @@ |
| 56 | BINDLIBDIR = @BINDDIR@/lib |
| 57 | |
| 58 | +AM_CPPFLAGS = -I$(top_srcdir)/includes -I$(top_srcdir) |
| 59 | + |
| 60 | bin_PROGRAMS = omshell |
| 61 | lib_LIBRARIES = libdhcpctl.a |
| 62 | noinst_PROGRAMS = cltest |
| 63 | diff --git a/omapip/Makefile.am b/omapip/Makefile.am |
| 64 | index 446a594..dd1afa0 100644 |
| 65 | --- a/omapip/Makefile.am |
| 66 | +++ b/omapip/Makefile.am |
| 67 | @@ -1,4 +1,5 @@ |
| 68 | BINDLIBDIR = @BINDDIR@/lib |
| 69 | +AM_CPPFLAGS = -I$(top_srcdir)/includes |
| 70 | |
| 71 | lib_LIBRARIES = libomapi.a |
| 72 | noinst_PROGRAMS = svtest |
| 73 | diff --git a/relay/Makefile.am b/relay/Makefile.am |
| 74 | index 3060eca..6d652f6 100644 |
| 75 | --- a/relay/Makefile.am |
| 76 | +++ b/relay/Makefile.am |
| 77 | @@ -1,6 +1,6 @@ |
| 78 | BINDLIBDIR = @BINDDIR@/lib |
| 79 | |
| 80 | -AM_CPPFLAGS = -DLOCALSTATEDIR='"@localstatedir@"' |
| 81 | +AM_CPPFLAGS = -DLOCALSTATEDIR='"@localstatedir@"' -I$(top_srcdir)/includes |
| 82 | |
| 83 | sbin_PROGRAMS = dhcrelay |
| 84 | dhcrelay_SOURCES = dhcrelay.c |
| 85 | diff --git a/server/Makefile.am b/server/Makefile.am |
| 86 | index 54feedf..3990b9c 100644 |
| 87 | --- a/server/Makefile.am |
| 88 | +++ b/server/Makefile.am |
| 89 | @@ -6,7 +6,7 @@ SUBDIRS = . tests |
| 90 | |
| 91 | BINDLIBDIR = @BINDDIR@/lib |
| 92 | |
| 93 | -AM_CPPFLAGS = -I.. -DLOCALSTATEDIR='"@localstatedir@"' |
| 94 | +AM_CPPFLAGS = -I$(top_srcdir) -DLOCALSTATEDIR='"@localstatedir@"' -I$(top_srcdir)/includes |
| 95 | |
| 96 | dist_sysconf_DATA = dhcpd.conf.example |
| 97 | sbin_PROGRAMS = dhcpd |
| 98 | -- |
| 99 | 1.8.3.1 |
| 100 | |