From 18aa541ca270d70899ab7ec6095075b70a21fb09 Mon Sep 17 00:00:00 2001 From: Zdenek Kabelac Date: Fri, 21 Dec 2018 19:11:49 +0100 Subject: configure: avoid repeative inclusion of configure.h Since configure.h is a generated header and it's missing traditional ifdefs preambule - it can be included & parsed multiple times. Normally compiler is fine when defines have same value and there is no warning - yet we don't need to parse this several times and by adding -include directive we can ensure every file in the package is rightly compile with configure.h as the first header file. --- make.tmpl.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'make.tmpl.in') diff --git a/make.tmpl.in b/make.tmpl.in index 9158f0e12..f3332e91c 100644 --- a/make.tmpl.in +++ b/make.tmpl.in @@ -294,12 +294,12 @@ 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_srcdir) -I$(top_builddir)/include +INCLUDES += -I$(srcdir) -I$(top_srcdir) -I$(top_builddir)/include -include configure.h #VDO_INCLUDES=-I@VDO_INCLUDE@ DEPS = $(top_builddir)/make.tmpl $(top_srcdir)/VERSION \ - $(top_builddir)/Makefile + $(top_builddir)/Makefile $(top_builddir)/include/configure.h OBJECTS = $(SOURCES:%.c=%.o) $(CXXSOURCES:%.cpp=%.o) POTFILES = $(SOURCES:%.c=%.pot) -- cgit v1.2.1