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

Use $(top_builddir) for inclusion of make.tmpl in Makefiles.

Browse Source
This commit is contained in:
Zdenek Kabelac 2010-03-04 09:51:37 +00:00
parent c2fa9fa909
commit 814aebc4e9
25 changed files with 45 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
WHATS_NEW
View File

@ -1,5 +1,6 @@
Version 2.02.62 - Version 2.02.62 -
==================================== ====================================
Use $(top_builddir) for inclusion of make.tmpl in Makefiles.
Fix autoconf warning about ignored datarootdir. Fix autoconf warning about ignored datarootdir.
Increase AC_PREREQ version to 2.61 (for AC_PROC_SED, AC_PROG_MKDIR_P). Increase AC_PREREQ version to 2.61 (for AC_PROC_SED, AC_PROG_MKDIR_P).
Handle a misaligned device that reports a -1 alignment_offset. Handle a misaligned device that reports a -1 alignment_offset.

2
daemons/Makefile.in
View File

@ -30,7 +30,7 @@ ifeq ("@BUILD_DMEVENTD@", "yes")
SUBDIRS += dmeventd SUBDIRS += dmeventd
endif endif
include ../make.tmpl include $(top_builddir)/make.tmpl
ifeq ("@BUILD_DMEVENTD@", "yes") ifeq ("@BUILD_DMEVENTD@", "yes")
device-mapper: dmeventd.device-mapper device-mapper: dmeventd.device-mapper

2
daemons/clvmd/Makefile.in
View File

@ -86,7 +86,7 @@ LVMLIBS += -ldevmapper
DEFS += -D_REENTRANT DEFS += -D_REENTRANT
CFLAGS += -fno-strict-aliasing CFLAGS += -fno-strict-aliasing
include ../../make.tmpl include $(top_builddir)/make.tmpl
INSTALL_TARGETS = \ INSTALL_TARGETS = \
install_clvmd install_clvmd

2
daemons/cmirrord/Makefile.in
View File

@ -25,7 +25,7 @@ SOURCES = clogd.c cluster.c compat.c functions.c link_mon.c local.c logging.c
TARGETS = cmirrord TARGETS = cmirrord
include ../../make.tmpl include $(top_builddir)/make.tmpl
LIBS += -ldevmapper LIBS += -ldevmapper
LMLIBS += $(CPG_LIBS) $(SACKPT_LIBS) LMLIBS += $(CPG_LIBS) $(SACKPT_LIBS)

2
daemons/dmeventd/Makefile.in
View File

@ -48,7 +48,7 @@ ifneq ($(MAKECMDGOALS),device-mapper)
SUBDIRS+=plugins SUBDIRS+=plugins
endif endif
include ../../make.tmpl include $(top_builddir)/make.tmpl
all: device-mapper all: device-mapper
device-mapper: $(TARGETS) device-mapper: $(TARGETS)

2
daemons/dmeventd/plugins/Makefile.in
View File

@ -19,7 +19,7 @@ VPATH = @srcdir@
SUBDIRS += lvm2 mirror snapshot SUBDIRS += lvm2 mirror snapshot
include ../../../make.tmpl include $(top_builddir)/make.tmpl
mirror: lvm2 mirror: lvm2
snapshot: lvm2 snapshot: lvm2

2
doc/Makefile.in
View File

@ -19,7 +19,7 @@ VPATH = @srcdir@
CONFSRC=example.conf CONFSRC=example.conf
CONFDEST=lvm.conf CONFDEST=lvm.conf
include ../make.tmpl include $(top_builddir)/make.tmpl
install_lvm2: $(CONFSRC) install_lvm2: $(CONFSRC)
@if [ ! -e $(confdir)/$(CONFDEST) ]; then \ @if [ ! -e $(confdir)/$(CONFDEST) ]; then \

4
lib/Makefile.in
View File

