From 080980071b952141275526f1745d8d74c10e4deb Mon Sep 17 00:00:00 2001
From: Haru <haru@dotalux.com>
Date: Mon, 1 Jun 2015 17:13:08 +0200
Subject: Removed ".." from include directives

- Include directives are now directory-independent.
- This will allow building plugins from other directories in future.

Signed-off-by: Haru <haru@dotalux.com>
---
 src/test/Makefile.in     | 12 +++++++-----
 src/test/test_spinlock.c | 13 ++++++-------
 2 files changed, 13 insertions(+), 12 deletions(-)

(limited to 'src/test')

diff --git a/src/test/Makefile.in b/src/test/Makefile.in
index dea126e46..8f999fb37 100644
--- a/src/test/Makefile.in
+++ b/src/test/Makefile.in
@@ -9,18 +9,20 @@ CONFIG_H = $(wildcard $(CONFIG_D)/*.h) $(wildcard $(CONFIG_D)/*/*.h)
 COMMON_D = ../common
 COMMON_H = $(wildcard $(COMMON_D)/*.h)
 SYSINFO_INC = $(COMMON_D)/sysinfo.inc
+COMMON_INCLUDE = -I..
 
-LIBCONFIG_D = ../../3rdparty/libconfig
+THIRDPARTY_D = ../../3rdparty
+THIRDPARTY_INCLUDE = -I$(THIRDPARTY_D)
+
+LIBCONFIG_D = $(THIRDPARTY_D)/libconfig
 LIBCONFIG_OBJ = $(addprefix $(LIBCONFIG_D)/, libconfig.o grammar.o scanctx.o \
                 scanner.o strbuf.o)
 LIBCONFIG_H = $(addprefix $(LIBCONFIG_D)/, libconfig.h grammar.h parsectx.h \
               scanctx.h scanner.h strbuf.h wincompat.h)
-LIBCONFIG_INCLUDE = -I$(LIBCONFIG_D)
 
-MT19937AR_D = ../../3rdparty/mt19937ar
+MT19937AR_D = $(THIRDPARTY_D)/mt19937ar
 MT19937AR_OBJ = $(MT19937AR_D)/mt19937ar.o
 MT19937AR_H = $(MT19937AR_D)/mt19937ar.h
-MT19937AR_INCLUDE = -I$(MT19937AR_D)
 
 TEST_SPINLOCK_OBJ = obj/test_spinlock.o
 TEST_SPINLOCK_C = test_spinlock.c
@@ -70,7 +72,7 @@ test_spinlock: $(TEST_SPINLOCK_DEPENDS) Makefile
 
 obj/%.o: %.c $(TEST_SPINLOCK_H) $(COMMON_H) $(CONFIG_H) $(MT19937AR_H) $(LIBCONFIG_H) | obj
 	@echo "	CC	$<"
-	@$(CC) @CFLAGS@ @DEFS@ $(MT19937AR_INCLUDE) $(LIBCONFIG_INCLUDE) -DWITH_SQL @MYSQL_CFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $<
+	@$(CC) @CFLAGS@ @DEFS@ $(COMMON_INCLUDE) $(THIRDPARTY_INCLUDE) -DWITH_SQL @MYSQL_CFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $<
 
 # missing object files
 $(COMMON_D)/obj_all/common.a:
diff --git a/src/test/test_spinlock.c b/src/test/test_spinlock.c
index 19ae9aee7..ace894e9b 100644
--- a/src/test/test_spinlock.c
+++ b/src/test/test_spinlock.c
@@ -1,9 +1,10 @@
+#define HERCULES_CORE
 
-#include "../common/core.h"
-#include "../common/atomic.h"
-#include "../common/thread.h"
-#include "../common/spinlock.h"
-#include "../common/showmsg.h"
+#include "common/core.h"
+#include "common/atomic.h"
+#include "common/thread.h"
+#include "common/spinlock.h"
+#include "common/showmsg.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -12,8 +13,6 @@
 // Simple test for the spinlock implementation to see if it works properly..
 //
 
-
-
 #define THRC 32 //thread Count
 #define PERINC 100000
 #define LOOPS 47
-- 
cgit v1.2.3-60-g2f50