summaryrefslogtreecommitdiff
path: root/src/test
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2014-05-24 00:38:25 +0200
committerHaru <haru@dotalux.com>2014-05-25 17:13:24 +0200
commitb7373b6de5b41a4b420741da9ebf0570e36c11c7 (patch)
tree0058b108f2df1745b86cbadfb48fea9fa0aad4bf /src/test
parent9089ea1e9998663f0573abca89ed542f19418b11 (diff)
downloadhercules-b7373b6de5b41a4b420741da9ebf0570e36c11c7.tar.gz
hercules-b7373b6de5b41a4b420741da9ebf0570e36c11c7.tar.bz2
hercules-b7373b6de5b41a4b420741da9ebf0570e36c11c7.tar.xz
hercules-b7373b6de5b41a4b420741da9ebf0570e36c11c7.zip
Improved CFLAGS/CPPFLAGS handling
- Language extensions, such as _GNU_SOURCE are now enabled through CPPFLAGS by the configure script, rather than within the source code. - Moved some configure-time CFLAGS to CPPFLAGS, where appropriate. - Fixes bugreport:8211, thanks to Neoth http://hercules.ws/board/tracker/issue-8211-compiling-warning-in-linux Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'src/test')
-rw-r--r--src/test/Makefile.in4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/test/Makefile.in b/src/test/Makefile.in
index 2ee4e29b7..dea126e46 100644
--- a/src/test/Makefile.in
+++ b/src/test/Makefile.in
@@ -1,6 +1,8 @@
# Copyright (c) Hercules Dev Team, licensed under GNU GPL.
# See the LICENSE file
+# @configure_input@
+
CONFIG_D = ../config
CONFIG_H = $(wildcard $(CONFIG_D)/*.h) $(wildcard $(CONFIG_D)/*/*.h)
@@ -68,7 +70,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@ $(MT19937AR_INCLUDE) $(LIBCONFIG_INCLUDE) -DWITH_SQL @MYSQL_CFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $<
+ @$(CC) @CFLAGS@ @DEFS@ $(MT19937AR_INCLUDE) $(LIBCONFIG_INCLUDE) -DWITH_SQL @MYSQL_CFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $<
# missing object files
$(COMMON_D)/obj_all/common.a: