blkid: minor changes to library build system

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/.gitignore b/.gitignore
index 5b76af184087766954a695b3c020b122ce2957fa..554c164bdc7970aa9a9dec2c77fcad1faee726e9 100644 (file)
--- 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 (file)
index 0000000..96ecde5
--- /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 d5396d444d8519ffaaf47ab7951012e96c54ae09..78416938604ddcf057cf60cf55c7259e98a73fef 100644 (file)
--- 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