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 | |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 22 | Index: dhcp-4.4.1/common/Makefile.am |
| 23 | =================================================================== |
| 24 | --- dhcp-4.4.1.orig/common/Makefile.am |
| 25 | +++ dhcp-4.4.1/common/Makefile.am |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 26 | @@ -1,4 +1,5 @@ |
| 27 | -AM_CPPFLAGS = -I$(top_srcdir) -DLOCALSTATEDIR='"@localstatedir@"' |
| 28 | +AM_CPPFLAGS = -I$(top_srcdir)/includes -I$(top_srcdir) -DLOCALSTATEDIR='"@localstatedir@"' |
| 29 | + |
| 30 | AM_CFLAGS = $(LDAP_CFLAGS) |
| 31 | |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 32 | lib_LIBRARIES = libdhcp.a |
| 33 | Index: dhcp-4.4.1/dhcpctl/Makefile.am |
| 34 | =================================================================== |
| 35 | --- dhcp-4.4.1.orig/dhcpctl/Makefile.am |
| 36 | +++ dhcp-4.4.1/dhcpctl/Makefile.am |
| 37 | @@ -3,6 +3,8 @@ BINDLIBDNSDIR=@BINDLIBDNSDIR@ |
| 38 | BINDLIBISCCFGDIR=@BINDLIBISCCFGDIR@ |
| 39 | BINDLIBISCDIR=@BINDLIBISCDIR@ |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 40 | |
| 41 | +AM_CPPFLAGS = -I$(top_srcdir)/includes -I$(top_srcdir) |
| 42 | + |
| 43 | bin_PROGRAMS = omshell |
| 44 | lib_LIBRARIES = libdhcpctl.a |
| 45 | noinst_PROGRAMS = cltest |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 46 | Index: dhcp-4.4.1/server/Makefile.am |
| 47 | =================================================================== |
| 48 | --- dhcp-4.4.1.orig/server/Makefile.am |
| 49 | +++ dhcp-4.4.1/server/Makefile.am |
| 50 | @@ -4,7 +4,7 @@ |
| 51 | # production code. Sadly, we are not there yet. |
| 52 | SUBDIRS = . tests |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 53 | |
| 54 | -AM_CPPFLAGS = -I.. -DLOCALSTATEDIR='"@localstatedir@"' |
| 55 | +AM_CPPFLAGS = -I$(top_srcdir) -DLOCALSTATEDIR='"@localstatedir@"' -I$(top_srcdir)/includes |
| 56 | |
| 57 | dist_sysconf_DATA = dhcpd.conf.example |
| 58 | sbin_PROGRAMS = dhcpd |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 59 | Index: dhcp-4.4.1/client/Makefile.am |
| 60 | =================================================================== |
| 61 | --- dhcp-4.4.1.orig/client/Makefile.am |
| 62 | +++ dhcp-4.4.1/client/Makefile.am |
| 63 | @@ -5,7 +5,7 @@ |
| 64 | SUBDIRS = . tests |
| 65 | |
| 66 | AM_CPPFLAGS = -DCLIENT_PATH='"PATH=$(sbindir):/sbin:/bin:/usr/sbin:/usr/bin"' |
| 67 | -AM_CPPFLAGS += -DLOCALSTATEDIR='"$(localstatedir)"' |
| 68 | +AM_CPPFLAGS += -DLOCALSTATEDIR='"$(localstatedir)"' -I$(top_srcdir)/includes |
| 69 | |
| 70 | dist_sysconf_DATA = dhclient.conf.example |
| 71 | sbin_PROGRAMS = dhclient |
| 72 | Index: dhcp-4.4.1/omapip/Makefile.am |
| 73 | =================================================================== |
| 74 | --- dhcp-4.4.1.orig/omapip/Makefile.am |
| 75 | +++ dhcp-4.4.1/omapip/Makefile.am |
| 76 | @@ -2,6 +2,7 @@ BINDLIBIRSDIR=@BINDLIBIRSDIR@ |
| 77 | BINDLIBDNSDIR=@BINDLIBDNSDIR@ |
| 78 | BINDLIBISCCFGDIR=@BINDLIBISCCFGDIR@ |
| 79 | BINDLIBISCDIR=@BINDLIBISCDIR@ |
| 80 | +AM_CPPFLAGS = -I$(top_srcdir)/includes |
| 81 | |
| 82 | lib_LIBRARIES = libomapi.a |
| 83 | noinst_PROGRAMS = svtest |
| 84 | Index: dhcp-4.4.1/relay/Makefile.am |
| 85 | =================================================================== |
| 86 | --- dhcp-4.4.1.orig/relay/Makefile.am |
| 87 | +++ dhcp-4.4.1/relay/Makefile.am |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 88 | @@ -1,6 +1,6 @@ |
| 89 | SUBDIRS = . tests |
| 90 | |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 91 | -AM_CPPFLAGS = -DLOCALSTATEDIR='"@localstatedir@"' |
| 92 | +AM_CPPFLAGS = -DLOCALSTATEDIR='"@localstatedir@"' -I$(top_srcdir)/includes |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 93 | |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 94 | sbin_PROGRAMS = dhcrelay |
| 95 | dhcrelay_SOURCES = dhcrelay.c |