| 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 | --- |
| Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 10 | diff --git a/client/Makefile.am b/client/Makefile.am |
| 11 | index 8411960..1740f72 100644 |
| 12 | --- a/client/Makefile.am |
| 13 | +++ b/client/Makefile.am |
| 14 | @@ -4,6 +4,8 @@ |
| 15 | # production code. Sadly, we are not there yet. |
| 16 | SUBDIRS = . tests |
| 17 | |
| 18 | +AM_CPPFLAGS = -I$(top_srcdir)/includes |
| 19 | + |
| 20 | dist_sysconf_DATA = dhclient.conf.example |
| 21 | sbin_PROGRAMS = dhclient |
| 22 | dhclient_SOURCES = clparse.c dhclient.c dhc6.c \ |
| 23 | @@ -17,8 +19,8 @@ EXTRA_DIST = $(man_MANS) |
| 24 | |
| 25 | dhclient.o: dhclient.c |
| 26 | $(COMPILE) -DCLIENT_PATH='"PATH=$(sbindir):/sbin:/bin:/usr/sbin:/usr/bin"' \ |
| 27 | - -DLOCALSTATEDIR='"$(localstatedir)"' -c dhclient.c |
| 28 | + -DLOCALSTATEDIR='"$(localstatedir)"' -c $(srcdir)/dhclient.c |
| 29 | |
| 30 | dhc6.o: dhc6.c |
| 31 | $(COMPILE) -DCLIENT_PATH='"PATH=$(sbindir):/sbin:/bin:/usr/sbin:/usr/bin"' \ |
| 32 | - -DLOCALSTATEDIR='"$(localstatedir)"' -c dhc6.c |
| 33 | + -DLOCALSTATEDIR='"$(localstatedir)"' -c $(srcdir)/dhc6.c |
| 34 | diff --git a/common/Makefile.am b/common/Makefile.am |
| 35 | index eddef05..5ce045f 100644 |
| 36 | --- a/common/Makefile.am |
| 37 | +++ b/common/Makefile.am |
| 38 | @@ -1,4 +1,4 @@ |
| 39 | -AM_CPPFLAGS = -I.. -DLOCALSTATEDIR='"@localstatedir@"' |
| 40 | +AM_CPPFLAGS = -I$(top_srcdir)/includes -I$(top_srcdir) -DLOCALSTATEDIR='"@localstatedir@"' |
| 41 | AM_CFLAGS = $(LDAP_CFLAGS) |
| 42 | |
| 43 | noinst_LIBRARIES = libdhcp.a |
| 44 | diff --git a/dhcpctl/Makefile.am b/dhcpctl/Makefile.am |
| 45 | index 2987a53..cd72d75 100644 |
| 46 | --- a/dhcpctl/Makefile.am |
| 47 | +++ b/dhcpctl/Makefile.am |
| 48 | @@ -1,3 +1,5 @@ |
| 49 | +AM_CPPFLAGS = -I$(top_srcdir)/includes -I$(top_srcdir) |
| 50 | + |
| 51 | bin_PROGRAMS = omshell |
| 52 | lib_LIBRARIES = libdhcpctl.a |
| 53 | noinst_PROGRAMS = cltest |
| Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 54 | diff --git a/omapip/Makefile.am b/omapip/Makefile.am |
| 55 | index 5074479..9c0fab3 100644 |
| 56 | --- a/omapip/Makefile.am |
| 57 | +++ b/omapip/Makefile.am |
| 58 | @@ -1,3 +1,5 @@ |
| 59 | +AM_CPPFLAGS = -I$(top_srcdir)/includes |
| 60 | + |
| 61 | lib_LIBRARIES = libomapi.a |
| 62 | noinst_PROGRAMS = svtest |
| 63 | |
| 64 | diff --git a/relay/Makefile.am b/relay/Makefile.am |
| 65 | index ec72a31..f842071 100644 |
| 66 | --- a/relay/Makefile.am |
| 67 | +++ b/relay/Makefile.am |
| 68 | @@ -1,4 +1,4 @@ |
| 69 | -AM_CPPFLAGS = -DLOCALSTATEDIR='"@localstatedir@"' |
| 70 | +AM_CPPFLAGS = -DLOCALSTATEDIR='"@localstatedir@"' -I$(top_srcdir)/includes |
| 71 | |
| 72 | sbin_PROGRAMS = dhcrelay |
| 73 | dhcrelay_SOURCES = dhcrelay.c |
| 74 | diff --git a/server/Makefile.am b/server/Makefile.am |
| 75 | index a446f0b..d0b873a 100644 |
| 76 | --- a/server/Makefile.am |
| 77 | +++ b/server/Makefile.am |
| 78 | @@ -4,7 +4,7 @@ |
| 79 | # production code. Sadly, we are not there yet. |
| 80 | SUBDIRS = . tests |
| 81 | |
| 82 | -AM_CPPFLAGS = -I.. -DLOCALSTATEDIR='"@localstatedir@"' |
| 83 | +AM_CPPFLAGS = -I$(top_srcdir) -DLOCALSTATEDIR='"@localstatedir@"' -I$(top_srcdir)/includes |
| 84 | |
| 85 | dist_sysconf_DATA = dhcpd.conf.example |
| 86 | sbin_PROGRAMS = dhcpd |
| 87 | -- |
| 88 | 1.9.1 |
| 89 | |