mirror of
git://sourceware.org/git/lvm2.git
synced 2024-12-29 15:22:30 +03:00
revert accidental checkin
This commit is contained in:
parent
fc54be1062
commit
25fbec5be1
@ -539,10 +539,9 @@ AC_ARG_WITH(dmdir,
|
||||
[ DMDIR= ])
|
||||
|
||||
# Convert a relative dir name to absolute.
|
||||
case x$DMDIR in
|
||||
x/*) ;;
|
||||
x) ;;
|
||||
x*) DMDIR="`pwd`/$DMDIR" ;;
|
||||
case $DMDIR in
|
||||
/*) ;;
|
||||
*) DMDIR="`pwd`/$DMDIR" ;;
|
||||
esac
|
||||
|
||||
################################################################################
|
||||
@ -602,7 +601,6 @@ AC_SUBST(MIRRORS)
|
||||
AC_SUBST(OWNER)
|
||||
AC_SUBST(GROUP)
|
||||
AC_SUBST(CFLAGS)
|
||||
AC_SUBST(CPPFLAGS)
|
||||
AC_SUBST(COPTIMISE_FLAG)
|
||||
AC_SUBST(CLDFLAGS)
|
||||
AC_SUBST(CLDWHOLEARCHIVE)
|
||||
|
@ -83,7 +83,7 @@ INSTALL_TARGETS = \
|
||||
install_clvmd
|
||||
|
||||
clvmd: $(OBJECTS) $(top_srcdir)/lib/liblvm.a
|
||||
$(CC) -o clvmd $(OBJECTS) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) \
|
||||
$(CC) -o clvmd $(OBJECTS) $(CFLAGS) $(LDFLAGS) \
|
||||
$(LVMLIBS) $(LMLIBS) $(LIBS)
|
||||
|
||||
.PHONY: install_clvmd
|
||||
|
15
make.tmpl.in
15
make.tmpl.in
@ -26,7 +26,6 @@ LN_S = @LN_S@
|
||||
LIBS = @LIBS@
|
||||
DEFS += @DEFS@
|
||||
CFLAGS += @CFLAGS@
|
||||
CPPFLAGS += @CPPFLAGS@
|
||||
CLDFLAGS += @CLDFLAGS@
|
||||
LDDEPS += @LDDEPS@
|
||||
LDFLAGS += @LDFLAGS@
|
||||
@ -95,14 +94,14 @@ STRIP=
|
||||
LIB_VERSION := $(shell cat $(top_srcdir)/VERSION | \
|
||||
awk -F '.' '{printf "%s.%s",$$1,$$2}')
|
||||
|
||||
CPPFLAGS := -I$(top_srcdir)/include $(CPPFLAGS)
|
||||
INCLUDES += -I$(top_srcdir)/include
|
||||
|
||||
ifneq ("@DMDIR@", "")
|
||||
CPPFLAGS += -I@DMDIR@/include
|
||||
INCLUDES += -I@DMDIR@/include
|
||||
endif
|
||||
|
||||
ifdef DESTDIR
|
||||
CPPFLAGS += -I$(DESTDIR)/usr/include
|
||||
INCLUDES += -I$(DESTDIR)/usr/include
|
||||
endif
|
||||
|
||||
INC_LNS = $(top_srcdir)/include/.symlinks_created
|
||||
@ -162,14 +161,14 @@ endif
|
||||
$(TARGETS): $(OBJECTS)
|
||||
|
||||
%.o: %.c
|
||||
$(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $< -o $@
|
||||
$(CC) -c $(INCLUDES) $(DEFS) $(CFLAGS) $< -o $@
|
||||
|
||||
%.pot: %.c Makefile
|
||||
$(CC) -E $(CPPFLAGS) -include $(top_srcdir)/include/pogen.h \
|
||||
$(CC) -E $(INCLUDES) -include $(top_srcdir)/include/pogen.h \
|
||||
$(DEFS) $(CFLAGS) $< > $@
|
||||
|
||||
%.so: %.o
|
||||
$(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $< -o $@
|
||||
$(CC) -c $(INCLUDES) $(DEFS) $(CFLAGS) $< -o $@
|
||||
|
||||
ifeq ("@LIB_SUFFIX@","so")
|
||||
$(LIB_SHARED): $(OBJECTS) $(LDDEPS)
|
||||
@ -196,7 +195,7 @@ $(LIB_STATIC): $(OBJECTS)
|
||||
set -e; \
|
||||
FILE=`echo $@ | sed 's/\\//\\\\\\//g;s/\\.d//g'`; \
|
||||
DEPS=`echo $(DEPS) | sed -e 's/\\//\\\\\\//g'`; \
|
||||
$(CC) -MM $(CPPFLAGS) $(DEFS) $(CFLAGS) $< | \
|
||||
$(CC) -MM $(INCLUDES) $(DEFS) $(CFLAGS) $< | \
|
||||
sed "s/\(.*\)\.o[ :]*/$$FILE.o $$FILE.d $$FILE.pot: $$DEPS /g" > $@; \
|
||||
[ -s $@ ] || $(RM) $@
|
||||
|
||||
|
@ -98,12 +98,12 @@ DEFS += -DLVM_SHARED_PATH=\"$(exec_prefix)/sbin/lvm\"
|
||||
include $(top_srcdir)/make.tmpl
|
||||
|
||||
lvm: $(OBJECTS) lvm.o $(top_srcdir)/lib/liblvm.a
|
||||
$(CC) -o $@ $(CPPFLAGS) $(CFLAGS) $(OBJECTS) lvm.o \
|
||||
$(CC) -o $@ $(CFLAGS) $(OBJECTS) lvm.o \
|
||||
$(LDFLAGS) $(LVMLIBS) $(LIBS) -rdynamic
|
||||
|
||||
LIB_PTHREAD = @LIB_PTHREAD@
|
||||
lvm.static: $(OBJECTS) lvm-static.o $(top_srcdir)/lib/liblvm.a
|
||||
$(CC) -o $@ $(CPPFLAGS) $(CFLAGS) $(OBJECTS) lvm-static.o -static \
|
||||
$(CC) -o $@ $(CFLAGS) $(OBJECTS) lvm-static.o -static \
|
||||
$(LDFLAGS) $(LVMLIBS) $(LIBS) $(LIB_PTHREAD) -rdynamic
|
||||
|
||||
liblvm2cmd.a: $(top_srcdir)/lib/liblvm.a $(OBJECTS) lvmcmdlib.o lvm2cmd.o
|
||||
@ -128,15 +128,15 @@ CFLOW_FLAGS += --cpp="$(CC) -E"
|
||||
.PHONY: lvm.cflow
|
||||
-include $(top_srcdir)/lib/liblvm.cflow
|
||||
lvm.cflow: $(SOURCES)
|
||||
@CFLOW_CMD@ -o$@ $(CFLOW_FLAGS) $(CPPFLAGS) $(DEFS) $(SOURCES)
|
||||
@CFLOW_CMD@ -o$@ $(CFLOW_FLAGS) $(INCLUDES) $(DEFS) $(SOURCES)
|
||||
lvm.rxref: $(SOURCES)
|
||||
@CFLOW_CMD@ -o$@ --cpp="$(CC) -E" -r --omit-arguments -x $(CPPFLAGS) $(DEFS) $(SOURCES)
|
||||
@CFLOW_CMD@ -o$@ --cpp="$(CC) -E" -r --omit-arguments -x $(INCLUDES) $(DEFS) $(SOURCES)
|
||||
lvm.xref: $(SOURCES)
|
||||
@CFLOW_CMD@ -o$@ --cpp="$(CC) -E" --omit-arguments -x $(CPPFLAGS) $(DEFS) $(SOURCES)
|
||||
@CFLOW_CMD@ -o$@ --cpp="$(CC) -E" --omit-arguments -x $(INCLUDES) $(DEFS) $(SOURCES)
|
||||
lvm.rtree: $(SOURCES)
|
||||
@CFLOW_CMD@ -o$@ --cpp="$(CC) -E" -r --omit-arguments -T -b $(CPPFLAGS) $(DEFS) $(SOURCES)
|
||||
@CFLOW_CMD@ -o$@ --cpp="$(CC) -E" -r --omit-arguments -T -b $(INCLUDES) $(DEFS) $(SOURCES)
|
||||
lvm.tree: $(SOURCES)
|
||||
@CFLOW_CMD@ -o$@ --cpp="$(CC) -E" --omit-arguments -T -b $(CPPFLAGS) $(DEFS) $(SOURCES)
|
||||
@CFLOW_CMD@ -o$@ --cpp="$(CC) -E" --omit-arguments -T -b $(INCLUDES) $(DEFS) $(SOURCES)
|
||||
cflow: lvm.cflow lvm.xref lvm.tree lvm.rtree lvm.rxref
|
||||
endif
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user