summaryrefslogtreecommitdiff
path: root/daemons/lvmpolld
diff options
context:
space:
mode:
authorZdenek Kabelac <zkabelac@redhat.com>2017-08-01 00:01:07 +0200
committerZdenek Kabelac <zkabelac@redhat.com>2017-08-01 11:53:30 +0200
commit2232e82d25382f499adf83cbc7525b281f4f8b92 (patch)
tree4a7d7a8bc5f6ead08758e6030f7fda49dd69ce49 /daemons/lvmpolld
parent918e867abe6a455a401346744820d9e54a977749 (diff)
downloadlvm2-2232e82d25382f499adf83cbc7525b281f4f8b92.tar.gz
makefiles: fixing linking
Avoid adding -g more then once for debug builds. Avoid enabling DEBUG_MEM when we build multithreaded tools. Link executables with -fPIE -pie and --export-dynamic LDFLAGS Introduce PROGS_FLAGS to add option to pass flags for external libs. Link lvm2 internally library only when really used. Link DAEMON_LIBS with daemons. Pass VALGRIND_CFLAGS internally Set shell failure mode on couple places.
Diffstat (limited to 'daemons/lvmpolld')
-rw-r--r--daemons/lvmpolld/Makefile.in12
1 files changed, 4 insertions, 8 deletions
diff --git a/daemons/lvmpolld/Makefile.in b/daemons/lvmpolld/Makefile.in
index 0bc28617f..483758dcd 100644
--- a/daemons/lvmpolld/Makefile.in
+++ b/daemons/lvmpolld/Makefile.in
@@ -27,18 +27,14 @@ CFLOW_TARGET = lvmpolld
include $(top_builddir)/make.tmpl
+CFLAGS += $(EXTRA_EXEC_CFLAGS)
INCLUDES += -I$(top_srcdir)/libdaemon/server
-LVMLIBS = -ldaemonserver $(LVMINTERNAL_LIBS) -ldevmapper
-
-LIBS += $(PTHREAD_LIBS)
-
-LDFLAGS += -L$(top_builddir)/libdaemon/server $(DAEMON_LDFLAGS)
-CLDFLAGS += -L$(top_builddir)/libdaemon/server
-CFLAGS += $(DAEMON_CFLAGS)
+LDFLAGS += -L$(top_builddir)/libdaemon/server $(EXTRA_EXEC_LDFLAGS) $(ELDFLAGS)
+LIBS += $(DAEMON_LIBS) -ldaemonserver -ldevmapper $(PTHREAD_LIBS)
lvmpolld: $(OBJECTS) $(top_builddir)/libdaemon/client/libdaemonclient.a \
$(top_builddir)/libdaemon/server/libdaemonserver.a
- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LVMLIBS) $(LIBS)
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LIBS)
install_lvmpolld: lvmpolld
$(INSTALL_PROGRAM) -D $< $(sbindir)/$(<F)