1
0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-30 17:18:21 +03:00

makefiles: assign vars before include

Before we include, set INCLUDE and TARGETS.
Extend CFLAGS after include.
This commit is contained in:
Zdenek Kabelac 2015-05-13 23:42:17 +02:00
parent b184d7a2ca
commit a2c9ede6b3

View File

@ -33,8 +33,7 @@ SOURCES =\
regex/ttree.c \ regex/ttree.c \
$(interface)/libdm-iface.c $(interface)/libdm-iface.c
INCLUDES = -I$(srcdir)/$(interface) -I$(srcdir) INCLUDES = -I$(srcdir)/$(interface)
CFLAGS += $(UDEV_CFLAGS) $(VALGRIND_CFLAGS)
ifeq ("@STATIC_LINK@", "yes") ifeq ("@STATIC_LINK@", "yes")
LIB_STATIC = $(interface)/libdevmapper.a LIB_STATIC = $(interface)/libdevmapper.a
@ -42,7 +41,7 @@ endif
LIB_SHARED = $(interface)/libdevmapper.$(LIB_SUFFIX) LIB_SHARED = $(interface)/libdevmapper.$(LIB_SUFFIX)
LIB_VERSION = $(LIB_VERSION_DM) 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 = $(SOURCES)
CFLOW_LIST_TARGET = libdevmapper.cflow CFLOW_LIST_TARGET = libdevmapper.cflow
@ -52,6 +51,8 @@ EXPORTED_FN_PREFIX = dm
include $(top_builddir)/make.tmpl include $(top_builddir)/make.tmpl
CFLAGS += $(UDEV_CFLAGS) $(VALGRIND_CFLAGS)
DEFS += -DDM_DEVICE_UID=@DM_DEVICE_UID@ -DDM_DEVICE_GID=@DM_DEVICE_GID@ \ DEFS += -DDM_DEVICE_UID=@DM_DEVICE_UID@ -DDM_DEVICE_GID=@DM_DEVICE_GID@ \
-DDM_DEVICE_MODE=@DM_DEVICE_MODE@ -DDM_DEVICE_MODE=@DM_DEVICE_MODE@