summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZdenek Kabelac <zkabelac@redhat.com>2015-05-13 23:42:17 +0200
committerZdenek Kabelac <zkabelac@redhat.com>2015-05-14 00:19:33 +0200
commita2c9ede6b38f2a454e1a18fc4cac9dd06af04972 (patch)
treefb3fb432eee50facc4deb119f380a35718c471d3
parentb184d7a2ca03d0ad82cc37007578e8c9d4fa0497 (diff)
downloadlvm2-a2c9ede6b38f2a454e1a18fc4cac9dd06af04972.tar.gz
makefiles: assign vars before include
Before we include, set INCLUDE and TARGETS. Extend CFLAGS after include.
-rw-r--r--libdm/Makefile.in7
1 files changed, 4 insertions, 3 deletions
diff --git a/libdm/Makefile.in b/libdm/Makefile.in
index 8e057c385..852cab055 100644
--- a/libdm/Makefile.in
+++ b/libdm/Makefile.in
@@ -33,8 +33,7 @@ SOURCES =\
regex/ttree.c \
$(interface)/libdm-iface.c
-INCLUDES = -I$(srcdir)/$(interface) -I$(srcdir)
-CFLAGS += $(UDEV_CFLAGS) $(VALGRIND_CFLAGS)
+INCLUDES = -I$(srcdir)/$(interface)
ifeq ("@STATIC_LINK@", "yes")
LIB_STATIC = $(interface)/libdevmapper.a
@@ -42,7 +41,7 @@ endif
LIB_SHARED = $(interface)/libdevmapper.$(LIB_SUFFIX)
LIB_VERSION = $(LIB_VERSION_DM)
-TARGETS += libdevmapper.$(LIB_SUFFIX) libdevmapper.$(LIB_SUFFIX).$(LIB_VERSION)
+TARGETS = libdevmapper.$(LIB_SUFFIX) libdevmapper.$(LIB_SUFFIX).$(LIB_VERSION)
CFLOW_LIST = $(SOURCES)
CFLOW_LIST_TARGET = libdevmapper.cflow
@@ -52,6 +51,8 @@ EXPORTED_FN_PREFIX = dm
include $(top_builddir)/make.tmpl
+CFLAGS += $(UDEV_CFLAGS) $(VALGRIND_CFLAGS)
+
DEFS += -DDM_DEVICE_UID=@DM_DEVICE_UID@ -DDM_DEVICE_GID=@DM_DEVICE_GID@ \
-DDM_DEVICE_MODE=@DM_DEVICE_MODE@