Makefiles: Add missing srcdir uses

Add various srcdir prefixes and srcdir relative includes.

Author: vries

Makefile

@@ -165,7 +165,7 @@ $(PLUGIN_OBJECT_GENERATED_FILES): CPPFLAGS+= $(if $(srcdir),-I$(srcdir))
 # This is the standard .c->.o recipe, but it needs to be stated
 # explicitly to support the case that $(srcdir) is not blank.
 $(PLUGIN_OBJECT_FILES): %.o: %.c autogenerated-config.h gcc-python.h $(LIBGCC_C_API_SO) autogenerated-EXTRA_CFLAGS.txt
-	$(COMPILE.c) $(shell cat autogenerated-EXTRA_CFLAGS.txt) $(OUTPUT_OPTION) $<
+	$(COMPILE.c) $(shell cat autogenerated-EXTRA_CFLAGS.txt) $(OUTPUT_OPTION) -I$(srcdir)./ -I$(srcdir)./gcc-c-api -I./gcc-c-api $<
 
 print-gcc-version: print-gcc-version.c autogenerated-EXTRA_CFLAGS.txt
 	$(CC) \
@@ -279,15 +279,15 @@ test: plugin
 
 # Selftest for the cpychecker.py code:
 testcpychecker: plugin
-	$(INVOCATION_ENV_VARS) $(PYTHON) testcpychecker.py -v
+	$(INVOCATION_ENV_VARS) $(PYTHON) $(srcdir)./testcpychecker.py -v
 
 # Selftest for the cpybuilder code:
 testcpybuilder:
-	$(PYTHON) testcpybuilder.py -v
+	$(PYTHON) $(srcdir)./testcpybuilder.py -v
 
 # Selftest for the dejagnu.py code:
 testdejagnu:
-	$(PYTHON) dejagnu.py -v
+	$(PYTHON) $(srcdir)./dejagnu.py -v
 
 dump_gimple:
 	$(CC) -fdump-tree-gimple $(CURDIR)/test.c
@@ -316,14 +316,14 @@ testdemo: plugin print-gcc-version
 	  | sed 's/:[0-9][0-9]*: warning:/:: warning:/;s/ \[enabled by default\]//' \
 	  | sed "s%$(srcdir)demo.c:%demo.c:%g" \
 	  > demo.filtered
-	diff $(DEMO_REF) demo.filtered
+	diff $(srcdir)./$(DEMO_REF) demo.filtered
 	rm demo.out demo.err demo.filtered
 
 json-examples: plugin
 	$(INVOCATION_ENV_VARS) $(srcdir)./gcc-with-cpychecker -I/usr/include/python2.7 -c libcpychecker_html/test/example1/bug.c
 
 test-suite: plugin print-gcc-version testdejagnu testdemo
-	$(INVOCATION_ENV_VARS) $(PYTHON) run-test-suite.py
+	$(INVOCATION_ENV_VARS) $(PYTHON) $(srcdir)./run-test-suite.py
 
 show-ssa: plugin
 	$(INVOCATION_ENV_VARS) $(srcdir)./gcc-with-python examples/show-ssa.py test.c

gcc-c-api/Makefile

@@ -95,7 +95,7 @@ $(LIBGCC_C_API_SO): $(OBJECT_FILES)
 # This is the standard .c->.o recipe, but it needs to be stated
 # explicitly to support the case that $(srcdir) is not blank.
 $(OBJECT_FILES): %.o: %.c $(GENERATED_HEADERS) ../autogenerated-EXTRA_CFLAGS.txt
-	$(COMPILE.c) $(shell cat ../autogenerated-EXTRA_CFLAGS.txt) $(OUTPUT_OPTION) $<
+	$(COMPILE.c) $(shell cat ../autogenerated-EXTRA_CFLAGS.txt) $(OUTPUT_OPTION) -I$(srcdir)./ $<
 
 autogenerated-casts.c: $(SOURCE_XML) xmltypes.py generate-casts-c.py
 	$(PYTHON) $(srcdir)./generate-casts-c.py $@ $(xmldir)