Move static map of extensions into ServerInstance, add const-correctness

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

diff --git a/.Makefile.inc b/.Makefile.inc
index abb1393e9fd824f72e48cfc3764866e1a9ef2911..9f51019e031e6d69f0de6259faca4ac9bf5fba94 100644 (file)
--- a/.Makefile.inc
+++ b/.Makefile.inc
@@ -41,10 +41,12 @@ INSTMODE = 0755
   LDLIBS += -ldl
   SHARED = -bundle -twolevel_namespace -undefined dynamic_lookup
   CORELDFLAGS = -dynamic -bind_at_load -L.
+@ELSIFEQ $(SYSTEM) interix
+  CXXFLAGS += -D_ALL_SOURCE -I/usr/local/include
 @ENDIF 
 
 @IFDEF D
-    CXXFLAGS += -g3
+    CXXFLAGS += -g3 -Werror
     HEADER = debug-header
 @ELSE
     CXXFLAGS += -g1
@@ -65,7 +67,7 @@ CXXFLAGS += -Iinclude
 @ELSE
     @GNU_ONLY MAKEFLAGS += --silent
     @BSD_ONLY MAKE += -s
-    RUNCC = $(SOURCEPATH)/make/run-cc.pl $(CC)
+    RUNCC = perl $(SOURCEPATH)/make/run-cc.pl $(CC)
 @ENDIF
 
 @DO_EXPORT RUNCC CXXFLAGS CC LDLIBS PICLDFLAGS VERBOSE SOCKETENGINE CORELDFLAGS
@@ -138,6 +140,8 @@ finishmessage: target
 
 install: target@EXTRA_DIR@
        @-install -d -m $(INSTMODE) $(BASE)
+       @-install -d -m $(INSTMODE) $(BASE)/data
+       @-install -d -m $(INSTMODE) $(BASE)/logs
        @-install -d -m $(INSTMODE) $(BINPATH)
        @-install -d -m $(INSTMODE) $(CONPATH)
        @-install -d -m $(INSTMODE) $(MODPATH)
@@ -155,19 +159,20 @@ install: target@EXTRA_DIR@
        @echo "* REMEMBER TO EDIT YOUR CONFIG FILE *"
        @echo "*************************************"
 
-@GNU_ONLY GNUmakefile: .Makefile.inc configure .config.cache
+@GNU_ONLY RCS_FILES = $(wildcard .git/index .svn/entries)
+@GNU_ONLY GNUmakefile: .Makefile.inc configure .config.cache $(RCS_FILES)
 @GNU_ONLY      ./configure -update
 
 clean:
        @echo Cleaning...
-       @rm -f src/inspircd src/modes/modeclasses.a
-       @rm -f src/*.so src/modules/*.so src/commands/*.so
-       @rm -f src/*.o src/*/*.o src/modules/*/*.o
-       @rm -f src/.*.d src/*/.*.d src/modules/*/.*.d
-       @rm -f $(BUILDPATH)/bin/inspircd $(BUILDPATH)/include $(BUILDPATH)/real.mk
-       @rm -rf $(BUILDPATH)/obj $(BUILDPATH)/modules
-       @-rmdir $(BUILDPATH)/bin
-       @-rmdir $(BUILDPATH)
+       @-rm -f src/inspircd src/modes/modeclasses.a include/inspircd_se_config.h
+       @-rm -f src/*.so src/modules/*.so src/commands/*.so
+       @-rm -f src/*.o src/*/*.o src/modules/*/*.o
+       @-rm -f src/.*.d src/*/.*.d src/modules/*/.*.d
+       @-rm -f $(BUILDPATH)/bin/inspircd $(BUILDPATH)/include $(BUILDPATH)/real.mk
+       @-rm -rf $(BUILDPATH)/obj $(BUILDPATH)/modules
+       @-rmdir $(BUILDPATH)/bin 2>/dev/null
+       @-rmdir $(BUILDPATH) 2>/dev/null
        @echo Completed.
 
 deinstall:
@@ -190,7 +195,6 @@ configureclean:
        rm -f GNUmakefile
        rm -f include/inspircd_config.h
        rm -f include/inspircd_version.h
-       rm -f include/inspircd_se_config.h
 
 distclean: clean configureclean