build-sys: convert libblkid/ to module

 - create module
 - remove unused libblkid/src/tst_types.c test

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

10 files changed, 262 insertions, 288 deletions

diff --git a/libblkid/Makefile.am b/libblkid/Makefile.am
deleted file mode 100644
index 1fcd5bfae..000000000
--- a/libblkid/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-include $(top_srcdir)/config/include-Makefile.am
-
-SUBDIRS = src samples
-
-if ENABLE_GTK_DOC
-SUBDIRS += docs
-endif
-
-# pkg-config stuff
-pkgconfigdir = $(usrlib_execdir)/pkgconfig
-pkgconfig_DATA = blkid.pc
-
-dist_man_MANS = libblkid.3
-
-EXTRA_DIST = blkid.pc.in libblkid.3
diff --git a/libblkid/Makemodule.am b/libblkid/Makemodule.am
new file mode 100644
index 000000000..ff77dcd0c
--- /dev/null
+++ b/libblkid/Makemodule.am
@@ -0,0 +1,12 @@
+if BUILD_LIBBLKID
+
+include libblkid/src/Makemodule.am
+include libblkid/samples/Makemodule.am
+
+#include libblkid/docs/Makemodule.am
+
+pkgconfig_DATA += libblkid/blkid.pc
+dist_man_MANS  += libblkid/libblkid.3
+EXTRA_DIST     += libblkid/blkid.pc.in libblkid/libblkid.3
+
+endif # BUILD_LIBBLKID
diff --git a/libblkid/samples/Makefile.am b/libblkid/samples/Makefile.am
deleted file mode 100644
index c6314a7db..000000000
--- a/libblkid/samples/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-include $(top_srcdir)/config/include-Makefile.am
-
-AM_CPPFLAGS += -I$(ul_libblkid_incdir)
-AM_LDFLAGS += $(ul_libblkid_la)
-
-noinst_PROGRAMS = \
-	mkfs \
-	partitions \
-	superblocks \
-	topology
diff --git a/libblkid/samples/Makemodule.am b/libblkid/samples/Makemodule.am
new file mode 100644
index 000000000..f76457a6d
--- /dev/null
+++ b/libblkid/samples/Makemodule.am
@@ -0,0 +1,22 @@
+
+noinst_PROGRAMS += \
+	sample-mkfs \
+	sample-partitions \
+	sample-superblocks \
+	sample-topology
+
+sample_mkfs_SOURCES = libblkid/samples/mkfs.c
+sample_mkfs_LDADD = libblkid.la
+sample_mkfs_CFLAGS = -I$(ul_libblkid_incdir)
+
+sample_partitions_SOURCES = libblkid/samples/partitions.c
+sample_partitions_LDADD = libblkid.la
+sample_partitions_CFLAGS = -I$(ul_libblkid_incdir)
+
+sample_superblocks_SOURCES = libblkid/samples/superblocks.c
+sample_superblocks_LDADD = libblkid.la
+sample_superblocks_CFLAGS = -I$(ul_libblkid_incdir)
+
+sample_topology_SOURCES = libblkid/samples/topology.c
+sample_topology_LDADD = libblkid.la
+sample_topology_CFLAGS = -I$(ul_libblkid_incdir)
diff --git a/libblkid/src/Makefile.am b/libblkid/src/Makefile.am
deleted file mode 100644
index 478625029..000000000
--- a/libblkid/src/Makefile.am
+++ /dev/null
@@ -1,106 +0,0 @@
-include $(top_srcdir)/config/include-Makefile.am
-
-SUBDIRS = \
-	partitions \
-	superblocks \
-	topology \
-	.
-
-common_ldadd =
-common_cflags =
-
-if BUILD_LIBUUID
-common_ldadd += $(ul_libuuid_la)
-common_cflags += -I$(ul_libuuid_srcdir)
-endif
-
-AM_CPPFLAGS += \
-	-I$(ul_libblkid_incdir) \
-	-I$(ul_libblkid_srcdir) \
-	$(common_cflags)
-
-# includes
-blkidincdir = $(includedir)/blkid
-nodist_blkidinc_HEADERS = blkid.h
-
-usrlib_exec_LTLIBRARIES = libblkid.la
-libblkid_la_SOURCES = \
-	blkidP.h \
-	cache.c \
-	config.c \
-	dev.c \
-	devname.c \
-	devno.c \
-	encode.c \
-	evaluate.c \
-	getsize.c \
-	llseek.c \
-	probe.c \
-	read.c \
-	resolve.c \
-	save.c \
-	superblocks/superblocks.h \
-	tag.c \
-	verify.c \
-	version.c \
-	$(blkidinc_HEADERS) \
-	$(top_srcdir)/include/list.h \
-	$(top_srcdir)/lib/at.c \
-	$(top_srcdir)/lib/blkdev.c \
-	$(top_srcdir)/lib/canonicalize.c \
-	$(top_srcdir)/lib/crc32.c \
-	$(top_srcdir)/lib/env.c \
-	$(top_srcdir)/lib/linux_version.c \
-	$(top_srcdir)/lib/md5.c \
-	$(top_srcdir)/lib/strutils.c \
-	$(top_srcdir)/lib/sysfs.c
-
-nodist_libblkid_la_SOURCES = blkid.h
-
-libblkid_la_LIBADD = \
-	partitions/libblkid_partitions.la \
-	superblocks/libblkid_superblocks.la \
-	topology/libblkid_topology.la \
-	$(common_ldadd)
-
-libblkid_la_DEPENDENCIES = $(libblkid_la_LIBADD) blkid.sym blkid.h.in
-
-libblkid_la_LDFLAGS = \
-	-Wl,--version-script=$(ul_libblkid_srcdir)/blkid.sym \
-	-version-info $(LIBBLKID_VERSION_INFO)
-
-tests = \
-	test_cache \
-	test_config \
-	test_dev \
-	test_devname \
-	test_devno \
-	test_evaluate
-	test_read \
-	test_resolve \
-	test_save \
-	test_tag \
-	test_verify
-
-EXTRA_DIST = blkid.sym tst_types.c blkid.h.in
-CLEANFILES = $(tests)
-
-tests: all $(tests)
-test_%: %.c
-	$(AM_V_CC)$(COMPILE) -DTEST_PROGRAM $< .libs/libblkid.a -o $@ -luuid
-
-
-# move lib from $(usrlib_execdir) to $(libdir) if needed
-install-exec-hook:
-	if test "$(usrlib_execdir)" != "$(libdir)"; then \
-		mkdir -p $(DESTDIR)$(libdir); \
-		mv $(DESTDIR)$(usrlib_execdir)/libblkid.so.* $(DESTDIR)$(libdir); \
-		so_img_name=$$(readlink $(DESTDIR)$(usrlib_execdir)/libblkid.so); \
-		so_img_rel_target=$$(echo $(usrlib_execdir) | sed 's,\(^/\|\)[^/][^/]*,..,g'); \
-		(cd $(DESTDIR)$(usrlib_execdir) && \
-			rm -f libblkid.so && \
-			$(LN_S) $$so_img_rel_target$(libdir)/$$so_img_name libblkid.so); \
-	fi
-
-uninstall-hook:
-	rm -f $(DESTDIR)$(libdir)/libblkid.so*
diff --git a/libblkid/src/Makemodule.am b/libblkid/src/Makemodule.am
new file mode 100644
index 000000000..c1a2f4cab
--- /dev/null
+++ b/libblkid/src/Makemodule.am
@@ -0,0 +1,228 @@
+
+# blkid.h is generated, so it's store in builddir!
+blkidincdir = $(includedir)/blkid
+nodist_blkidinc_HEADERS = $(top_builddir)/libblkid/src/blkid.h
+
+usrlib_exec_LTLIBRARIES += libblkid.la
+libblkid_la_SOURCES = \
+	include/list.h \
+	lib/at.c \
+	lib/blkdev.c \
+	lib/canonicalize.c \
+	lib/crc32.c \
+	lib/env.c \
+	lib/linux_version.c \
+	lib/md5.c \
+	lib/strutils.c \
+	lib/sysfs.c \
+	\
+	libblkid/src/blkidP.h \
+	libblkid/src/cache.c \
+	libblkid/src/config.c \
+	libblkid/src/dev.c \
+	libblkid/src/devname.c \
+	libblkid/src/devno.c \
+	libblkid/src/encode.c \
+	libblkid/src/evaluate.c \
+	libblkid/src/getsize.c \
+	libblkid/src/llseek.c \
+	libblkid/src/probe.c \
+	libblkid/src/read.c \
+	libblkid/src/resolve.c \
+	libblkid/src/save.c \
+	libblkid/src/superblocks/superblocks.h \
+	libblkid/src/tag.c \
+	libblkid/src/verify.c \
+	libblkid/src/version.c \
+	$(blkidinc_HEADERS) \
+	\
+	libblkid/src/partitions/aix.c \
+	libblkid/src/partitions/aix.h \
+	libblkid/src/partitions/blkid_parttypes.h \
+	libblkid/src/partitions/bsd.c \
+	libblkid/src/partitions/dos.c \
+	libblkid/src/partitions/dos.h \
+	libblkid/src/partitions/gpt.c \
+	libblkid/src/partitions/mac.c \
+	libblkid/src/partitions/minix.c \
+	libblkid/src/partitions/partitions.c \
+	libblkid/src/partitions/partitions.h \
+	libblkid/src/partitions/sgi.c \
+	libblkid/src/partitions/solaris_x86.c \
+	libblkid/src/partitions/sun.c \
+	libblkid/src/partitions/ultrix.c \
+	libblkid/src/partitions/unixware.c \
+	\
+	libblkid/src/superblocks/adaptec_raid.c \
+	libblkid/src/superblocks/befs.c \
+	libblkid/src/superblocks/bfs.c \
+	libblkid/src/superblocks/btrfs.c \
+	libblkid/src/superblocks/cramfs.c \
+	libblkid/src/superblocks/ddf_raid.c \
+	libblkid/src/superblocks/drbd.c \
+	libblkid/src/superblocks/drbdproxy_datalog.c \
+	libblkid/src/superblocks/exfat.c \
+	libblkid/src/superblocks/ext.c \
+	libblkid/src/superblocks/gfs.c \
+	libblkid/src/superblocks/hfs.c \
+	libblkid/src/superblocks/highpoint_raid.c \
+	libblkid/src/superblocks/hpfs.c \
+	libblkid/src/superblocks/iso9660.c \
+	libblkid/src/superblocks/isw_raid.c \
+	libblkid/src/superblocks/jfs.c \
+	libblkid/src/superblocks/jmicron_raid.c \
+	libblkid/src/superblocks/linux_raid.c \
+	libblkid/src/superblocks/lsi_raid.c \
+	libblkid/src/superblocks/luks.c \
+	libblkid/src/superblocks/lvm.c \
+	libblkid/src/superblocks/minix.c \
+	libblkid/src/superblocks/netware.c \
+	libblkid/src/superblocks/nilfs.c \
+	libblkid/src/superblocks/ntfs.c \
+	libblkid/src/superblocks/nvidia_raid.c \
+	libblkid/src/superblocks/ocfs.c \
+	libblkid/src/superblocks/promise_raid.c \
+	libblkid/src/superblocks/reiserfs.c \
+	libblkid/src/superblocks/romfs.c \
+	libblkid/src/superblocks/silicon_raid.c \
+	libblkid/src/superblocks/squashfs.c \
+	libblkid/src/superblocks/superblocks.c \
+	libblkid/src/superblocks/superblocks.h \
+	libblkid/src/superblocks/swap.c \
+	libblkid/src/superblocks/sysv.c \
+	libblkid/src/superblocks/ubifs.c \
+	libblkid/src/superblocks/udf.c \
+	libblkid/src/superblocks/ufs.c \
+	libblkid/src/superblocks/vfat.c \
+	libblkid/src/superblocks/via_raid.c \
+	libblkid/src/superblocks/vmfs.c \
+	libblkid/src/superblocks/vxfs.c \
+	libblkid/src/superblocks/xfs.c \
+	libblkid/src/superblocks/zfs.c \
+	\
+	libblkid/src/topology/topology.c \
+	libblkid/src/topology/topology.h
+
+if LINUX
+libblkid_la_SOURCES += \
+	libblkid/src/topology/dm.c \
+	libblkid/src/topology/evms.c \
+	libblkid/src/topology/ioctl.c \
+	libblkid/src/topology/lvm.c \
+	libblkid/src/topology/md.c \
+	libblkid/src/topology/sysfs.c
+endif
+
+nodist_libblkid_la_SOURCES = libblkid/src/blkid.h
+
+if BUILD_LIBUUID
+libblkid_la_LIBADD = libuuid.la
+endif
+
+libblkid_la_CFLAGS = \
+	-I$(ul_libblkid_incdir) \
+	-I$(ul_libuuid_incdir) \
+	-I$(top_srcdir)/libblkid/src
+
+libblkid_la_DEPENDENCIES = \
+	$(libblkid_la_LIBADD) \
+	libblkid/src/blkid.sym \
+	libblkid/src/blkid.h.in
+
+libblkid_la_LDFLAGS = \
+	-Wl,--version-script=$(top_srcdir)/libblkid/src/blkid.sym \
+	-version-info $(LIBBLKID_VERSION_INFO)
+
+EXTRA_DIST += \
+	libblkid/src/blkid.sym \
+	libblkid/src/blkid.h.in
+
+noinst_PROGRAMS += \
+	test_blkid_cache \
+	test_blkid_config \
+	test_blkid_dev \
+	test_blkid_devname \
+	test_blkid_devno \
+	test_blkid_evaluate \
+	test_blkid_read \
+	test_blkid_resolve \
+	test_blkid_save \
+	test_blkid_tag \
+	test_blkid_verify
+
+blkid_tests_cflags  = -DTEST_PROGRAM $(libblkid_la_CFLAGS)
+blkid_tests_ldflags = libuuid.la -static
+blkid_tests_ldadd   = libblkid.la $(UUID_LIBS)
+
+test_blkid_cache_SOURCES = libblkid/src/cache.c
+test_blkid_cache_CFLAGS = $(blkid_tests_cflags)
+test_blkid_cache_LDFLAGS = $(blkid_tests_ldflags)
+test_blkid_cache_LDADD = $(blkid_tests_ldadd)
+
+test_blkid_config_SOURCES = libblkid/src/config.c
+test_blkid_config_CFLAGS = $(blkid_tests_cflags)
+test_blkid_config_LDFLAGS = $(blkid_tests_ldflags)
+test_blkid_config_LDADD = $(blkid_tests_ldadd)
+
+test_blkid_dev_SOURCES = libblkid/src/dev.c
+test_blkid_dev_CFLAGS = $(blkid_tests_cflags)
+test_blkid_dev_LDFLAGS = $(blkid_tests_ldflags)
+test_blkid_dev_LDADD = $(blkid_tests_ldadd)
+
+test_blkid_devname_SOURCES = libblkid/src/devname.c
+test_blkid_devname_CFLAGS = $(blkid_tests_cflags)
+test_blkid_devname_LDFLAGS = $(blkid_tests_ldflags)
+test_blkid_devname_LDADD = $(blkid_tests_ldadd)
+
+test_blkid_devno_SOURCES = libblkid/src/devno.c
+test_blkid_devno_CFLAGS = $(blkid_tests_cflags)
+test_blkid_devno_LDFLAGS = $(blkid_tests_ldflags)
+test_blkid_devno_LDADD = $(blkid_tests_ldadd)
+
+test_blkid_evaluate_SOURCES = libblkid/src/evaluate.c
+test_blkid_evaluate_CFLAGS = $(blkid_tests_cflags)
+test_blkid_evaluate_LDFLAGS = $(blkid_tests_ldflags)
+test_blkid_evaluate_LDADD = $(blkid_tests_ldadd)
+
+test_blkid_read_SOURCES = libblkid/src/read.c
+test_blkid_read_CFLAGS = $(blkid_tests_cflags)
+test_blkid_read_LDFLAGS = $(blkid_tests_ldflags)
+test_blkid_read_LDADD = $(blkid_tests_ldadd)
+
+test_blkid_resolve_SOURCES = libblkid/src/resolve.c
+test_blkid_resolve_CFLAGS = $(blkid_tests_cflags)
+test_blkid_resolve_LDFLAGS = $(blkid_tests_ldflags)
+test_blkid_resolve_LDADD = $(blkid_tests_ldadd)
+
+test_blkid_save_SOURCES = libblkid/src/save.c
+test_blkid_save_CFLAGS = $(blkid_tests_cflags)
+test_blkid_save_LDFLAGS = $(blkid_tests_ldflags)
+test_blkid_save_LDADD = $(blkid_tests_ldadd)
+
+test_blkid_tag_SOURCES = libblkid/src/tag.c
+test_blkid_tag_CFLAGS = $(blkid_tests_cflags)
+test_blkid_tag_LDFLAGS = $(blkid_tests_ldflags)
+test_blkid_tag_LDADD = $(blkid_tests_ldadd)
+
+test_blkid_verify_SOURCES = libblkid/src/verify.c
+test_blkid_verify_CFLAGS = $(blkid_tests_cflags)
+test_blkid_verify_LDFLAGS = $(blkid_tests_ldflags)
+test_blkid_verify_LDADD = $(blkid_tests_ldadd)
+
+# move lib from $(usrlib_execdir) to $(libdir) if needed
+install-exec-hook-libblkid:
+	if test "$(usrlib_execdir)" != "$(libdir)"; then \
+		mkdir -p $(DESTDIR)$(libdir); \
+		mv $(DESTDIR)$(usrlib_execdir)/libblkid.so.* $(DESTDIR)$(libdir); \
+		so_img_name=$$(readlink $(DESTDIR)$(usrlib_execdir)/libblkid.so); \
+		so_img_rel_target=$$(echo $(usrlib_execdir) | sed 's,\(^/\|\)[^/][^/]*,..,g'); \
+		(cd $(DESTDIR)$(usrlib_execdir) && \
+			rm -f libblkid.so && \
+			$(LN_S) $$so_img_rel_target$(libdir)/$$so_img_name libblkid.so); \
+	fi
+
+uninstall-hook-libblkid:
+	rm -f $(DESTDIR)$(libdir)/libblkid.so*
+
+INSTALL_EXEC_HOOKS += install-exec-hook-libblkid
+UNINSTALL_HOOKS += uninstall-hook-libblkid
diff --git a/libblkid/src/partitions/Makefile.am b/libblkid/src/partitions/Makefile.am
deleted file mode 100644
index 300bf32e0..000000000
--- a/libblkid/src/partitions/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-include $(top_srcdir)/config/include-Makefile.am
-
-AM_CPPFLAGS += -I$(ul_libblkid_incdir) -I$(ul_libblkid_srcdir)
-libblkid_partitions_la_LIBADD =
-
-noinst_LTLIBRARIES = libblkid_partitions.la
-libblkid_partitions_la_SOURCES = \
-	aix.c \
-	aix.h \
-	blkid_parttypes.h \
-	bsd.c \
-	dos.c \
-	dos.h \
-	gpt.c \
-	mac.c \
-	minix.c \
-	partitions.c \
-	partitions.h \
-	sgi.c \
-	solaris_x86.c \
-	sun.c \
-	ultrix.c \
-	unixware.c
diff --git a/libblkid/src/superblocks/Makefile.am b/libblkid/src/superblocks/Makefile.am
deleted file mode 100644
index e2867a7c1..000000000
--- a/libblkid/src/superblocks/Makefile.am
+++ /dev/null
@@ -1,52 +0,0 @@
-include $(top_srcdir)/config/include-Makefile.am
-
-AM_CPPFLAGS += -I$(ul_libblkid_incdir) -I$(ul_libblkid_srcdir)
-
-noinst_LTLIBRARIES = libblkid_superblocks.la
-libblkid_superblocks_la_SOURCES = \
-	adaptec_raid.c \
-	befs.c \
-	bfs.c \
-	btrfs.c \
-	cramfs.c \
-	ddf_raid.c \
-	drbd.c \
-	drbdproxy_datalog.c \
-	exfat.c \
-	ext.c \
-	gfs.c \
-	hfs.c \
-	highpoint_raid.c \
-	hpfs.c \
-	iso9660.c \
-	isw_raid.c \
-	jfs.c \
-	jmicron_raid.c \
-	linux_raid.c \
-	lsi_raid.c \
-	luks.c \
-	lvm.c \
-	minix.c \
-	netware.c \
-	nilfs.c \
-	ntfs.c \
-	nvidia_raid.c \
-	ocfs.c \
-	promise_raid.c \
-	reiserfs.c \
-	romfs.c \
-	silicon_raid.c \
-	squashfs.c \
-	superblocks.c \
-	superblocks.h \
-	swap.c \
-	sysv.c \
-	ubifs.c \
-	udf.c \
-	ufs.c \
-	vfat.c \
-	via_raid.c \
-	vmfs.c \
-	vxfs.c \
-	xfs.c \
-	zfs.c
diff --git a/libblkid/src/topology/Makefile.am b/libblkid/src/topology/Makefile.am
deleted file mode 100644
index 91959d44a..000000000
--- a/libblkid/src/topology/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-include $(top_srcdir)/config/include-Makefile.am
-
-AM_CPPFLAGS += -I$(ul_libblkid_incdir) -I$(ul_libblkid_srcdir)
-libblkid_topology_la_LIBADD =
-
-noinst_LTLIBRARIES = libblkid_topology.la
-libblkid_topology_la_SOURCES =	\
-	topology.c \
-	topology.h
-
-if LINUX
-libblkid_topology_la_SOURCES += \
-	dm.c \
-	evms.c \
-	ioctl.c \
-	lvm.c \
-	md.c \
-	sysfs.c
-endif
diff --git a/libblkid/src/tst_types.c b/libblkid/src/tst_types.c
deleted file mode 100644
index ecbc03217..000000000
--- a/libblkid/src/tst_types.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * This testing program makes sure the stdint.h header file
- *
- * Copyright (C) 2006 by Theodore Ts'o.
- *
- * %Begin-Header%
- * This file may be redistributed under the terms of the GNU Public
- * License.
- * %End-Header%
- */
-
-#include <sys/types.h>
-#include <stdint.h>
-
-#include <stdlib.h>
-#include <stdio.h>
-
-int main(int argc, char **argv)
-{
-	if (sizeof(uint8_t) != 1) {
-		printf("Sizeof(uint8_t) is %d should be 1\n",
-		       (int)sizeof(uint8_t));
-		exit(1);
-	}
-	if (sizeof(int8_t) != 1) {
-		printf("Sizeof(int8_t) is %d should be 1\n",
-		       (int)sizeof(int8_t));
-		exit(1);
-	}
-	if (sizeof(uint16_t) != 2) {
-		printf("Sizeof(uint16_t) is %d should be 2\n",
-		       (int)sizeof(uint16_t));
-		exit(1);
-	}
-	if (sizeof(int16_t) != 2) {
-		printf("Sizeof(int16_t) is %d should be 2\n",
-		       (int)sizeof(int16_t));
-		exit(1);
-	}
-	if (sizeof(uint32_t) != 4) {
-		printf("Sizeof(uint32_t) is %d should be 4\n",
-		       (int)sizeof(uint32_t));
-		exit(1);
-	}
-	if (sizeof(int32_t) != 4) {
-		printf("Sizeof(int32_t) is %d should be 4\n",
-		       (int)sizeof(int32_t));
-		exit(1);
-	}
-	if (sizeof(uint64_t) != 8) {
-		printf("Sizeof(uint64_t) is %d should be 8\n",
-		       (int)sizeof(uint64_t));
-		exit(1);
-	}
-	if (sizeof(int64_t) != 8) {
-		printf("Sizeof(int64_t) is %d should be 8\n",
-		       (int)sizeof(int64_t));
-		exit(1);
-	}
-	printf("The stdint.h types are correct.\n");
-	exit(0);
-}
-