Fix out of tree builds Upstream-Status: Pending RP 2013/03/21 Rebase to 4.3.1 Signed-off-by: Hongxu Jia --- client/Makefile.am | 6 ++++-- common/Makefile.am | 2 +- dhcpctl/Makefile.am | 2 ++ dst/Makefile.am | 2 +- omapip/Makefile.am | 2 ++ relay/Makefile.am | 2 +- server/Makefile.am | 2 +- 7 files changed, 12 insertions(+), 6 deletions(-) diff --git a/client/Makefile.am b/client/Makefile.am index 8411960..1740f72 100644 --- a/client/Makefile.am +++ b/client/Makefile.am @@ -4,6 +4,8 @@ # production code. Sadly, we are not there yet. SUBDIRS = . tests +AM_CPPFLAGS = -I$(top_srcdir)/includes + dist_sysconf_DATA = dhclient.conf.example sbin_PROGRAMS = dhclient dhclient_SOURCES = clparse.c dhclient.c dhc6.c \ @@ -17,8 +19,8 @@ EXTRA_DIST = $(man_MANS) dhclient.o: dhclient.c $(COMPILE) -DCLIENT_PATH='"PATH=$(sbindir):/sbin:/bin:/usr/sbin:/usr/bin"' \ - -DLOCALSTATEDIR='"$(localstatedir)"' -c dhclient.c + -DLOCALSTATEDIR='"$(localstatedir)"' -c $(srcdir)/dhclient.c dhc6.o: dhc6.c $(COMPILE) -DCLIENT_PATH='"PATH=$(sbindir):/sbin:/bin:/usr/sbin:/usr/bin"' \ - -DLOCALSTATEDIR='"$(localstatedir)"' -c dhc6.c + -DLOCALSTATEDIR='"$(localstatedir)"' -c $(srcdir)/dhc6.c diff --git a/common/Makefile.am b/common/Makefile.am index eddef05..5ce045f 100644 --- a/common/Makefile.am +++ b/common/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS = -I.. -DLOCALSTATEDIR='"@localstatedir@"' +AM_CPPFLAGS = -I$(top_srcdir)/includes -I$(top_srcdir) -DLOCALSTATEDIR='"@localstatedir@"' AM_CFLAGS = $(LDAP_CFLAGS) noinst_LIBRARIES = libdhcp.a diff --git a/dhcpctl/Makefile.am b/dhcpctl/Makefile.am index 2987a53..cd72d75 100644 --- a/dhcpctl/Makefile.am +++ b/dhcpctl/Makefile.am @@ -1,3 +1,5 @@ +AM_CPPFLAGS = -I$(top_srcdir)/includes -I$(top_srcdir) + bin_PROGRAMS = omshell lib_LIBRARIES = libdhcpctl.a noinst_PROGRAMS = cltest diff --git a/dst/Makefile.am b/dst/Makefile.am index 8937fe8..a14798b 100644 --- a/dst/Makefile.am +++ b/dst/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS = -DMINIRES_LIB -DHMAC_MD5 +AM_CPPFLAGS = -DMINIRES_LIB -DHMAC_MD5 -I$(top_srcdir)/includes lib_LIBRARIES = libdst.a diff --git a/omapip/Makefile.am b/omapip/Makefile.am index 5074479..9c0fab3 100644 --- a/omapip/Makefile.am +++ b/omapip/Makefile.am @@ -1,3 +1,5 @@ +AM_CPPFLAGS = -I$(top_srcdir)/includes + lib_LIBRARIES = libomapi.a noinst_PROGRAMS = svtest diff --git a/relay/Makefile.am b/relay/Makefile.am index ec72a31..f842071 100644 --- a/relay/Makefile.am +++ b/relay/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS = -DLOCALSTATEDIR='"@localstatedir@"' +AM_CPPFLAGS = -DLOCALSTATEDIR='"@localstatedir@"' -I$(top_srcdir)/includes sbin_PROGRAMS = dhcrelay dhcrelay_SOURCES = dhcrelay.c diff --git a/server/Makefile.am b/server/Makefile.am index a446f0b..d0b873a 100644 --- a/server/Makefile.am +++ b/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 -- 1.9.1