mirror of
git://sourceware.org/git/lvm2.git
synced 2024-12-21 13:34:40 +03:00
More build cleanups (linker parameter ordering).
This commit is contained in:
parent
89044bc0fe
commit
902c4069dc
@ -45,8 +45,8 @@ device-mapper: dmeventd $(LIB_STATIC)
|
||||
LIBS += -ldl -ldevmapper -lpthread
|
||||
|
||||
dmeventd: $(LIB_SHARED) $(VERSIONED_SHLIB) dmeventd.o
|
||||
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ dmeventd.o \
|
||||
-L. -ldevmapper-event $(LIBS) -rdynamic
|
||||
$(CC) $(CFLAGS) $(LDFLAGS) -L. -o $@ dmeventd.o \
|
||||
-ldevmapper-event $(LIBS) -rdynamic
|
||||
|
||||
.PHONY: install_dynamic install_static install_include \
|
||||
install_pkgconfig install_dmeventd
|
||||
|
@ -112,13 +112,12 @@ include ../make.tmpl
|
||||
device-mapper: $(TARGETS_DM)
|
||||
|
||||
dmsetup: dmsetup.o $(top_builddir)/libdm/libdevmapper.$(LIB_SUFFIX)
|
||||
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ dmsetup.o \
|
||||
-L$(top_builddir)/libdm -ldevmapper $(LIBS) $(LIB_PTHREAD)
|
||||
$(CC) $(CFLAGS) $(LDFLAGS) -L$(top_builddir)/libdm \
|
||||
-o $@ dmsetup.o -ldevmapper $(LIBS) $(LIB_PTHREAD)
|
||||
|
||||
dmsetup.static: dmsetup.o $(interfacedir)/libdevmapper.a
|
||||
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ dmsetup.o -static \
|
||||
-L$(interfacedir) -ldevmapper $(LIBS) \
|
||||
$(LIB_PTHREAD)
|
||||
$(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacedir) \
|
||||
-o $@ dmsetup.o -ldevmapper $(LIBS) $(LIB_PTHREAD)
|
||||
|
||||
all: device-mapper
|
||||
|
||||
@ -127,8 +126,9 @@ lvm: $(OBJECTS) lvm.o $(top_builddir)/lib/liblvm-internal.a
|
||||
$(LVMLIBS) $(LIBS) $(LIB_PTHREAD) -rdynamic
|
||||
|
||||
lvm.static: $(OBJECTS) lvm-static.o $(top_builddir)/lib/liblvm-internal.a $(interfacedir)/libdevmapper.a
|
||||
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) lvm-static.o -static \
|
||||
-L$(interfacedir) $(LVMLIBS) $(LIBS) $(LIB_PTHREAD) -rdynamic
|
||||
$(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacedir) -o $@ \
|
||||
$(OBJECTS) lvm-static.o $(LVMLIBS) $(LIBS) $(LIB_PTHREAD) \
|
||||
-rdynamic
|
||||
|
||||
liblvm2cmd.a: $(top_builddir)/lib/liblvm-internal.a $(OBJECTS) lvmcmdlib.o lvm2cmd.o
|
||||
cat $(top_builddir)/lib/liblvm-internal.a > $@
|
||||
|
Loading…
Reference in New Issue
Block a user