@ -143,7 +143,7 @@ ifeq ("@HAVE_LIBDL@", "yes")
endif endif
ifeq ("@DMEVENTD@", "yes") ifeq ("@DMEVENTD@", "yes")
CLDFLAGS += -L../daemons/dmeventd CLDFLAGS += -L$(top_builddir)/daemons/dmeventd
LIBS += -ldevmapper-event LIBS += -ldevmapper-event
endif endif
@ -152,7 +152,7 @@ LIB_STATIC = $(LIB_NAME).a
CLEAN_TARGETS += $(LIB_NAME).cflow CLEAN_TARGETS += $(LIB_NAME).cflow
include ../make.tmpl include $(top_builddir)/make.tmpl
$(SUBDIRS): $(LIB_STATIC) $(SUBDIRS): $(LIB_STATIC)

2
lib/format1/Makefile.in
View File

@ -29,7 +29,7 @@ SOURCES =\
LIB_SHARED = liblvm2format1.so LIB_SHARED = liblvm2format1.so
LIB_VERSION = $(LIB_VERSION_LVM) LIB_VERSION = $(LIB_VERSION_LVM)
include ../../make.tmpl include $(top_builddir)/make.tmpl
install: liblvm2format1.so install: liblvm2format1.so
$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \ $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \

2
lib/format_pool/Makefile.in
View File

@ -26,7 +26,7 @@ SOURCES =\
LIB_SHARED = liblvm2formatpool.so LIB_SHARED = liblvm2formatpool.so
LIB_VERSION = $(LIB_VERSION_LVM) LIB_VERSION = $(LIB_VERSION_LVM)
include ../../make.tmpl include $(top_builddir)/make.tmpl
install: liblvm2formatpool.so install: liblvm2formatpool.so
$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \ $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \

2
lib/locking/Makefile.in
View File

@ -22,7 +22,7 @@ SOURCES = cluster_locking.c
LIB_SHARED = liblvm2clusterlock.so LIB_SHARED = liblvm2clusterlock.so
LIB_VERSION = $(LIB_VERSION_LVM) LIB_VERSION = $(LIB_VERSION_LVM)
include ../../make.tmpl include $(top_builddir)/make.tmpl
install install_cluster: liblvm2clusterlock.so install install_cluster: liblvm2clusterlock.so
$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \ $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \

2
lib/mirror/Makefile.in
View File

@ -22,7 +22,7 @@ SOURCES = mirrored.c
LIB_SHARED = liblvm2mirror.so LIB_SHARED = liblvm2mirror.so
LIB_VERSION = $(LIB_VERSION_LVM) LIB_VERSION = $(LIB_VERSION_LVM)
include ../../make.tmpl include $(top_builddir)/make.tmpl
install: liblvm2mirror.so install: liblvm2mirror.so
$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \ $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \

2
lib/snapshot/Makefile.in
View File

@ -22,7 +22,7 @@ SOURCES = snapshot.c
LIB_SHARED = liblvm2snapshot.so LIB_SHARED = liblvm2snapshot.so
LIB_VERSION = $(LIB_VERSION_LVM) LIB_VERSION = $(LIB_VERSION_LVM)
include ../../make.tmpl include $(top_builddir)/make.tmpl
install: liblvm2snapshot.so install: liblvm2snapshot.so
$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \ $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \

2
libdm/Makefile.in
View File

@ -50,7 +50,7 @@ LIB_VERSION = $(LIB_VERSION_DM)
DEFS += -DDM_DEVICE_UID=@DM_DEVICE_UID@ -DDM_DEVICE_GID=@DM_DEVICE_GID@ \ DEFS += -DDM_DEVICE_UID=@DM_DEVICE_UID@ -DDM_DEVICE_GID=@DM_DEVICE_GID@ \
-DDM_DEVICE_MODE=@DM_DEVICE_MODE@ -DDM_DEVICE_MODE=@DM_DEVICE_MODE@
include ../make.tmpl include $(top_builddir)/make.tmpl
device-mapper: all device-mapper: all

2
liblvm/Makefile.in
View File

@ -40,7 +40,7 @@ endif
CLEAN_TARGETS += liblvm.cflow CLEAN_TARGETS += liblvm.cflow
include ../make.tmpl include $(top_builddir)/make.tmpl
LIBS += -ldevmapper -llvm-internal LIBS += -ldevmapper -llvm-internal

2
man/Makefile.in
View File

