Skip to content

Commit

Permalink
Improved CFLAGS/CPPFLAGS handling
Browse files Browse the repository at this point in the history
- 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>
  • Loading branch information
MishimaHaruna committed May 25, 2014
1 parent 9089ea1 commit b7373b6
Show file tree
Hide file tree
Showing 14 changed files with 322 additions and 216 deletions.
2 changes: 2 additions & 0 deletions 3rdparty/libconfig/Makefile.in
@@ -1,6 +1,8 @@
# Copyright (c) Hercules Dev Team, licensed under GNU GPL.
# See the LICENSE file

# @configure_input@

LIBCONFIG_OBJ = libconfig.o grammar.o scanctx.o scanner.o strbuf.o
LIBCONFIG_H = libconfig.h grammar.h parsectx.h scanctx.h scanner.h strbuf.h wincompat.h

Expand Down
2 changes: 2 additions & 0 deletions 3rdparty/mt19937ar/Makefile.in
@@ -1,6 +1,8 @@
# Copyright (c) Hercules Dev Team, licensed under GNU GPL.
# See the LICENSE file

# @configure_input@

MT19937AR_OBJ = mt19937ar.o
MT19937AR_H = mt19937ar.h

Expand Down
4 changes: 3 additions & 1 deletion Makefile.in
@@ -1,6 +1,8 @@
# Copyright (c) Hercules Dev Team, licensed under GNU GPL.
# See the LICENSE file

# @configure_input@

@SET_MAKE@

HAVE_MYSQL=@HAVE_MYSQL@
Expand Down Expand Up @@ -145,7 +147,7 @@ distclean: clean
@-rm -f $(MF_TARGETS) config.status config.log

sysinfo:
@./sysinfogen.sh src/common/sysinfo_new.inc @CFLAGS@
@./sysinfogen.sh src/common/sysinfo_new.inc @CFLAGS@ @CPPFLAGS@
@if cmp -s src/common/sysinfo.inc src/common/sysinfo_new.inc; then \
rm src/common/sysinfo_new.inc ; \
else \
Expand Down

0 comments on commit b7373b6

Please sign in to comment.