summaryrefslogtreecommitdiff
path: root/make.tmpl.in
diff options
context:
space:
mode:
authorJoe Thornber <ejt@redhat.com>2018-05-14 10:30:20 +0100
committerJoe Thornber <ejt@redhat.com>2018-05-14 10:30:20 +0100
commit7f97c7ea9ade36bab817aca9eeee5c5177550127 (patch)
tree2fac9b50b16b91dd22ca155223c26beba9677377 /make.tmpl.in
parent02b99be57eab4f55bd0db045a3873bdf5e500b92 (diff)
downloadlvm2-7f97c7ea9ade36bab817aca9eeee5c5177550127.tar.gz
build: Don't generate symlinks in include/ dir
As we start refactoring the code to break dependencies (see doc/refactoring.txt), I want us to use full paths in the includes (eg, #include "base/data-struct/list.h"). This makes it more obvious when we're breaking abstraction boundaries, eg, including a file in metadata/ from base/
Diffstat (limited to 'make.tmpl.in')
-rw-r--r--make.tmpl.in8
1 files changed, 3 insertions, 5 deletions
diff --git a/make.tmpl.in b/make.tmpl.in
index d3a80ef0c..7e3f4a481 100644
--- a/make.tmpl.in
+++ b/make.tmpl.in
@@ -306,12 +306,10 @@ LIB_VERSION_DM := $(shell $(AWK) -F '.' '{printf "%s.%s",$$1,$$2}' $(top_srcdir)
LIB_VERSION_APP := $(shell $(AWK) -F '[(). ]' '{printf "%s.%s",$$1,$$4}' $(top_srcdir)/VERSION)
-INCLUDES += -I$(srcdir) -I$(top_builddir)/include
-
-INC_LNS = $(top_builddir)/include/.symlinks_created
+INCLUDES += -I$(top_srcdir) -I$(srcdir) -I$(top_builddir)/include
DEPS = $(top_builddir)/make.tmpl $(top_srcdir)/VERSION \
- $(top_builddir)/Makefile $(INC_LNS)
+ $(top_builddir)/Makefile
OBJECTS = $(SOURCES:%.c=%.o) $(CXXSOURCES:%.cpp=%.o)
POTFILES = $(SOURCES:%.c=%.pot)
@@ -509,7 +507,7 @@ $(LIB_STATIC): $(OBJECTS)
$(Q) $(RM) $@
$(Q) $(AR) rsv $@ $(OBJECTS) > /dev/null
-%.d: $(INC_LNS)
+%.d:
.PRECIOUS: %.d
%.mo: %.po