thirdparty/util-linux
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

build-sys: fix out-of-source build

Browse source 
The blkid.h file is generated and stored in $top_builddir.

Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
Karel Zak 2009-11-06 03:05:27 +01:00
parent 2935a4a49f
commit 959ac815b6
11 changed files with 18 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

3
config/include-Makefile.am
View file

@ -16,6 +16,9 @@ ul_libblkid_srcdir = $(top_srcdir)/shlibs/blkid/src
ul_libblkid_builddir = $(top_builddir)/shlibs/blkid/src
ul_libblkid_la = $(top_builddir)/shlibs/blkid/src/libblkid.la
# blkid.h is generated by ./configure script and stored in build directory
ul_libblkid_incdir = $(ul_libblkid_builddir)
$(ul_libblkid_la):
$(MAKE) -C $(ul_libblkid_builddir)

2
disk-utils/Makefile.am
View file

@ -62,7 +62,7 @@ endif
if BUILD_LIBBLKID
# only in-tree libblkid has partitions parsing support
mkswap_LDADD += $(ul_libblkid_la)
mkswap_CFLAGS += -I$(ul_libblkid_srcdir)
mkswap_CFLAGS += -I$(ul_libblkid_incdir)
endif
if HAVE_SELINUX

2
fsck/Makefile.am
View file

@ -10,7 +10,7 @@ fsck_CFLAGS =
if BUILD_LIBBLKID
fsck_LDADD += $(ul_libblkid_la)
fsck_CFLAGS += -I$(ul_libblkid_srcdir)
fsck_CFLAGS += -I$(ul_libblkid_incdir)
else
fsck_LDADD += $(BLKID_LIBS)
fsck_CFLAGS += $(BLKID_CFLAGS)

8
misc-utils/Makefile.am
View file

@ -37,17 +37,17 @@ sbin_PROGRAMS += blkid findfs wipefs
dist_man_MANS += blkid.8 findfs.8 wipefs.8
blkid_SOURCES = blkid.c $(top_srcdir)/lib/ismounted.c
blkid_LDADD = $(ul_libblkid_la)
blkid_CFLAGS = -I$(ul_libblkid_srcdir)
blkid_CFLAGS = -I$(ul_libblkid_incdir)
findfs_LDADD = $(ul_libblkid_la)
findfs_CFLAGS = -I$(ul_libblkid_srcdir)
findfs_CFLAGS = -I$(ul_libblkid_incdir)
wipefs_LDADD = $(ul_libblkid_la)
wipefs_CFLAGS = -I$(ul_libblkid_srcdir)
wipefs_CFLAGS = -I$(ul_libblkid_incdir)
if HAVE_STATIC_BLKID
sbin_PROGRAMS += blkid.static
blkid_static_SOURCES = $(blkid_SOURCES)
blkid_static_LDFLAGS = -all-static
blkid_static_LDADD = $(ul_libblkid_la)
blkid_static_CFLAGS = -I$(ul_libblkid_srcdir)
blkid_static_CFLAGS = -I$(ul_libblkid_incdir)
endif
endif

2
mount/Makefile.am
View file

@ -72,7 +72,7 @@ endif
if BUILD_LIBBLKID
ldadd_common += $(ul_libblkid_la)
ldadd_static += $(ul_libblkid_la)
cflags_common += -I$(ul_libblkid_srcdir)
cflags_common += -I$(ul_libblkid_incdir)
else
ldadd_common += $(BLKID_LIBS)
ldadd_static += $(BLKID_LIBS_STATIC)

4
shlibs/blkid/docs/Makefile.am
View file

@ -1,3 +1,5 @@
include $(top_srcdir)/config/include-Makefile.am
## Process this file with automake to produce Makefile.in
# We require automake 1.10 at least.
@ -48,7 +50,7 @@ FIXXREF_OPTIONS=
# Used for dependencies. The docs will be rebuilt if any of these change.
# e.g. HFILE_GLOB=$(top_srcdir)/gtk/*.h
# e.g. CFILE_GLOB=$(top_srcdir)/gtk/*.c
HFILE_GLOB=$(top_srcdir)/shlibs/blkid/src/blkid.h
HFILE_GLOB=$(ul_libblkid_incdir)/blkid.h
CFILE_GLOB=$(top_srcdir)/shlibs/blkid/src/*.c
# Extra header to include when scanning, which are not under DOC_SOURCE_DIR

2
shlibs/blkid/samples/Makefile.am
View file

@ -1,6 +1,6 @@
include $(top_srcdir)/config/include-Makefile.am
AM_CPPFLAGS += -I$(ul_libblkid_srcdir)
AM_CPPFLAGS += -I$(ul_libblkid_incdir)
AM_LDFLAGS += $(ul_libblkid_la)
noinst_PROGRAMS = topology partitions mkfs superblocks

2
shlibs/blkid/src/Makefile.am
View file

@ -15,7 +15,7 @@ common_cflags += $(UUID_CFLAGS)
endif
endif
AM_CPPFLAGS += -I$(ul_libblkid_srcdir) $(common_cflags)
AM_CPPFLAGS += -I$(ul_libblkid_incdir) -I$(ul_libblkid_srcdir) $(common_cflags)
# includes
blkidincdir = $(includedir)/blkid

2
shlibs/blkid/src/partitions/Makefile.am
View file

@ -1,6 +1,6 @@
include $(top_srcdir)/config/include-Makefile.am
AM_CPPFLAGS += -I$(ul_libblkid_srcdir)
AM_CPPFLAGS += -I$(ul_libblkid_incdir) -I$(ul_libblkid_srcdir)
libblkid_partitions_la_LIBADD =
noinst_LTLIBRARIES = libblkid_partitions.la

2
shlibs/blkid/src/superblocks/Makefile.am
View file

@ -1,6 +1,6 @@
include $(top_srcdir)/config/include-Makefile.am
AM_CPPFLAGS += -I$(ul_libblkid_srcdir)
AM_CPPFLAGS += -I$(ul_libblkid_incdir) -I$(ul_libblkid_srcdir)
noinst_LTLIBRARIES = libblkid_superblocks.la
libblkid_superblocks_la_SOURCES = \

2
shlibs/blkid/src/topology/Makefile.am
View file

@ -1,6 +1,6 @@
include $(top_srcdir)/config/include-Makefile.am
AM_CPPFLAGS += -I$(ul_libblkid_srcdir)
AM_CPPFLAGS += -I$(ul_libblkid_incdir) -I$(ul_libblkid_srcdir)
libblkid_topology_la_LIBADD =
noinst_LTLIBRARIES = libblkid_topology.la