diff options
| author | Zdenek Kabelac <zkabelac@redhat.com> | 2010-03-04 11:21:05 +0000 |
|---|---|---|
| committer | Zdenek Kabelac <zkabelac@redhat.com> | 2010-03-04 11:21:05 +0000 |
| commit | f30875dbc67a6ec3f2e94533f63173062748222e (patch) | |
| tree | 78a0b81da736d2dbaac8fb6d2c9bfcea0490c67f /daemons | |
| parent | 539f4a77287ec4222f4e46cdeca18ab256dfe4b9 (diff) | |
| download | lvm2-f30875dbc67a6ec3f2e94533f63173062748222e.tar.gz lvm2-f30875dbc67a6ec3f2e94533f63173062748222e.tar.xz lvm2-f30875dbc67a6ec3f2e94533f63173062748222e.zip | |
Pthread linking change
Create new substituted variable PTHREAD_LIBS and link this library
only with tools/libs which really needs it - i.e. dmeventd.
Check for libpthread only for builds with clvmd or dmeventd.
Remove variable LIB_PTHREAD
Diffstat (limited to 'daemons')
| -rw-r--r-- | daemons/clvmd/Makefile.in | 3 | ||||
| -rw-r--r-- | daemons/dmeventd/Makefile.in | 2 | ||||
| -rw-r--r-- | daemons/dmeventd/plugins/lvm2/Makefile.in | 2 | ||||
| -rw-r--r-- | daemons/dmeventd/plugins/mirror/Makefile.in | 2 | ||||
| -rw-r--r-- | daemons/dmeventd/plugins/snapshot/Makefile.in | 2 |
5 files changed, 6 insertions, 5 deletions
diff --git a/daemons/clvmd/Makefile.in b/daemons/clvmd/Makefile.in index 40d1da46..16ba0b89 100644 --- a/daemons/clvmd/Makefile.in +++ b/daemons/clvmd/Makefile.in @@ -75,13 +75,14 @@ endif TARGETS = \ clvmd -LVMLIBS = $(LVMINTERNAL_LIBS) -lpthread +LVMLIBS = $(LVMINTERNAL_LIBS) ifeq ("@DMEVENTD@", "yes") LVMLIBS += -ldevmapper-event endif LVMLIBS += -ldevmapper +LIBS += $(PTHREAD_LIBS) DEFS += -D_REENTRANT CFLAGS += -fno-strict-aliasing diff --git a/daemons/dmeventd/Makefile.in b/daemons/dmeventd/Makefile.in index fc72c21e..aa204534 100644 --- a/daemons/dmeventd/Makefile.in +++ b/daemons/dmeventd/Makefile.in @@ -54,7 +54,7 @@ all: device-mapper device-mapper: $(TARGETS) LIBS += -ldl -LVMLIBS += -ldevmapper-event -lpthread -ldevmapper +LVMLIBS += -ldevmapper-event -ldevmapper $(PTHREAD_LIBS) $(VERSIONED_SHLIB): $(LIB_SHARED) $(RM) -f $@ diff --git a/daemons/dmeventd/plugins/lvm2/Makefile.in b/daemons/dmeventd/plugins/lvm2/Makefile.in index af6807b3..0f23c845 100644 --- a/daemons/dmeventd/plugins/lvm2/Makefile.in +++ b/daemons/dmeventd/plugins/lvm2/Makefile.in @@ -29,7 +29,7 @@ LIB_VERSION = $(LIB_VERSION_LVM) include $(top_builddir)/make.tmpl -LIBS += -ldevmapper @LIB_PTHREAD@ @LVM2CMD_LIB@ +LIBS += @LVM2CMD_LIB@ -ldevmapper $(PTHREAD_LIBS) install_lvm2: libdevmapper-event-lvm2.$(LIB_SUFFIX) $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \ diff --git a/daemons/dmeventd/plugins/mirror/Makefile.in b/daemons/dmeventd/plugins/mirror/Makefile.in index bdb49d13..bd85a6f7 100644 --- a/daemons/dmeventd/plugins/mirror/Makefile.in +++ b/daemons/dmeventd/plugins/mirror/Makefile.in @@ -32,7 +32,7 @@ LIB_VERSION = $(LIB_VERSION_LVM) include $(top_builddir)/make.tmpl -LIBS += -ldevmapper @LIB_PTHREAD@ @LVM2CMD_LIB@ -ldevmapper-event-lvm2 +LIBS += @LVM2CMD_LIB@ -ldevmapper-event-lvm2 -ldevmapper $(PTHREAD_LIBS) install_lvm2: libdevmapper-event-lvm2mirror.$(LIB_SUFFIX) $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \ diff --git a/daemons/dmeventd/plugins/snapshot/Makefile.in b/daemons/dmeventd/plugins/snapshot/Makefile.in index 4b203a0a..793fd388 100644 --- a/daemons/dmeventd/plugins/snapshot/Makefile.in +++ b/daemons/dmeventd/plugins/snapshot/Makefile.in @@ -32,7 +32,7 @@ LIB_VERSION = $(LIB_VERSION_LVM) include $(top_builddir)/make.tmpl -LIBS += -ldevmapper @LIB_PTHREAD@ @LVM2CMD_LIB@ -ldevmapper-event-lvm2 +LIBS += @LVM2CMD_LIB@ -ldevmapper-event-lvm2 -ldevmapper $(PTHREAD_LIBS) install_lvm2: libdevmapper-event-lvm2snapshot.$(LIB_SUFFIX) $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \ |