From a929606f2b5076f3cde546764664da4e39cefd56 Mon Sep 17 00:00:00 2001 From: Zdenek Kabelac Date: Thu, 14 May 2015 14:17:33 +0200 Subject: [PATCH] makefiles: use srcdir Use -I$(srcdir) as that's what we really want here. For %.pot use all includes. --- make.tmpl.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/make.tmpl.in b/make.tmpl.in index 7ff61fd6c..4311490c6 100644 --- a/make.tmpl.in +++ b/make.tmpl.in @@ -274,7 +274,7 @@ 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. -I$(top_builddir)/include +INCLUDES += -I$(srcdir) -I$(top_builddir)/include INC_LNS = $(top_builddir)/include/.symlinks_created @@ -414,7 +414,7 @@ endif $(CXX) -c $(INCLUDES) $(DEFS) $(WFLAGS) $(CXXFLAGS) $(CXXFLAGS_$@) $< -o $@ %.pot: %.c Makefile - $(CC) -E $(INCLUDES) -include $(top_builddir)/include/pogen.h \ + $(CC) -E $(INCLUDES) $(BLKID_CFLAGS) $(VALGRIND_CFLAGS) $(UDEV_CFLAGS) -include $(top_builddir)/include/pogen.h \ $(DEFS) $(WFLAGS) $(CFLAGS) $< > $@ %.so: %.o