From afb737db68c8a9a46db3034f888250b1ce11f61d Mon Sep 17 00:00:00 2001
From: Daniel Mack <zonque@gmail.com>
Date: Tue, 19 Aug 2014 16:22:53 +0200
Subject: [PATCH] Revert "test/Makefile: only look at $(KERNELDIR)/usr/include
 for files with quotes"

This reverts commit baeb2d8bbf2360524d4104ea851407a14085cef9.

Turns out this confuses cpp even more.

For now, people have to to 'make headers_install' in the kernel dir before
building kdbus.
---
 test/Makefile     | 3 +--
 test/kdbus-util.c | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/test/Makefile b/test/Makefile
index a0a1edb..38459a2 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,7 +1,6 @@
 CFLAGS		+= -std=gnu99 -Wall -Wextra -g \
+		   -I$(KERNELDIR)/usr/include \
 		   -I$(KERNELDIR)/include/uapi \
-		   -I. \
-		   -I- \
 		   -D_GNU_SOURCE \
 		   -Wno-unused-parameter \
 		   -Wmaybe-uninitialized \
diff --git a/test/kdbus-util.c b/test/kdbus-util.c
index 67b7435..f79d7ec 100644
--- a/test/kdbus-util.c
+++ b/test/kdbus-util.c
@@ -24,10 +24,10 @@
 #include <sys/ioctl.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
+#include <linux/memfd.h>
 #include <linux/unistd.h>
 #include <linux/fcntl.h>
 
-#include "linux/memfd.h"
 #include "kdbus-util.h"
 #include "kdbus-enum.h"
 
-- 
2.34.1