Change some resolver stuff.

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

diff --git a/.Makefile.inc b/.Makefile.inc
index c534a866a2a7b790de92acd27611685b7eb1e4dd..32e437a5d3ee140ba8e94a045a637743254da907 100644 (file)
--- a/.Makefile.inc
+++ b/.Makefile.inc
@@ -24,47 +24,61 @@ MAKEARGS = 'PROGS=${PROGS}' 'FLAGS=${FLAGS}' 'CC=${CC}' 'LDLIBS=${LDLIBS}' 'MODU
 all : @MAKEORDER@
 
 mods:
+       @echo "Making modules..."
        ${MAKE} -C src/modules DIRNAME="src/modules" $(MAKEARGS)
+       @echo "*************************************"
+       @echo "*        BUILD COMPLETE!            *"
+       @echo "*   To install InspIRCd, type:      *"
+       @echo "*         make install              *"
+       @echo "*************************************"
 
 ircd:
+       @echo "Making ircd..."
        ${MAKE} -C src DIRNAME="src" $(MAKEARGS)
 
-bininst:
-       -install -v -m 0700 src/libIRCDaes.so $(LIBPATH)
-       -install -v -m 0700 src/libIRCDasyncdns.so $(LIBPATH)
-       -install -v -m 0700 src/libIRCDbase.so $(LIBPATH)
-       -install -v -m 0700 src/libIRCDchannels.so $(LIBPATH)
-       -install -v -m 0700 src/libIRCDcommand_parse.so $(LIBPATH)
-       -install -v -m 0700 src/libIRCDcommands.so $(LIBPATH)
-       -install -v -m 0700 src/libIRCDcull_list.so $(LIBPATH)
-       -install -v -m 0700 src/libIRCDdnsqueue.so $(LIBPATH)
-       -install -v -m 0700 src/libIRCDdynamic.so $(LIBPATH)
-       -install -v -m 0700 src/libIRCDhash.so $(LIBPATH)
-       -install -v -m 0700 src/libIRCDhelper.so $(LIBPATH)
-       -install -v -m 0700 src/libIRCDio.so $(LIBPATH)
-       -install -v -m 0700 src/libIRCDmessage.so $(LIBPATH)
-       -install -v -m 0700 src/libIRCDmode.so $(LIBPATH)
-       -install -v -m 0700 src/libIRCDmodules.so $(LIBPATH)
-       -install -v -m 0700 src/libIRCDsocket.so $(LIBPATH)
-       -install -v -m 0700 src/libIRCDsocketengine.so $(LIBPATH)
-       -install -v -m 0700 src/libIRCDstring.so $(LIBPATH)
-       -install -v -m 0700 src/libIRCDuserprocess.so $(LIBPATH)
-       -install -v -m 0700 src/libIRCDusers.so $(LIBPATH)
-       -install -v -m 0700 src/libIRCDwildcard.so $(LIBPATH)
-       -install -v -m 0700 src/libIRCDxline.so $(LIBPATH)
-       -install -v -m 0700 src/libIRCDtimer.so $(LIBPATH)
-       -install -v -m 0700 src/inspircd $(BINPATH)
+install: all
+       @-install -v -m 0700 src/libIRCDaes.so $(LIBPATH)
+       @-install -v -m 0700 src/libIRCDasyncdns.so $(LIBPATH)
+       @-install -v -m 0700 src/libIRCDbase.so $(LIBPATH)
+       @-install -v -m 0700 src/libIRCDchannels.so $(LIBPATH)
+       @-install -v -m 0700 src/libIRCDcommand_parse.so $(LIBPATH)
+       @-install -v -m 0700 src/libIRCDcommands.so $(LIBPATH)
+       @-install -v -m 0700 src/libIRCDconfigreader.so $(LIBPATH)
+       @-install -v -m 0700 src/libIRCDcull_list.so $(LIBPATH)
+       @-install -v -m 0700 src/libIRCDdnsqueue.so $(LIBPATH)
+       @-install -v -m 0700 src/libIRCDdynamic.so $(LIBPATH)
+       @-install -v -m 0700 src/libIRCDhash.so $(LIBPATH)
+       @-install -v -m 0700 src/libIRCDhelper.so $(LIBPATH)
+       @-install -v -m 0700 src/libIRCDinspsocket.so $(LIBPATH)
+       @-install -v -m 0700 src/libIRCDmessage.so $(LIBPATH)
+       @-install -v -m 0700 src/libIRCDmode.so $(LIBPATH)
+       @-install -v -m 0700 src/libIRCDmodules.so $(LIBPATH)
+       @-install -v -m 0700 src/libIRCDsocket.so $(LIBPATH)
+       @-install -v -m 0700 src/libIRCDsocketengine.so $(LIBPATH)
+       @-install -v -m 0700 src/libIRCDstring.so $(LIBPATH)
+       @-install -v -m 0700 src/libIRCDuserprocess.so $(LIBPATH)
+       @-install -v -m 0700 src/libIRCDusers.so $(LIBPATH)
+       @-install -v -m 0700 src/libIRCDwildcard.so $(LIBPATH)
+       @-install -v -m 0700 src/libIRCDxline.so $(LIBPATH)
+       @-install -v -m 0700 src/libIRCDtimer.so $(LIBPATH)
+       @-install -v -m 0700 src/libIRCDsnomasks.so $(LIBPATH)
+       @-install -v -m 0700 src/inspircd $(BINPATH)
        @-install -v -m 0700 inspircd $(BASE) 2>/dev/null
+       @-cp .gdbargs $(BASE)
+       @-cp conf/inspircd.quotes.example $(CONPATH)
+       @-cp conf/inspircd.rules.example $(CONPATH)
+       @-cp conf/key.pem $(CONPATH)
+       @-cp conf/cert.pem $(CONPATH)
+       @-cp docs/inspircd.conf.example $(CONPATH)
+       ${MAKE} -C src/modules DIRNAME="src/modules" $(MAKEARGS) modinst
        @echo "*************************************"
-       @echo "*      BUILD COMPLETE!              *"
+       @echo "*        INSTALL COMPLETE!          *"
        @echo "* It is safe to ignore any messages *"
        @echo "* related to copying of files.      *"
+       @echo "*                                   *"
+       @echo "* REMEMBER TO EDIT YOUR CONFIG FILE *"
        @echo "*************************************"
 
-config:
-       @-cp conf/inspircd.quotes.example $(CONPATH)
-       @-cp conf/inspircd.rules.example $(CONPATH)
-       @-cp docs/inspircd.conf.example $(CONPATH)
 clean:
        @echo Cleaning...
        @rm -rvf src/*.so src/*.o src/inspircd src/modules/*.so src/modules/*.o *~ src/*~ src/modules/*~ src/modules/extra/*~