diff options
| author | Alasdair Kergon <agk@redhat.com> | 2009-10-05 13:46:00 +0000 |
|---|---|---|
| committer | Alasdair Kergon <agk@redhat.com> | 2009-10-05 13:46:00 +0000 |
| commit | 437219e27dab4a5cbf8fe27e6ab4e6f7c6291c76 (patch) | |
| tree | ced436568efae180788fa01dd604de5ff99c7a0c /daemons | |
| parent | cf65a124e62a29a9fefcc7e87088787565b14572 (diff) | |
| download | lvm2-437219e27dab4a5cbf8fe27e6ab4e6f7c6291c76.tar.gz lvm2-437219e27dab4a5cbf8fe27e6ab4e6f7c6291c76.tar.xz lvm2-437219e27dab4a5cbf8fe27e6ab4e6f7c6291c76.zip | |
More makefile cleaning up and fixing. (gentoo)
Diffstat (limited to 'daemons')
| -rw-r--r-- | daemons/clvmd/Makefile.in | 2 | ||||
| -rw-r--r-- | daemons/cmirrord/Makefile.in | 2 | ||||
| -rw-r--r-- | daemons/dmeventd/Makefile.in | 5 | ||||
| -rw-r--r-- | daemons/dmeventd/plugins/mirror/Makefile.in | 3 | ||||
| -rw-r--r-- | daemons/dmeventd/plugins/snapshot/Makefile.in | 3 |
5 files changed, 8 insertions, 7 deletions
diff --git a/daemons/clvmd/Makefile.in b/daemons/clvmd/Makefile.in index 109a8b0a..dad568e2 100644 --- a/daemons/clvmd/Makefile.in +++ b/daemons/clvmd/Makefile.in @@ -92,7 +92,7 @@ INSTALL_TARGETS = \ install_clvmd clvmd: $(OBJECTS) $(top_builddir)/lib/liblvm-internal.a - $(CC) -o clvmd $(OBJECTS) $(CFLAGS) $(LDFLAGS) \ + $(CC) $(CFLAGS) $(LDFLAGS) -o clvmd $(OBJECTS) \ $(LVMLIBS) $(LMLIBS) $(LIBS) .PHONY: install_clvmd diff --git a/daemons/cmirrord/Makefile.in b/daemons/cmirrord/Makefile.in index 2bf1e351..debab274 100644 --- a/daemons/cmirrord/Makefile.in +++ b/daemons/cmirrord/Makefile.in @@ -32,7 +32,7 @@ LMLIBS += $(CPG_LIBS) $(SACKPT_LIBS) CFLAGS += $(CPG_CFLAGS) $(SACKPT_CFLAGS) cmirrord: $(OBJECTS) $(top_builddir)/lib/liblvm-internal.a - $(CC) -o cmirrord $(OBJECTS) $(LDFLAGS) \ + $(CC) $(CFLAGS) $(LDFLAGS) -o cmirrord $(OBJECTS) \ $(LVMLIBS) $(LMLIBS) $(LIBS) install: $(TARGETS) diff --git a/daemons/dmeventd/Makefile.in b/daemons/dmeventd/Makefile.in index e16b1454..207c0e25 100644 --- a/daemons/dmeventd/Makefile.in +++ b/daemons/dmeventd/Makefile.in @@ -42,11 +42,10 @@ include ../../make.tmpl all: dmeventd device-mapper: dmeventd $(LIB_STATIC) -LDFLAGS += -ldl -ldevmapper -lpthread -CLDFLAGS += -ldl -ldevmapper -lpthread +LIBS += -ldl -ldevmapper -lpthread dmeventd: $(LIB_SHARED) $(VERSIONED_SHLIB) dmeventd.o - $(CC) -o $@ dmeventd.o $(CFLAGS) $(LDFLAGS) \ + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ dmeventd.o \ -L. -ldevmapper-event $(LIBS) -rdynamic .PHONY: install_dynamic install_static install_include \ diff --git a/daemons/dmeventd/plugins/mirror/Makefile.in b/daemons/dmeventd/plugins/mirror/Makefile.in index 1bc586a3..581e5ec5 100644 --- a/daemons/dmeventd/plugins/mirror/Makefile.in +++ b/daemons/dmeventd/plugins/mirror/Makefile.in @@ -18,7 +18,8 @@ top_builddir = @top_builddir@ VPATH = @srcdir@ INCLUDES += -I${top_srcdir}/tools -CLDFLAGS += -L${top_builddir}/tools -ldevmapper @LVM2CMD_LIB@ +CLDFLAGS += -L${top_builddir}/tools +LIBS += -ldevmapper @LIB_PTHREAD@ @LVM2CMD_LIB@ SOURCES = dmeventd_mirror.c diff --git a/daemons/dmeventd/plugins/snapshot/Makefile.in b/daemons/dmeventd/plugins/snapshot/Makefile.in index 27791542..823ca3fd 100644 --- a/daemons/dmeventd/plugins/snapshot/Makefile.in +++ b/daemons/dmeventd/plugins/snapshot/Makefile.in @@ -18,7 +18,8 @@ top_builddir = @top_builddir@ VPATH = @srcdir@ INCLUDES += -I${top_srcdir}/tools -CLDFLAGS += -L${top_builddir}/tools -ldevmapper @LVM2CMD_LIB@ +CLDFLAGS += -L${top_builddir}/tools +LIBS += -ldevmapper @LIB_PTHREAD@ @LVM2CMD_LIB@ SOURCES = dmeventd_snapshot.c |