From ca7eeefdfa50dc33ea7cd075ae73d81b018f9dfd Mon Sep 17 00:00:00 2001
From: Karel Zak <kzak@redhat.com>
Date: Wed, 27 Aug 2008 15:22:50 +0200
Subject: [PATCH] blkid: minor changes to library build system

Signed-off-by: Karel Zak <kzak@redhat.com>
---
 .gitignore                 | 3 +++
 libs/blkid/.gitignore      | 2 ++
 libs/blkid/src/Makefile.am | 6 +++---
 3 files changed, 8 insertions(+), 3 deletions(-)
 create mode 100644 libs/blkid/.gitignore

diff --git a/.gitignore b/.gitignore
index 5b76af18..554c164b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,9 @@
 *~
 *.[ao]
 *.static
+*.so
+*.so.*
+*.pc
 Makefile
 aclocal.m4
 autom4te.cache
diff --git a/libs/blkid/.gitignore b/libs/blkid/.gitignore
new file mode 100644
index 00000000..96ecde5b
--- /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 d5396d44..78416938 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
-- 
2.39.5