Changed from std::map to hash_map

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

diff --git a/.Makefile.inc b/.Makefile.inc
index 4db8dea9f8b1207a5b6478fcbc7556e2a0c278d3..c013e9b5540f1227d6580e8b33abe9dcfc0c81e0 100644 (file)
--- a/.Makefile.inc
+++ b/.Makefile.inc
@@ -12,14 +12,16 @@ MAKE = @MAKEPROG@
 PROGS = inspircd
 FLAGS = @FLAGS@
 LDLIBS = @LDLIBS@
+BASE = @BASE_DIR@
 CONPATH = @CONFIG_DIR@
 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 +30,18 @@ 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
+       @-cp inspircd $(BASE)
+       @-chmod 0700 $(BINPATH)/inspircd
+       @-chmod 0700 $(LIBPATH)/*.so
+       @echo "*************************************"
+       @echo "*      BUILD COMPLETE!              *"
+       @echo "* It is safe to ignore any messages *"
+       @echo "* related to copying of files.      *"
+       @echo "*************************************"
 
 config:
        @cp conf/inspire.motd $(CONPATH)/inspire.motd.example
@@ -39,11 +49,9 @@ config:
        @cp conf/inspire.rules $(CONPATH)/inspire.rules.example
        @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
+       @echo Cleaning...
+       @rm -rvf src/*.so src/*.o src/inspircd src/modules/*.so src/modules/*.o *~ src/*~ src/modules/*~ src/modules/extra/*~
+       @echo Completed.
 
 modclean:
        rm -rf modules/*.so