emo/shadow
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

Fix out of tree builds with respect to libsubid includes

Browse Source 
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>
This commit is contained in:
Serge Hallyn 2021-07-23 17:51:13 -05:00
parent d4b6d1549b
commit 537b8cd90b
4 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Makefile.am
View File

@ -10,6 +10,8 @@ if HAVE_VENDORDIR
libshadow_la_CPPFLAGS += -DVENDORDIR=\"$(VENDORDIR)\" libshadow_la_CPPFLAGS += -DVENDORDIR=\"$(VENDORDIR)\"
endif endif
libshadow_la_CPPFLAGS += -I$(top_srcdir)
libshadow_la_SOURCES = \ libshadow_la_SOURCES = \
commonio.c \ commonio.c \
commonio.h \ commonio.h \

2
libmisc/Makefile.am
View File

@ -1,7 +1,7 @@
EXTRA_DIST = .indent.pro xgetXXbyYY.c 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 noinst_LTLIBRARIES = libmisc.la

4
libsubid/Makefile.am
View File

@ -20,8 +20,8 @@ MISCLIBS = \
$(LIBPAM) $(LIBPAM)
libsubid_la_LIBADD = \ libsubid_la_LIBADD = \
$(top_srcdir)/lib/libshadow.la \ $(top_builddir)/lib/libshadow.la \
$(top_srcdir)/libmisc/libmisc.la \ $(top_builddir)/libmisc/libmisc.la \
$(MISCLIBS) -ldl $(MISCLIBS) -ldl
AM_CPPFLAGS = \ AM_CPPFLAGS = \

6
src/Makefile.am
View File

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