Fixed fd_Setsize in cygwin

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

diff --git a/.Makefile.inc b/.Makefile.inc
index 743cb4aae64f542d25598a7f4789db583389b93b..d4f8d4745fb943bc4a3261446cabbdf5115824cb 100644 (file)
--- a/.Makefile.inc
+++ b/.Makefile.inc
@@ -7,7 +7,7 @@
 # Small modifications by <brain@ChatSpike.net>
 #
 
-CC = g++
+CC = @CC@
 MAKE = @MAKEPROG@
 PROGS = inspircd
 FLAGS = @FLAGS@
@@ -17,9 +17,10 @@ MODPATH = @MODULE_DIR@
 BINPATH = @BINARY_DIR@
 LIBPATH = @LIBRARY_DIR@
 MODULES = @MODULES@
-MAKEARGS = 'PROGS=${PROGS}' 'FLAGS=${FLAGS}' 'CC=${CC}' 'LDLIBS=${LDLIBS}' 'MODULES=${MODULES}' 'MODPATH=$(MODPATH)' 'LIBPATH=$(LIBPATH)'
+STATICLIBS = @STATICLIBS@
+MAKEARGS = 'PROGS=${PROGS}' 'FLAGS=${FLAGS}' 'CC=${CC}' 'LDLIBS=${LDLIBS}' 'MODULES=${MODULES}' 'MODPATH=${MODPATH}' 'LIBPATH=${LIBPATH}' 'STATICLIBS=${STATICLIBS}'
 
-all : ircd mods config bininst
+all : @MAKEORDER@
 
 mods:
        ${MAKE} -C src/modules DIRNAME="src/modules" $(MAKEARGS)
@@ -28,10 +29,12 @@ ircd:
        ${MAKE} -C src DIRNAME="src" $(MAKEARGS)
 
 bininst:
+       @-rm -f $(BINPATH)/*.so
+       @-rm -f $(BINPATH)/inspircd
        @-cp src/*.so $(LIBPATH)
        @-cp src/inspircd $(BINPATH)
-       @chmod 0700 $(BINPATH)/inspircd
-       @chmod 0700 $(LIBPATH)/*.so
+       @-chmod 0700 $(BINPATH)/inspircd
+       @-chmod 0700 $(LIBPATH)/*.so
 
 config:
        @cp conf/inspire.motd $(CONPATH)/inspire.motd.example
@@ -40,11 +43,14 @@ config:
        @cp docs/*.example $(CONPATH)
 clean:
        rm -rf src/*.so
+       rm -rf src/*.o
        rm -rf src/inspircd
        rm -rf src/modules/*.so
+       rm -rf src/modules/*.o
 
 modclean:
        rm -rf modules/*.so
        rm -rf src/modules/*.so
+       rm -rf src/modules/*.o
 
 squeakyclean: modclean clean