Win32ThreadEngine makes sense now. No gaurantees it compiles yet.

[user/henk/code/inspircd.git] / .Makefile.inc

diff --git a/.Makefile.inc b/.Makefile.inc
index 3afbf67a894f6efd78c995ec02ab3d637e58a5cb..4d8b948550594a9bb7453f4bca7a95807e04238c 100644 (file)
--- a/.Makefile.inc
+++ b/.Makefile.inc
@@ -9,8 +9,10 @@
 CC = @CC@
 MAKE = @MAKEPROG@
 PROGS = inspircd
-FLAGS = @FLAGS@
-DEBUG = @DEVELOPER@
+NICEFLAGS = @FLAGS@
+FLAGS = $(NICEFLAGS) -pedantic
+NICEDEBUG = @DEVELOPER@
+DEBUG = $(NICEDEBUG) -pedantic
 LDLIBS = @LDLIBS@
 BASE = $(DESTDIR)@BASE_DIR@
 CONPATH = $(DESTDIR)@CONFIG_DIR@
@@ -20,7 +22,7 @@ LAUNCHDPATH = $(DESTDIR)/System/Library/LaunchDaemons
 LIBPATH = $(DESTDIR)@LIBRARY_DIR@
 MODULES = @MODULES@
 INSTMODE = 0755
-MAKEARGS = 'PROGS=${PROGS}' 'FLAGS=${FLAGS}' 'CC=${CC}' 'LDLIBS=${LDLIBS}' 'MODULES=${MODULES}' 'MODPATH=${MODPATH}' 'LIBPATH=${LIBPATH}' 'INSTMODE=${INSTMODE}'
+MAKEARGS = 'PROGS=${PROGS}' 'FLAGS=${FLAGS}' 'NICEFLAGS=${NICEFLAGS}' 'CC=${CC}' 'LDLIBS=${LDLIBS}' 'MODULES=${MODULES}' 'MODPATH=${MODPATH}' 'LIBPATH=${LIBPATH}' 'INSTMODE=${INSTMODE}'
 
 all: @MAKEORDER@ finishmessage
 
@@ -38,11 +40,11 @@ debug:
        @echo "*      experiencing problems.       *"
        @echo "*                                   *"
        @echo "*************************************"
-       ${MAKE} -C . 'FLAGS=${DEBUG}' all
+       @${MAKE} -C . 'FLAGS=${DEBUG}' 'NICEFLAGS=${NICEDEBUG}' all
 
 mods:
        @echo "Making modules..."
-       ${MAKE} -C src/modules DIRNAME="src/modules" $(MAKEARGS)
+       @${MAKE} -C src/modules DIRNAME="src/modules" $(MAKEARGS)
 
 # Make this depend on 'ircd' and 'mods', so its always output last even with -j
 finishmessage: ircd mods
@@ -63,7 +65,7 @@ ircd:
        @echo "*   http://www.inspircd.org/wiki    *"
        @echo "*  while you wait for make to run?  *"
        @echo "*************************************"
-       ${MAKE} -C src DIRNAME="src" $(MAKEARGS)
+       @${MAKE} -C src DIRNAME="src" $(MAKEARGS)
 
 install: all@EXTRA_DIR@
        @-install -d -m $(INSTMODE) $(BASE)
@@ -83,7 +85,7 @@ install: all@EXTRA_DIR@
        @echo "*************************************"
 
 module:
-       ${MAKE} -C src/modules DIRNAME="src/modules" $(MAKEARGS) ${name}
+       @${MAKE} -C src/modules DIRNAME="src/modules" $(MAKEARGS) ${name}
 
 clean:
        @echo Cleaning...