From b6deac338f67172486f3ed8eabdc1d7798d2df37 Mon Sep 17 00:00:00 2001 From: Milan Broz Date: Wed, 3 Jun 2009 11:31:06 +0000 Subject: [PATCH] Build shared parts with 'make' command (mpatocka) When some parts of lvm are built as shared libraries (for example with --with-snapshots=shared), the 'make' command does not build these parts. The shared parts are built with 'make install' command. This bug can be seen if you go to 'lib' subdirectory and type 'make'. If you type 'make', the shared libraries are not built, if you type 'make all', the shared libraries are built. The reason for the bug is the line $(SUBDIRS): $(LIB_STATIC) If make is executed without any arguments, it makes the first target in the Makefile. If the first target is '$(SUBDIRS): $(LIB_STATIC)', it only builds static libraries. This patch moves '$(SUBDIRS): $(LIB_STATIC)' after include $(top_srcdir)/make.tmpl. make.tmpl contains the 'all' target as its first target, so 'make' will be equivalent to 'make all' and shared libraries will be build with 'make' command. Signed-off-by: Mikulas Patocka --- lib/Makefile.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/Makefile.in b/lib/Makefile.in index e65d0c269..0198fe279 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -143,12 +143,12 @@ endif LIB_NAME = liblvm-internal LIB_STATIC = $(LIB_NAME).a -$(SUBDIRS): $(LIB_STATIC) - CLEAN_TARGETS += $(LIB_NAME).cflow include $(top_srcdir)/make.tmpl +$(SUBDIRS): $(LIB_STATIC) + $(LIB_NAME).cflow: $(SOURCES) set -e; (echo -n "SOURCES += "; \ echo $(SOURCES) | \