diff options
| author | Joe Thornber <ejt@redhat.com> | 2018-04-27 16:06:59 +0100 |
|---|---|---|
| committer | Joe Thornber <ejt@redhat.com> | 2018-04-27 16:06:59 +0100 |
| commit | cdcea0bf55c170f538c3ffc114792eb3c993f4ac (patch) | |
| tree | 58fed42320ef420b663023f17ea074f076bfe0c8 /make.tmpl.in | |
| parent | 5c878167a25728fa73a6b7866785a318ba5da7e3 (diff) | |
| download | lvm2-cdcea0bf55c170f538c3ffc114792eb3c993f4ac.tar.gz | |
build: Stop creating the symlinks in include/ on the fly.
Git handles symlinks, tar handles symlinks. So I've just put the
links themselves into git.
This simplifies dependencies a little, and stop some build loops I was
hitting.
External build dir now works too.
Diffstat (limited to 'make.tmpl.in')
| -rw-r--r-- | make.tmpl.in | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/make.tmpl.in b/make.tmpl.in index 75134caa7..454239259 100644 --- a/make.tmpl.in +++ b/make.tmpl.in @@ -307,12 +307,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$(srcdir) -I$(top_srcdir)/include -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) @@ -505,7 +503,7 @@ $(LIB_STATIC): $(OBJECTS) $(Q) $(RM) $@ $(Q) $(AR) rsv $@ $(OBJECTS) > /dev/null -%.d: %.c $(INC_LNS) +%.d: %.c @echo " [DEP] $<" $(Q) $(MKDIR_P) $(dir $@); \ set -e; \ |