@ -48,7 +48,7 @@ MAN8DIR=${mandir}/man8
CLEAN_TARGETS=$(MAN5) $(MAN8) $(MAN8CLUSTER) $(FSADMMAN) $(MAN8DM) CLEAN_TARGETS=$(MAN5) $(MAN8) $(MAN8CLUSTER) $(FSADMMAN) $(MAN8DM)
include ../make.tmpl include $(top_builddir)/make.tmpl
ifneq ("@CLVMD@", "none") ifneq ("@CLVMD@", "none")
install: install_cluster install: install_cluster

4
old-tests/device/Makefile.in
View File

@ -22,8 +22,8 @@ SOURCES=\
TARGETS=dev_cache_t TARGETS=dev_cache_t
include ../../make.tmpl include $(top_builddir)/make.tmpl
dev_cache_t: dev_cache_t.o $(top_srcdir)/lib/liblvm.a dev_cache_t: dev_cache_t.o $(top_srcdir)/lib/liblvm.a
$(CC) -o dev_cache_t dev_cache_t.o -L$(top_srcdir)/lib -llvm $(CC) -o dev_cache_t dev_cache_t.o -L$(top_builddir)/lib -llvm

6
old-tests/filters/Makefile.in
View File

@ -25,11 +25,11 @@ TARGETS=\
rfilter_t \ rfilter_t \
pfilter_t pfilter_t
include ../../make.tmpl include $(top_builddir)/make.tmpl
rfilter_t: rfilter_t.o $(top_srcdir)/lib/liblvm.a rfilter_t: rfilter_t.o $(top_srcdir)/lib/liblvm.a
$(CC) -o rfilter_t rfilter_t.o -L$(top_srcdir)/lib -llvm $(CC) -o rfilter_t rfilter_t.o -L$(top_builddir)/lib -llvm
pfilter_t: pfilter_t.o $(top_srcdir)/lib/liblvm.a pfilter_t: pfilter_t.o $(top_srcdir)/lib/liblvm.a
$(CC) -o pfilter_t pfilter_t.o -L$(top_srcdir)/lib -llvm $(CC) -o pfilter_t pfilter_t.o -L$(top_builddir)/lib -llvm

22
old-tests/format1/Makefile.in
View File

@ -32,21 +32,21 @@ TARGETS=\
read_pv_t \ read_pv_t \
get_vgs_t get_vgs_t
include ../../make.tmpl include $(top_builddir)/make.tmpl
read_vg_t: read_vg_t.o pretty_print.o $(top_srcdir)/lib/liblvm.a read_vg_t: read_vg_t.o pretty_print.o $(top_builddir)/lib/liblvm.a
$(CC) -o read_vg_t read_vg_t.o pretty_print.o -L$(top_srcdir)/lib -llvm $(CC) -o read_vg_t read_vg_t.o pretty_print.o -L$(top_builddir)/lib -llvm
write_vg_t: write_vg_t.o pretty_print.o $(top_srcdir)/lib/liblvm.a write_vg_t: write_vg_t.o pretty_print.o $(top_builddir)/lib/liblvm.a
$(CC) -o write_vg_t write_vg_t.o pretty_print.o \ $(CC) -o write_vg_t write_vg_t.o pretty_print.o \
-L$(top_srcdir)/lib -llvm -L$(top_builddir)/lib -llvm
get_pvs_t: get_pvs_t.o pretty_print.o $(top_srcdir)/lib/liblvm.a get_pvs_t: get_pvs_t.o pretty_print.o $(top_builddir)/lib/liblvm.a
$(CC) -o get_pvs_t get_pvs_t.o pretty_print.o -L$(top_srcdir)/lib -llvm $(CC) -o get_pvs_t get_pvs_t.o pretty_print.o -L$(top_builddir)/lib -llvm
read_pv_t: read_pv_t.o pretty_print.o $(top_srcdir)/lib/liblvm.a read_pv_t: read_pv_t.o pretty_print.o $(top_builddir)/lib/liblvm.a
$(CC) -o read_pv_t read_pv_t.o pretty_print.o -L$(top_srcdir)/lib -llvm $(CC) -o read_pv_t read_pv_t.o pretty_print.o -L$(top_builddir)/lib -llvm
get_vgs_t: get_vgs_t.o pretty_print.o $(top_srcdir)/lib/liblvm.a get_vgs_t: get_vgs_t.o pretty_print.o $(top_builddir)/lib/liblvm.a
$(CC) -o get_vgs_t get_vgs_t.o pretty_print.o -L$(top_srcdir)/lib -llvm $(CC) -o get_vgs_t get_vgs_t.o pretty_print.o -L$(top_builddir)/lib -llvm

