shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

Rename liblvm to liblvm-internal.

Browse Source 
Make preparation for using liblvm for new application library.
This commit is contained in:
Dave Wysochanski 2009-03-06 16:17:28 +00:00
parent 436cd05156
commit 0bf8455b64
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/Makefile.in
View File

@ -140,18 +140,19 @@ ifeq ("@DMEVENTD@", "yes")
CLDFLAGS += -ldevmapper-event CLDFLAGS += -ldevmapper-event
endif endif
LIB_STATIC = liblvm.a LIB_NAME = liblvm-internal
LIB_STATIC = $(LIB_NAME).a
$(SUBDIRS): $(LIB_STATIC) $(SUBDIRS): $(LIB_STATIC)
CLEAN_TARGETS += liblvm.cflow CLEAN_TARGETS += $(LIB_NAME).cflow
include $(top_srcdir)/make.tmpl include $(top_srcdir)/make.tmpl
liblvm.cflow: $(SOURCES) $(LIB_NAME).cflow: $(SOURCES)
set -e; (echo -n "SOURCES += "; \ set -e; (echo -n "SOURCES += "; \
echo $(SOURCES) | \ echo $(SOURCES) | \
sed "s/^/ /;s/ / $(top_srcdir)\/lib\//g;s/$$//"; \ sed "s/^/ /;s/ / $(top_srcdir)\/lib\//g;s/$$//"; \
) > $@ ) > $@
cflow: liblvm.cflow cflow: $(LIB_NAME).cflow

16
tools/Makefile.in
View File

@ -77,7 +77,7 @@ ifeq ("@STATIC_LINK@", "yes")
INSTALL_CMDLIB_TARGETS += install_cmdlib_static INSTALL_CMDLIB_TARGETS += install_cmdlib_static
endif endif
LVMLIBS = -llvm LVMLIBS = -llvm-internal
CLEAN_TARGETS = liblvm2cmd.$(LIB_SUFFIX) liblvm2cmd.a liblvm2cmd-static.a lvm lvm.o \ CLEAN_TARGETS = liblvm2cmd.$(LIB_SUFFIX) liblvm2cmd.a liblvm2cmd-static.a lvm lvm.o \
lvm2cmd.o lvm2cmd-static.o lvm2cmdlib.o lvm.static \ lvm2cmd.o lvm2cmd-static.o lvm2cmdlib.o lvm.static \
@ -112,21 +112,21 @@ dmsetup.static: dmsetup.o $(interfacedir)/libdevmapper.a
all: device-mapper all: device-mapper
lvm: $(OBJECTS) lvm.o $(top_srcdir)/lib/liblvm.a lvm: $(OBJECTS) lvm.o $(top_srcdir)/lib/liblvm-internal.a
$(CC) -o $@ $(CFLAGS) $(OBJECTS) lvm.o \ $(CC) -o $@ $(CFLAGS) $(OBJECTS) lvm.o \
$(LDFLAGS) $(LVMLIBS) $(LIBS) -rdynamic $(LDFLAGS) $(LVMLIBS) $(LIBS) -rdynamic
LIB_PTHREAD = @LIB_PTHREAD@ LIB_PTHREAD = @LIB_PTHREAD@
lvm.static: $(OBJECTS) lvm-static.o $(top_srcdir)/lib/liblvm.a $(interfacedir)/libdevmapper.a lvm.static: $(OBJECTS) lvm-static.o $(top_srcdir)/lib/liblvm-internal.a $(interfacedir)/libdevmapper.a
$(CC) -o $@ $(CFLAGS) $(OBJECTS) lvm-static.o -static \ $(CC) -o $@ $(CFLAGS) $(OBJECTS) lvm-static.o -static \
-L$(interfacedir) $(LDFLAGS) $(LVMLIBS) $(LIBS) $(LIB_PTHREAD) -rdynamic -L$(interfacedir) $(LDFLAGS) $(LVMLIBS) $(LIBS) $(LIB_PTHREAD) -rdynamic
liblvm2cmd.a: $(top_srcdir)/lib/liblvm.a $(OBJECTS) lvmcmdlib.o lvm2cmd.o liblvm2cmd.a: $(top_srcdir)/lib/liblvm-internal.a $(OBJECTS) lvmcmdlib.o lvm2cmd.o
cat $(top_srcdir)/lib/liblvm.a > $@ cat $(top_srcdir)/lib/liblvm-internal.a > $@
$(AR) rs $@ $(OBJECTS) lvmcmdlib.o lvm2cmd.o $(AR) rs $@ $(OBJECTS) lvmcmdlib.o lvm2cmd.o
liblvm2cmd-static.a: $(top_srcdir)/lib/liblvm.a $(OBJECTS) lvmcmdlib.o lvm2cmd-static.o liblvm2cmd-static.a: $(top_srcdir)/lib/liblvm-internal.a $(OBJECTS) lvmcmdlib.o lvm2cmd-static.o
cat $(top_srcdir)/lib/liblvm.a > $@ cat $(top_srcdir)/lib/liblvm-internal.a > $@
$(AR) rs $@ $(OBJECTS) lvmcmdlib.o lvm2cmd-static.o $(AR) rs $@ $(OBJECTS) lvmcmdlib.o lvm2cmd-static.o
liblvm2cmd.$(LIB_SUFFIX): liblvm2cmd.a $(LDDEPS) liblvm2cmd.$(LIB_SUFFIX): liblvm2cmd.a $(LDDEPS)
@ -141,7 +141,7 @@ liblvm2cmd.$(LIB_SUFFIX): liblvm2cmd.a $(LDDEPS)
ifneq ("@CFLOW_CMD@", "") ifneq ("@CFLOW_CMD@", "")
CFLOW_FLAGS += --cpp="$(CC) -E" CFLOW_FLAGS += --cpp="$(CC) -E"
.PHONY: lvm.cflow .PHONY: lvm.cflow
-include $(top_srcdir)/lib/liblvm.cflow -include $(top_srcdir)/lib/liblvm-internal.cflow
lvm.cflow: $(SOURCES) lvm.cflow: $(SOURCES)
@CFLOW_CMD@ -o$@ $(CFLOW_FLAGS) $(INCLUDES) $(DEFS) $(SOURCES) @CFLOW_CMD@ -o$@ $(CFLOW_FLAGS) $(INCLUDES) $(DEFS) $(SOURCES)
lvm.rxref: $(SOURCES) lvm.rxref: $(SOURCES)