diff options
| author | Zdenek Kabelac <zkabelac@redhat.com> | 2018-06-14 20:48:08 +0200 |
|---|---|---|
| committer | Zdenek Kabelac <zkabelac@redhat.com> | 2018-06-14 22:02:01 +0200 |
| commit | 52ab3c1584cd40572e82d6add7a7c71204fa9721 (patch) | |
| tree | b9dfc17b2756f5105ed8820b06a2149d6eaaa234 /make.tmpl.in | |
| parent | a457566e918840e2f21e724afd1b7f470fcbb02a (diff) | |
| download | lvm2-52ab3c1584cd40572e82d6add7a7c71204fa9721.tar.gz | |
build: drop libdm referring from lvm code
Avoid adding /libdm paths into lvm building.
Diffstat (limited to 'make.tmpl.in')
| -rw-r--r-- | make.tmpl.in | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/make.tmpl.in b/make.tmpl.in index 0790d7bcb..07cb18a67 100644 --- a/make.tmpl.in +++ b/make.tmpl.in @@ -144,7 +144,6 @@ vpath %.po $(srcdir) vpath %.exported_symbols $(srcdir) interface = @interface@ -interfacebuilddir = $(top_builddir)/libdm/$(interface) rpmbuilddir = $(abs_top_builddir)/build # The number of jobs to run, if blank, defaults to the make standard @@ -252,18 +251,14 @@ endif DEFS += -DDEBUG # memory debugging is not thread-safe yet ifneq ("@BUILD_DMEVENTD@", "yes") - ifneq ("@BUILD_DMFILEMAPD@", "yes") ifneq ("@BUILD_LVMLOCKD@", "yes") ifneq ("@BUILD_LVMPOLLD@", "yes") ifneq ("@BUILD_LVMETAD@", "yes") - ifeq ("@CLVMD@", "none") DEFS += -DDEBUG_MEM endif endif endif endif - endif - endif endif # end of fPIC protection @@ -271,8 +266,8 @@ endif DEFS += -D_BUILDING_LVM -LDFLAGS += -L$(top_builddir)/libdm -L$(top_builddir)/lib -CLDFLAGS += -L$(top_builddir)/libdm -L$(top_builddir)/lib +LDFLAGS += -L$(top_builddir)/lib +CLDFLAGS += -L$(top_builddir)/lib DAEMON_LIBS = -ldaemonclient LDFLAGS += -L$(top_builddir)/libdaemon/client @@ -426,8 +421,6 @@ CFLOW_FLAGS +=\ --symbol __REDIRECT:wrapper \ --symbol __REDIRECT_NTH:wrapper \ --symbol __wur:wrapper \ - -I$(top_srcdir)/libdm \ - -I$(top_srcdir)/libdm/ioctl \ -I$(top_srcdir)/daemons/dmeventd/plugins/lvm2/ \ $(INCLUDES) $(DEFS) |