Fix out of tree builds with respect to libsubid includes

There's a better way to do this, and I hope to clean that up,
but this fixes out of tree builds for me right now.

Closes #386

Signed-off-by: Serge Hallyn <serge@hallyn.com>

diff --git a/lib/Makefile.am b/lib/Makefile.am
index ecf3ee253ca50d1a35e3b9d28f1a3d536363fda0..5ac2e1113b809fdaae2f248fca68ebb8808009d9 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -10,6 +10,8 @@ if HAVE_VENDORDIR
 libshadow_la_CPPFLAGS += -DVENDORDIR=\"$(VENDORDIR)\"
 endif
 
+libshadow_la_CPPFLAGS += -I$(top_srcdir)
+
 libshadow_la_SOURCES = \
        commonio.c \
        commonio.h \

diff --git a/libmisc/Makefile.am b/libmisc/Makefile.am
index 9766a7ec15daf1b11ef14e753f1e989423025264..9f237e0df8114df7bd8d5909f0d2e145f70dd3cb 100644 (file)
--- a/libmisc/Makefile.am
+++ b/libmisc/Makefile.am
@@ -1,7 +1,7 @@
 
 EXTRA_DIST = .indent.pro xgetXXbyYY.c
 
-AM_CPPFLAGS = -I$(top_srcdir)/lib $(ECONF_CPPFLAGS)
+AM_CPPFLAGS = -I$(top_srcdir)/lib -I$(top_srcdir) $(ECONF_CPPFLAGS)
 
 noinst_LTLIBRARIES = libmisc.la
 

diff --git a/libsubid/Makefile.am b/libsubid/Makefile.am
index 830515607c507f702c557a5e8d9f65cee52ffe3d..99308c1fe21bfca539b33674767f83b945fbcdaa 100644 (file)
--- a/libsubid/Makefile.am
+++ b/libsubid/Makefile.am
@@ -20,8 +20,8 @@ MISCLIBS = \
        $(LIBPAM)
 
 libsubid_la_LIBADD = \
-       $(top_srcdir)/lib/libshadow.la \
-       $(top_srcdir)/libmisc/libmisc.la \
+       $(top_builddir)/lib/libshadow.la \
+       $(top_builddir)/libmisc/libmisc.la \
        $(MISCLIBS) -ldl
 
 AM_CPPFLAGS = \

diff --git a/src/Makefile.am b/src/Makefile.am
index 350270136a6bb26e50307f3bf98a2634a0dd3cd9..7c1a34915b4c89ae171380773142a550bb8a8e33 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -10,6 +10,7 @@ sgidperms = 2755
 AM_CPPFLAGS = \
        -I${top_srcdir}/lib \
        -I$(top_srcdir)/libmisc \
+       -I$(top_srcdir) \
        -DLOCALEDIR=\"$(datadir)/locale\"
 
 # XXX why are login and su in /bin anyway (other than for
@@ -183,6 +184,7 @@ list_subid_ranges_LDADD = \
 list_subid_ranges_CPPFLAGS = \
        -I$(top_srcdir)/lib \
        -I$(top_srcdir)/libmisc \
+       -I$(top_srcdir) \
        -I$(top_srcdir)/libsubid
 
 get_subid_owners_LDADD = \
@@ -194,11 +196,13 @@ get_subid_owners_LDADD = \
 get_subid_owners_CPPFLAGS = \
        -I$(top_srcdir)/lib \
        -I$(top_srcdir)/libmisc \
+       -I$(top_srcdir) \
        -I$(top_srcdir)/libsubid
 
 new_subid_range_CPPFLAGS = \
        -I$(top_srcdir)/lib \
        -I$(top_srcdir)/libmisc \
+       -I$(top_srcdir) \
        -I$(top_srcdir)/libsubid
 
 new_subid_range_LDADD = \
@@ -210,6 +214,7 @@ new_subid_range_LDADD = \
 free_subid_range_CPPFLAGS = \
        -I$(top_srcdir)/lib \
        -I$(top_srcdir)/libmisc \
+       -I$(top_srcdir) \
        -I$(top_srcdir)/libsubid
 
 free_subid_range_LDADD = \
@@ -220,6 +225,7 @@ free_subid_range_LDADD = \
 
 check_subid_range_CPPFLAGS = \
        -I$(top_srcdir)/lib \
+       -I$(top_srcdir) \
        -I$(top_srcdir)/libmisc
 
 check_subid_range_LDADD = \