Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame^] | 1 | Fix out of tree builds |
| 2 | |
| 3 | Upstream-Status: Pending |
| 4 | |
| 5 | RP 2013/03/21 |
| 6 | |
| 7 | Rebase to 4.3.1 |
| 8 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> |
| 9 | --- |
| 10 | client/Makefile.am | 6 ++++-- |
| 11 | common/Makefile.am | 2 +- |
| 12 | dhcpctl/Makefile.am | 2 ++ |
| 13 | dst/Makefile.am | 2 +- |
| 14 | omapip/Makefile.am | 2 ++ |
| 15 | relay/Makefile.am | 2 +- |
| 16 | server/Makefile.am | 2 +- |
| 17 | 7 files changed, 12 insertions(+), 6 deletions(-) |
| 18 | |
| 19 | diff --git a/client/Makefile.am b/client/Makefile.am |
| 20 | index 8411960..1740f72 100644 |
| 21 | --- a/client/Makefile.am |
| 22 | +++ b/client/Makefile.am |
| 23 | @@ -4,6 +4,8 @@ |
| 24 | # production code. Sadly, we are not there yet. |
| 25 | SUBDIRS = . tests |
| 26 | |
| 27 | +AM_CPPFLAGS = -I$(top_srcdir)/includes |
| 28 | + |
| 29 | dist_sysconf_DATA = dhclient.conf.example |
| 30 | sbin_PROGRAMS = dhclient |
| 31 | dhclient_SOURCES = clparse.c dhclient.c dhc6.c \ |
| 32 | @@ -17,8 +19,8 @@ EXTRA_DIST = $(man_MANS) |
| 33 | |
| 34 | dhclient.o: dhclient.c |
| 35 | $(COMPILE) -DCLIENT_PATH='"PATH=$(sbindir):/sbin:/bin:/usr/sbin:/usr/bin"' \ |
| 36 | - -DLOCALSTATEDIR='"$(localstatedir)"' -c dhclient.c |
| 37 | + -DLOCALSTATEDIR='"$(localstatedir)"' -c $(srcdir)/dhclient.c |
| 38 | |
| 39 | dhc6.o: dhc6.c |
| 40 | $(COMPILE) -DCLIENT_PATH='"PATH=$(sbindir):/sbin:/bin:/usr/sbin:/usr/bin"' \ |
| 41 | - -DLOCALSTATEDIR='"$(localstatedir)"' -c dhc6.c |
| 42 | + -DLOCALSTATEDIR='"$(localstatedir)"' -c $(srcdir)/dhc6.c |
| 43 | diff --git a/common/Makefile.am b/common/Makefile.am |
| 44 | index eddef05..5ce045f 100644 |
| 45 | --- a/common/Makefile.am |
| 46 | +++ b/common/Makefile.am |
| 47 | @@ -1,4 +1,4 @@ |
| 48 | -AM_CPPFLAGS = -I.. -DLOCALSTATEDIR='"@localstatedir@"' |
| 49 | +AM_CPPFLAGS = -I$(top_srcdir)/includes -I$(top_srcdir) -DLOCALSTATEDIR='"@localstatedir@"' |
| 50 | AM_CFLAGS = $(LDAP_CFLAGS) |
| 51 | |
| 52 | noinst_LIBRARIES = libdhcp.a |
| 53 | diff --git a/dhcpctl/Makefile.am b/dhcpctl/Makefile.am |
| 54 | index 2987a53..cd72d75 100644 |
| 55 | --- a/dhcpctl/Makefile.am |
| 56 | +++ b/dhcpctl/Makefile.am |
| 57 | @@ -1,3 +1,5 @@ |
| 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/dst/Makefile.am b/dst/Makefile.am |
| 64 | index 8937fe8..a14798b 100644 |
| 65 | --- a/dst/Makefile.am |
| 66 | +++ b/dst/Makefile.am |
| 67 | @@ -1,4 +1,4 @@ |
| 68 | -AM_CPPFLAGS = -DMINIRES_LIB -DHMAC_MD5 |
| 69 | +AM_CPPFLAGS = -DMINIRES_LIB -DHMAC_MD5 -I$(top_srcdir)/includes |
| 70 | |
| 71 | lib_LIBRARIES = libdst.a |
| 72 | |
| 73 | diff --git a/omapip/Makefile.am b/omapip/Makefile.am |
| 74 | index 5074479..9c0fab3 100644 |
| 75 | --- a/omapip/Makefile.am |
| 76 | +++ b/omapip/Makefile.am |
| 77 | @@ -1,3 +1,5 @@ |
| 78 | +AM_CPPFLAGS = -I$(top_srcdir)/includes |
| 79 | + |
| 80 | lib_LIBRARIES = libomapi.a |
| 81 | noinst_PROGRAMS = svtest |
| 82 | |
| 83 | diff --git a/relay/Makefile.am b/relay/Makefile.am |
| 84 | index ec72a31..f842071 100644 |
| 85 | --- a/relay/Makefile.am |
| 86 | +++ b/relay/Makefile.am |
| 87 | @@ -1,4 +1,4 @@ |
| 88 | -AM_CPPFLAGS = -DLOCALSTATEDIR='"@localstatedir@"' |
| 89 | +AM_CPPFLAGS = -DLOCALSTATEDIR='"@localstatedir@"' -I$(top_srcdir)/includes |
| 90 | |
| 91 | sbin_PROGRAMS = dhcrelay |
| 92 | dhcrelay_SOURCES = dhcrelay.c |
| 93 | diff --git a/server/Makefile.am b/server/Makefile.am |
| 94 | index a446f0b..d0b873a 100644 |
| 95 | --- a/server/Makefile.am |
| 96 | +++ b/server/Makefile.am |
| 97 | @@ -4,7 +4,7 @@ |
| 98 | # production code. Sadly, we are not there yet. |
| 99 | SUBDIRS = . tests |
| 100 | |
| 101 | -AM_CPPFLAGS = -I.. -DLOCALSTATEDIR='"@localstatedir@"' |
| 102 | +AM_CPPFLAGS = -I$(top_srcdir) -DLOCALSTATEDIR='"@localstatedir@"' -I$(top_srcdir)/includes |
| 103 | |
| 104 | dist_sysconf_DATA = dhcpd.conf.example |
| 105 | sbin_PROGRAMS = dhcpd |
| 106 | -- |
| 107 | 1.9.1 |
| 108 | |