X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=.Makefile.inc;h=32e437a5d3ee140ba8e94a045a637743254da907;hb=48262da087538c38b91bf3a1a51ffaa5e61e502f;hp=f2bd5a09c712a66b8f1a7bdf9bceed9af4762e59;hpb=5ce577ae4b559a4bde18ce470b6fa2d9d6ecd596;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/.Makefile.inc b/.Makefile.inc
index f2bd5a09c..32e437a5d 100644
--- a/.Makefile.inc
+++ b/.Makefile.inc
@@ -26,44 +26,49 @@ all : @MAKEORDER@
 mods:
 	@echo "Making modules..."
 	${MAKE} -C src/modules DIRNAME="src/modules" $(MAKEARGS)
-
-ircd:
-	@echo "Making ircd..."
-	${MAKE} -C src DIRNAME="src" $(MAKEARGS)
 	@echo "*************************************"
 	@echo "*        BUILD COMPLETE!            *"
 	@echo "*   To install InspIRCd, type:      *"
 	@echo "*         make install              *"
 	@echo "*************************************"
 
-install:
-	-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)
+ircd:
+	@echo "Making ircd..."
+	${MAKE} -C src DIRNAME="src" $(MAKEARGS)
+
+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 "*************************************"