Smart trick: the 'build complete' message is now a makefile section of its own which...

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

diff --git a/.Makefile.inc b/.Makefile.inc
index 3ba7a9f5388752ec2eca959761fd7238c805f694..1ca79206e6495bf169c7e1f45dce67e791cf9374 100644 (file)
--- a/.Makefile.inc
+++ b/.Makefile.inc
@@ -21,11 +21,15 @@ MODULES = @MODULES@
 STATICLIBS = @STATICLIBS@
 MAKEARGS = 'PROGS=${PROGS}' 'FLAGS=${FLAGS}' 'CC=${CC}' 'LDLIBS=${LDLIBS}' 'MODULES=${MODULES}' 'MODPATH=${MODPATH}' 'LIBPATH=${LIBPATH}' 'STATICLIBS=${STATICLIBS}'
 
-all : @MAKEORDER@
+all : @MAKEORDER@ finishmessage
 
 mods:
        @echo "Making modules..."
        ${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
+       @echo ""
        @echo "*************************************"
        @echo "*        BUILD COMPLETE!            *"
        @echo "*   To install InspIRCd, type:      *"
@@ -37,6 +41,11 @@ ircd:
        ${MAKE} -C src DIRNAME="src" $(MAKEARGS)
 
 install: all
+       @-mkdir -p ${BASE}
+       @-mkdir -p $(LIBPATH)
+       @-mkdir -p $(BINPATH)
+       @-mkdir -p $(CONPATH)
+       @-mkdir -p ${MODPATH}
        -install -m 0700 src/libIRCDaes.so $(LIBPATH)
        -install -m 0700 src/libIRCDasyncdns.so $(LIBPATH)
        -install -m 0700 src/libIRCDbase.so $(LIBPATH)
@@ -114,6 +123,7 @@ install: all
        -install -m 0700 src/cmd_whois.so $(LIBPATH)
        -install -m 0700 src/cmd_whowas.so $(LIBPATH)
        -install -m 0700 src/cmd_zline.so $(LIBPATH)
+       -install -m 0700 src/cmd_mode.so $(LIBPATH)
        @-cp .gdbargs $(BASE)
        @-cp conf/inspircd.quotes.example $(CONPATH)
        @-cp conf/inspircd.rules.example $(CONPATH)
@@ -121,6 +131,7 @@ install: all
        @-cp conf/cert.pem $(CONPATH)
        @-cp docs/inspircd.conf.example $(CONPATH)
        ${MAKE} -C src/modules DIRNAME="src/modules" $(MAKEARGS) modinst
+       @echo ""
        @echo "*************************************"
        @echo "*        INSTALL COMPLETE!          *"
        @echo "* It is safe to ignore any messages *"
@@ -139,4 +150,7 @@ modclean:
        rm -rf src/modules/*.so
        rm -rf src/modules/*.o
 
-squeakyclean: modclean clean
+squeakyclean: distclean
+
+distclean: modclean clean
+