| From cccec0344d68dac4100b6f260ee24e7c2da9dfda Mon Sep 17 00:00:00 2001 |
| From: Hongxu Jia <hongxu.jia@windriver.com> |
| Date: Tue, 15 Aug 2017 15:08:22 +0800 |
| Subject: [PATCH 04/11] Fix out of tree builds |
| |
| Upstream-Status: Pending |
| |
| RP 2013/03/21 |
| |
| Rebase to 4.3.6 |
| |
| Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> |
| --- |
| client/Makefile.am | 4 ++-- |
| common/Makefile.am | 3 ++- |
| dhcpctl/Makefile.am | 2 ++ |
| omapip/Makefile.am | 1 + |
| relay/Makefile.am | 2 +- |
| server/Makefile.am | 2 +- |
| 6 files changed, 9 insertions(+), 5 deletions(-) |
| |
| Index: dhcp-4.4.1/common/Makefile.am |
| =================================================================== |
| --- dhcp-4.4.1.orig/common/Makefile.am |
| +++ dhcp-4.4.1/common/Makefile.am |
| @@ -1,4 +1,5 @@ |
| -AM_CPPFLAGS = -I$(top_srcdir) -DLOCALSTATEDIR='"@localstatedir@"' |
| +AM_CPPFLAGS = -I$(top_srcdir)/includes -I$(top_srcdir) -DLOCALSTATEDIR='"@localstatedir@"' |
| + |
| AM_CFLAGS = $(LDAP_CFLAGS) |
| |
| lib_LIBRARIES = libdhcp.a |
| Index: dhcp-4.4.1/dhcpctl/Makefile.am |
| =================================================================== |
| --- dhcp-4.4.1.orig/dhcpctl/Makefile.am |
| +++ dhcp-4.4.1/dhcpctl/Makefile.am |
| @@ -3,6 +3,8 @@ BINDLIBDNSDIR=@BINDLIBDNSDIR@ |
| BINDLIBISCCFGDIR=@BINDLIBISCCFGDIR@ |
| BINDLIBISCDIR=@BINDLIBISCDIR@ |
| |
| +AM_CPPFLAGS = -I$(top_srcdir)/includes -I$(top_srcdir) |
| + |
| bin_PROGRAMS = omshell |
| lib_LIBRARIES = libdhcpctl.a |
| noinst_PROGRAMS = cltest |
| Index: dhcp-4.4.1/server/Makefile.am |
| =================================================================== |
| --- dhcp-4.4.1.orig/server/Makefile.am |
| +++ dhcp-4.4.1/server/Makefile.am |
| @@ -4,7 +4,7 @@ |
| # production code. Sadly, we are not there yet. |
| SUBDIRS = . tests |
| |
| -AM_CPPFLAGS = -I.. -DLOCALSTATEDIR='"@localstatedir@"' |
| +AM_CPPFLAGS = -I$(top_srcdir) -DLOCALSTATEDIR='"@localstatedir@"' -I$(top_srcdir)/includes |
| |
| dist_sysconf_DATA = dhcpd.conf.example |
| sbin_PROGRAMS = dhcpd |
| Index: dhcp-4.4.1/client/Makefile.am |
| =================================================================== |
| --- dhcp-4.4.1.orig/client/Makefile.am |
| +++ dhcp-4.4.1/client/Makefile.am |
| @@ -5,7 +5,7 @@ |
| SUBDIRS = . tests |
| |
| AM_CPPFLAGS = -DCLIENT_PATH='"PATH=$(sbindir):/sbin:/bin:/usr/sbin:/usr/bin"' |
| -AM_CPPFLAGS += -DLOCALSTATEDIR='"$(localstatedir)"' |
| +AM_CPPFLAGS += -DLOCALSTATEDIR='"$(localstatedir)"' -I$(top_srcdir)/includes |
| |
| dist_sysconf_DATA = dhclient.conf.example |
| sbin_PROGRAMS = dhclient |
| Index: dhcp-4.4.1/omapip/Makefile.am |
| =================================================================== |
| --- dhcp-4.4.1.orig/omapip/Makefile.am |
| +++ dhcp-4.4.1/omapip/Makefile.am |
| @@ -2,6 +2,7 @@ BINDLIBIRSDIR=@BINDLIBIRSDIR@ |
| BINDLIBDNSDIR=@BINDLIBDNSDIR@ |
| BINDLIBISCCFGDIR=@BINDLIBISCCFGDIR@ |
| BINDLIBISCDIR=@BINDLIBISCDIR@ |
| +AM_CPPFLAGS = -I$(top_srcdir)/includes |
| |
| lib_LIBRARIES = libomapi.a |
| noinst_PROGRAMS = svtest |
| Index: dhcp-4.4.1/relay/Makefile.am |
| =================================================================== |
| --- dhcp-4.4.1.orig/relay/Makefile.am |
| +++ dhcp-4.4.1/relay/Makefile.am |
| @@ -1,6 +1,6 @@ |
| SUBDIRS = . tests |
| |
| -AM_CPPFLAGS = -DLOCALSTATEDIR='"@localstatedir@"' |
| +AM_CPPFLAGS = -DLOCALSTATEDIR='"@localstatedir@"' -I$(top_srcdir)/includes |
| |
| sbin_PROGRAMS = dhcrelay |
| dhcrelay_SOURCES = dhcrelay.c |