summaryrefslogtreecommitdiffstats
path: root/libs
diff options
context:
space:
mode:
authorKarel Zak2008-08-27 15:22:50 +0200
committerKarel Zak2009-02-11 23:21:43 +0100
commitca7eeefdfa50dc33ea7cd075ae73d81b018f9dfd (patch)
tree1760168b2db84ced92094a840c175caa1416d27d /libs
parentblkid: merge libblkid code from e2fsprogs/lib/blkid (diff)
downloadkernel-qcow2-util-linux-ca7eeefdfa50dc33ea7cd075ae73d81b018f9dfd.tar.gz
kernel-qcow2-util-linux-ca7eeefdfa50dc33ea7cd075ae73d81b018f9dfd.tar.xz
kernel-qcow2-util-linux-ca7eeefdfa50dc33ea7cd075ae73d81b018f9dfd.zip
blkid: minor changes to library build system
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'libs')
-rw-r--r--libs/blkid/.gitignore2
-rw-r--r--libs/blkid/src/Makefile.am6
2 files changed, 5 insertions, 3 deletions
diff --git a/libs/blkid/.gitignore b/libs/blkid/.gitignore
new file mode 100644
index 000000000..96ecde5b7
--- /dev/null
+++ b/libs/blkid/.gitignore
@@ -0,0 +1,2 @@
+*.3
+blkid_types.h
diff --git a/libs/blkid/src/Makefile.am b/libs/blkid/src/Makefile.am
index d5396d444..784169386 100644
--- a/libs/blkid/src/Makefile.am
+++ b/libs/blkid/src/Makefile.am
@@ -6,7 +6,7 @@ AM_CPPFLAGS += -I$(top_builddir)/blkid/src
lib_LIBRARIES = libblkid.a
libblkid_a_SOURCES = cache.c dev.c devname.c devno.c getsize.c llseek.c \
probe.c read.c resolve.c save.c tag.c version.c \
- blkid.h blkidP.h list.h
+ blkid.h blkidP.h list.h blkid_types.h
libblkid_a_CFLAGS = -fPIC
# shared library (note that we don't use LIBTOOL!)
@@ -20,14 +20,14 @@ if HAVE_DEVMAPPER
blkid_OTHERLDADD = $(DEVMAPPER_LIBS)
endif
-EXTRA_DIST = blkid.sym
+EXTRA_DIST = blkid.sym blkid_types.h.in
all-local: $(blkid_LIB)
$(blkid_LIB): $(lib_LIBRARIES) $(blkid_LDSCRIPT)
$(CC) --shared -o $(blkid_LIB) $(AM_LDFLAGS) \
-Wl,-soname,$(blkid_SONAME),--version-script,$(blkid_LDSCRIPT) \
- $(blkid_a_OBJECTS) $(blkid_OTHERLDADD)
+ $(libblkid_a_OBJECTS) $(blkid_OTHERLDADD)
for I in $(blkid_LINKS); do \
ln -sf $(blkid_LIB) $$I; \
done