6
old-tests/mm/Makefile.in
View File

@ -22,12 +22,12 @@ SOURCES=\
TARGETS=dbg_malloc_t TARGETS=dbg_malloc_t
include ../../make.tmpl include $(top_builddir)/make.tmpl
dbg_malloc_t: dbg_malloc_t.o dbg_malloc_t: dbg_malloc_t.o
$(CC) $(CFLAGS) -o dbg_malloc_t dbg_malloc_t.o \ $(CC) $(CFLAGS) -o dbg_malloc_t dbg_malloc_t.o \
-L$(top_srcdir)/lib -llvm -L$(top_builddir)/lib -llvm
pool_t: pool_t.o pool_t: pool_t.o
$(CC) $(CFLAGS) -o pool_t pool_t.o -L$(top_srcdir)/lib -llvm $(CC) $(CFLAGS) -o pool_t pool_t.o -L$(top_builddir)/lib -llvm

10
old-tests/regex/Makefile.in
View File

@ -25,11 +25,11 @@ TARGETS=\
parse_t \ parse_t \
matcher_t matcher_t
include ../../make.tmpl include $(top_builddir)/make.tmpl
parse_t: parse_t.o $(top_srcdir)/lib/liblvm.a parse_t: parse_t.o $(top_builddir)/lib/liblvm.a
$(CC) -o parse_t parse_t.o -L$(top_srcdir)/lib -llvm $(CC) -o parse_t parse_t.o -L$(top_builddir)/lib -llvm
matcher_t: matcher_t.o $(top_srcdir)/lib/liblvm.a matcher_t: matcher_t.o $(top_builddir)/lib/liblvm.a
$(CC) -o matcher_t matcher_t.o -L$(top_srcdir)/lib -llvm $(CC) -o matcher_t matcher_t.o -L$(top_builddir)/lib -llvm

2
po/Makefile.in
View File

@ -25,7 +25,7 @@ DM_POSOURCES = $(top_srcdir)/dmsetup/*.pot $(top_srcdir)/libdm/*.pot \
LVM_POSOURCES = $(top_srcdir)/tools/*.pot $(top_srcdir)/lib/*/*.pot LVM_POSOURCES = $(top_srcdir)/tools/*.pot $(top_srcdir)/lib/*/*.pot
include ../make.tmpl include $(top_builddir)/make.tmpl
lvm2.po: Makefile $(LVM_POSOURCES) lvm2.po: Makefile $(LVM_POSOURCES)
@echo Compiling string table @echo Compiling string table

2
scripts/Makefile.in
View File

@ -16,7 +16,7 @@ top_srcdir = @top_srcdir@
top_builddir = @top_builddir@ top_builddir = @top_builddir@
VPATH = @srcdir@ VPATH = @srcdir@
include ../make.tmpl include $(top_builddir)/make.tmpl
install: install:
$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(srcdir)/lvm_dump.sh \ $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(srcdir)/lvm_dump.sh \

2
tools/Makefile.in
View File

@ -107,7 +107,7 @@ LVMLIBS += -ldevmapper
DEFS += -DLVM_SHARED_PATH=\"$(exec_prefix)/sbin/lvm\" DEFS += -DLVM_SHARED_PATH=\"$(exec_prefix)/sbin/lvm\"
include ../make.tmpl include $(top_builddir)/make.tmpl
device-mapper: $(TARGETS_DM) device-mapper: $(TARGETS_DM)

2
udev/Makefile.in
View File

@ -22,7 +22,7 @@ DM_DIR=$(shell grep "\#define DM_DIR" $(top_srcdir)/libdm/misc/dm-ioctl.h | awk
CLEAN_TARGETS=10-dm.rules CLEAN_TARGETS=10-dm.rules
include ../make.tmpl include $(top_builddir)/make.tmpl
%: %.in %: %.in
$(SED) -e "s/(DM_DIR)/$(DM_DIR)/" $< >$@ $(SED) -e "s/(DM_DIR)/$(DM_DIR)/" $< >$@