Add new liblvm build directory and move lvm_base.c.

The original liblvm.a has been moved to liblvm-internal.a.
We now use liblvm.a for the new application library and build
it inside liblvm directory.

Change dependencies so tools depend on liblvm application library,
and application library depends on liblvm internal.

diff --git a/Makefile.in b/Makefile.in
index 07f22c675a76a4f08065cff235e9e6b0a5266b99..018e8126428abfc56e23c7529125eab05fa2299a 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -22,7 +22,7 @@ ifeq ("@INTL@", "yes")
   SUBDIRS += po
 endif
 
-SUBDIRS += lib tools daemons libdm
+SUBDIRS += lib tools daemons libdm liblvm
 
 ifeq ($(MAKECMDGOALS),distclean)
   SUBDIRS += daemons/clvmd \
@@ -42,8 +42,9 @@ include make.tmpl
 
 libdm: include
 lib: libdm
+liblvm: lib
 daemons: lib tools
-tools: lib device-mapper
+tools: lib device-mapper liblvm
 po: tools daemons
 
 libdm.device-mapper: include.device-mapper

diff --git a/WHATS_NEW b/WHATS_NEW
index e039108f8a449a56095fee0607924ffda6160be6..0b966510b96741d6870cb554ba769f61159ef284 100644 (file)
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
 Version 2.02.46 - 
 ================================
+  Rename liblvm.a to liblvm-internal.a and build new application library.
   Flush memory pool and fix locking in clvmd refresh and backup command.
   Fix unlocks in clvmd-corosync. Broken in 2.02.45.
 

diff --git a/configure b/configure
index 64afd3c47e25bf183fc01a652c52ed8a61acd05e..dbc92630b8401a6ee4c904efad696d8ed25ab1a7 100755 (executable)
--- a/configure
+++ b/configure
@@ -12659,7 +12659,7 @@ LVM_PATCHLEVEL=`echo "$VER" | $AWK -F '.' '{print $3}'`
 
 
 ################################################################################
-ac_config_files="$ac_config_files Makefile make.tmpl daemons/Makefile daemons/clvmd/Makefile daemons/dmeventd/Makefile daemons/dmeventd/libdevmapper-event.pc daemons/dmeventd/plugins/Makefile daemons/dmeventd/plugins/mirror/Makefile daemons/dmeventd/plugins/snapshot/Makefile doc/Makefile include/Makefile lib/Makefile lib/format1/Makefile lib/format_pool/Makefile lib/locking/Makefile lib/mirror/Makefile lib/misc/lvm-version.h lib/snapshot/Makefile libdm/Makefile libdm/libdevmapper.pc man/Makefile po/Makefile scripts/clvmd_init_red_hat scripts/Makefile test/Makefile test/api/Makefile tools/Makefile"
+ac_config_files="$ac_config_files Makefile make.tmpl daemons/Makefile daemons/clvmd/Makefile daemons/dmeventd/Makefile daemons/dmeventd/libdevmapper-event.pc daemons/dmeventd/plugins/Makefile daemons/dmeventd/plugins/mirror/Makefile daemons/dmeventd/plugins/snapshot/Makefile doc/Makefile include/Makefile lib/Makefile lib/format1/Makefile lib/format_pool/Makefile lib/locking/Makefile lib/mirror/Makefile lib/misc/lvm-version.h lib/snapshot/Makefile libdm/Makefile libdm/libdevmapper.pc liblvm/Makefile man/Makefile po/Makefile scripts/clvmd_init_red_hat scripts/Makefile test/Makefile test/api/Makefile tools/Makefile"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -13278,6 +13278,7 @@ do
     "lib/snapshot/Makefile") CONFIG_FILES="$CONFIG_FILES lib/snapshot/Makefile" ;;
     "libdm/Makefile") CONFIG_FILES="$CONFIG_FILES libdm/Makefile" ;;
     "libdm/libdevmapper.pc") CONFIG_FILES="$CONFIG_FILES libdm/libdevmapper.pc" ;;
+    "liblvm/Makefile") CONFIG_FILES="$CONFIG_FILES liblvm/Makefile" ;;
     "man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;;
     "po/Makefile") CONFIG_FILES="$CONFIG_FILES po/Makefile" ;;
     "scripts/clvmd_init_red_hat") CONFIG_FILES="$CONFIG_FILES scripts/clvmd_init_red_hat" ;;

diff --git a/configure.in b/configure.in
index 1eaa2a072e1dad3014799d1f997ed92b714baae4..f84d5891860fdce6c886cdbee8000de2ebac9a10 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -835,6 +835,7 @@ lib/misc/lvm-version.h
 lib/snapshot/Makefile
 libdm/Makefile
 libdm/libdevmapper.pc
+liblvm/Makefile
 man/Makefile
 po/Makefile
 scripts/clvmd_init_red_hat

diff --git a/lib/Makefile.in b/lib/Makefile.in
index 0d5ee94ac27907c22fffef4a46a12baf1b06dcf0..ee1f8ff9311502ed74e4debf08691bfadf9db8ca 100644 (file)
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -86,8 +86,7 @@ SOURCES =\
        report/report.c \
        striped/striped.c \
        uuid/uuid.c \
-       zero/zero.c \
-       lvm_base.c
+       zero/zero.c
 
 ifeq ("@LVM1@", "internal")
   SOURCES +=\

diff --git a/liblvm/Makefile.in b/liblvm/Makefile.in
new file mode 100644 (file)
index 0000000..6f90f6a
--- /dev/null
+++ b/liblvm/Makefile.in
@@ -0,0 +1,36 @@
+#
+# Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved.
+# Copyright (C) 2004-2009 Red Hat, Inc. All rights reserved.
+#
+# This file is part of LVM2.
+#
+# This copyrighted material is made available to anyone wishing to use,
+# modify, copy, or redistribute it subject to the terms and conditions
+# of the GNU General Public License v.2.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+
+SOURCES =\
+       lvm_base.c
+
+LIB_STATIC = liblvm.a
+
+$(SUBDIRS): $(LIB_STATIC)
+
+CLEAN_TARGETS += liblvm.cflow
+
+include $(top_srcdir)/make.tmpl
+
+liblvm.cflow: $(SOURCES)
+       set -e; (echo -n "SOURCES += "; \
+                echo $(SOURCES) | \
+                sed "s/^/ /;s/ / $(top_srcdir)\/lib\//g;s/$$//"; \
+                ) > $@
+
+cflow: liblvm.cflow

diff --git a/lib/lvm_base.c b/liblvm/lvm_base.c
similarity index 100%
rename from lib/lvm_base.c
rename to liblvm/lvm_base.c