X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=.Makefile.inc;h=2ad9cbfc90c13334e2365a312a8990085679821e;hb=3a554ef1e9be9dbcf3de3301a4a6c2938d643bea;hp=d9cabab34c670e654ea9c4bace4a9962942fc386;hpb=d20dd9a5c3d08cfcae0febd1fd93e620051395c7;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/.Makefile.inc b/.Makefile.inc
index d9cabab34..2ad9cbfc9 100644
--- a/.Makefile.inc
+++ b/.Makefile.inc
@@ -19,13 +19,18 @@ BINPATH = @BINARY_DIR@
 LIBPATH = @LIBRARY_DIR@
 MODULES = @MODULES@
 STATICLIBS = @STATICLIBS@
+INSTMODE = 0700
 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,31 +42,89 @@ ircd:
 	${MAKE} -C src DIRNAME="src" $(MAKEARGS)
 
 install: all
-	-install -m 0700 src/libIRCDaes.so $(LIBPATH)
-	-install -m 0700 src/libIRCDasyncdns.so $(LIBPATH)
-	-install -m 0700 src/libIRCDbase.so $(LIBPATH)
-	-install -m 0700 src/libIRCDchannels.so $(LIBPATH)
-	-install -m 0700 src/libIRCDcommand_parse.so $(LIBPATH)
-	-install -m 0700 src/libIRCDcommands.so $(LIBPATH)
-	-install -m 0700 src/libIRCDconfigreader.so $(LIBPATH)
-	-install -m 0700 src/libIRCDcull_list.so $(LIBPATH)
-	-install -m 0700 src/libIRCDdynamic.so $(LIBPATH)
-	-install -m 0700 src/libIRCDhash.so $(LIBPATH)
-	-install -m 0700 src/libIRCDhelper.so $(LIBPATH)
-	-install -m 0700 src/libIRCDinspsocket.so $(LIBPATH)
-	-install -m 0700 src/libIRCDmode.so $(LIBPATH)
-	-install -m 0700 src/libIRCDmodules.so $(LIBPATH)
-	-install -m 0700 src/libIRCDsocket.so $(LIBPATH)
-	-install -m 0700 src/libIRCDsocketengine.so $(LIBPATH)
-	-install -m 0700 src/libIRCDstring.so $(LIBPATH)
-	-install -m 0700 src/libIRCDuserprocess.so $(LIBPATH)
-	-install -m 0700 src/libIRCDusers.so $(LIBPATH)
-	-install -m 0700 src/libIRCDwildcard.so $(LIBPATH)
-	-install -m 0700 src/libIRCDxline.so $(LIBPATH)
-	-install -m 0700 src/libIRCDtimer.so $(LIBPATH)
-	-install -m 0700 src/libIRCDsnomasks.so $(LIBPATH)
-	-install -m 0700 src/inspircd $(BINPATH)
-	-install -m 0700 inspircd $(BASE) 2>/dev/null
+	@-mkdir -p ${BASE}
+	@-mkdir -p $(LIBPATH)
+	@-mkdir -p $(BINPATH)
+	@-mkdir -p $(CONPATH)
+	@-mkdir -p ${MODPATH}
+	-install -m $(INSTMODE) src/libIRCDaes.so $(LIBPATH)
+	-install -m $(INSTMODE) src/libIRCDasyncdns.so $(LIBPATH)
+	-install -m $(INSTMODE) src/libIRCDbase.so $(LIBPATH)
+	-install -m $(INSTMODE) src/libIRCDchannels.so $(LIBPATH)
+	-install -m $(INSTMODE) src/libIRCDcommand_parse.so $(LIBPATH)
+	-install -m $(INSTMODE) src/libIRCDcommands.so $(LIBPATH)
+	-install -m $(INSTMODE) src/libIRCDconfigreader.so $(LIBPATH)
+	-install -m $(INSTMODE) src/libIRCDcull_list.so $(LIBPATH)
+	-install -m $(INSTMODE) src/libIRCDdynamic.so $(LIBPATH)
+	-install -m $(INSTMODE) src/libIRCDhash.so $(LIBPATH)
+	-install -m $(INSTMODE) src/libIRCDhelper.so $(LIBPATH)
+	-install -m $(INSTMODE) src/libIRCDinspsocket.so $(LIBPATH)
+	-install -m $(INSTMODE) src/libIRCDmode.so $(LIBPATH)
+	-install -m $(INSTMODE) src/libIRCDmodules.so $(LIBPATH)
+	-install -m $(INSTMODE) src/libIRCDsocket.so $(LIBPATH)
+	-install -m $(INSTMODE) src/libIRCDsocketengine.so $(LIBPATH)
+	-install -m $(INSTMODE) src/libIRCDstring.so $(LIBPATH)
+	-install -m $(INSTMODE) src/libIRCDuserprocess.so $(LIBPATH)
+	-install -m $(INSTMODE) src/libIRCDusers.so $(LIBPATH)
+	-install -m $(INSTMODE) src/libIRCDwildcard.so $(LIBPATH)
+	-install -m $(INSTMODE) src/libIRCDxline.so $(LIBPATH)
+	-install -m $(INSTMODE) src/libIRCDtimer.so $(LIBPATH)
+	-install -m $(INSTMODE) src/libIRCDsnomasks.so $(LIBPATH)
+	-install -m $(INSTMODE) src/inspircd $(BINPATH)
+	-install -m $(INSTMODE) inspircd $(BASE) 2>/dev/null
+	-install -m $(INSTMODE) src/cmd_admin.so $(LIBPATH)
+	-install -m $(INSTMODE) src/cmd_away.so $(LIBPATH)
+	-install -m $(INSTMODE) src/cmd_commands.so $(LIBPATH)
+	-install -m $(INSTMODE) src/cmd_connect.so $(LIBPATH)
+	-install -m $(INSTMODE) src/cmd_die.so $(LIBPATH)
+	-install -m $(INSTMODE) src/cmd_eline.so $(LIBPATH)
+	-install -m $(INSTMODE) src/cmd_gline.so $(LIBPATH)
+	-install -m $(INSTMODE) src/cmd_info.so $(LIBPATH)
+	-install -m $(INSTMODE) src/cmd_invite.so $(LIBPATH)
+	-install -m $(INSTMODE) src/cmd_ison.so $(LIBPATH)
+	-install -m $(INSTMODE) src/cmd_join.so $(LIBPATH)
+	-install -m $(INSTMODE) src/cmd_kick.so $(LIBPATH)
+	-install -m $(INSTMODE) src/cmd_kill.so $(LIBPATH)
+	-install -m $(INSTMODE) src/cmd_kline.so $(LIBPATH)
+	-install -m $(INSTMODE) src/cmd_links.so $(LIBPATH)
+	-install -m $(INSTMODE) src/cmd_list.so $(LIBPATH)
+	-install -m $(INSTMODE) src/cmd_loadmodule.so $(LIBPATH)
+	-install -m $(INSTMODE) src/cmd_lusers.so $(LIBPATH)
+	-install -m $(INSTMODE) src/cmd_map.so $(LIBPATH)
+	-install -m $(INSTMODE) src/cmd_modules.so $(LIBPATH)
+	-install -m $(INSTMODE) src/cmd_motd.so $(LIBPATH)
+	-install -m $(INSTMODE) src/cmd_names.so $(LIBPATH)
+	-install -m $(INSTMODE) src/cmd_nick.so $(LIBPATH)
+	-install -m $(INSTMODE) src/cmd_notice.so $(LIBPATH)
+	-install -m $(INSTMODE) src/cmd_oper.so $(LIBPATH)
+	-install -m $(INSTMODE) src/cmd_part.so $(LIBPATH)
+	-install -m $(INSTMODE) src/cmd_pass.so $(LIBPATH)
+	-install -m $(INSTMODE) src/cmd_ping.so $(LIBPATH)
+	-install -m $(INSTMODE) src/cmd_pong.so $(LIBPATH)
+	-install -m $(INSTMODE) src/cmd_privmsg.so $(LIBPATH)
+	-install -m $(INSTMODE) src/cmd_qline.so $(LIBPATH)
+	-install -m $(INSTMODE) src/cmd_quit.so $(LIBPATH)
+	-install -m $(INSTMODE) src/cmd_rehash.so $(LIBPATH)
+	-install -m $(INSTMODE) src/cmd_restart.so $(LIBPATH)
+	-install -m $(INSTMODE) src/cmd_rules.so $(LIBPATH)
+	-install -m $(INSTMODE) src/cmd_server.so $(LIBPATH)
+	-install -m $(INSTMODE) src/cmd_squit.so $(LIBPATH)
+	-install -m $(INSTMODE) src/cmd_stats.so $(LIBPATH)
+	-install -m $(INSTMODE) src/cmd_summon.so $(LIBPATH)
+	-install -m $(INSTMODE) src/cmd_time.so $(LIBPATH)
+	-install -m $(INSTMODE) src/cmd_topic.so $(LIBPATH)
+	-install -m $(INSTMODE) src/cmd_trace.so $(LIBPATH)
+	-install -m $(INSTMODE) src/cmd_unloadmodule.so $(LIBPATH)
+	-install -m $(INSTMODE) src/cmd_user.so $(LIBPATH)
+	-install -m $(INSTMODE) src/cmd_userhost.so $(LIBPATH)
+	-install -m $(INSTMODE) src/cmd_users.so $(LIBPATH)
+	-install -m $(INSTMODE) src/cmd_version.so $(LIBPATH)
+	-install -m $(INSTMODE) src/cmd_wallops.so $(LIBPATH)
+	-install -m $(INSTMODE) src/cmd_who.so $(LIBPATH)
+	-install -m $(INSTMODE) src/cmd_whois.so $(LIBPATH)
+	-install -m $(INSTMODE) src/cmd_whowas.so $(LIBPATH)
+	-install -m $(INSTMODE) src/cmd_zline.so $(LIBPATH)
+	-install -m $(INSTMODE) src/cmd_mode.so $(LIBPATH)
 	@-cp .gdbargs $(BASE)
 	@-cp conf/inspircd.quotes.example $(CONPATH)
 	@-cp conf/inspircd.rules.example $(CONPATH)
@@ -69,6 +132,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 *"
@@ -87,4 +151,7 @@ modclean:
 	rm -rf src/modules/*.so
 	rm -rf src/modules/*.o
 
-squeakyclean: modclean clean
+squeakyclean: distclean
+
+distclean: modclean clean
+