X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=.Makefile.inc;h=91901a5a38bc7e6d2cc232b3e20d956f791d5289;hb=92fb37b10ffc5b0213ea8373bebb4418a2b44c4c;hp=af5a617e994a545c566cf565601141bbdfb8a488;hpb=532bf476780b046108a8b60a2d72812552ed6e4b;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/.Makefile.inc b/.Makefile.inc
index af5a617e9..91901a5a3 100644
--- a/.Makefile.inc
+++ b/.Makefile.inc
@@ -1,26 +1,28 @@
 #             InspIRCd Main Makefile
 #
-#     (C) InspIRCd Development Team, 2002-2007
+#     (C) InspIRCd Development Team, 2002-2009
 # This file is automagically generated by configure, from
 #    .Makefile.inc. Any changes made will go away! :P
 # Please do not edit unless you know what you're doing.
 #
 
 CC = @CC@
-MAKE = @MAKEPROG@
+MAKE = @MAKEPROG@ -s
 PROGS = inspircd
-FLAGS = @FLAGS@
-DEBUG = @DEVELOPER@
+NICEFLAGS = @FLAGS@
+FLAGS = $(NICEFLAGS) -pedantic
+NICEDEBUG = @DEVELOPER@
+DEBUG = $(NICEDEBUG) -pedantic
 LDLIBS = @LDLIBS@
-BASE = $(DESTDIR)@BASE_DIR@
-CONPATH = $(DESTDIR)@CONFIG_DIR@
-MODPATH = $(DESTDIR)@MODULE_DIR@
-BINPATH = $(DESTDIR)@BINARY_DIR@
-LAUNCHDPATH = $(DESTDIR)/System/Library/LaunchDaemons
-LIBPATH = $(DESTDIR)@LIBRARY_DIR@
+BASE = "$(DESTDIR)@BASE_DIR@"
+CONPATH = "$(DESTDIR)@CONFIG_DIR@"
+MODPATH = "$(DESTDIR)@MODULE_DIR@"
+BINPATH = "$(DESTDIR)@BINARY_DIR@"
+LAUNCHDPATH = "$(DESTDIR)/System/Library/LaunchDaemons"
+LIBPATH = "$(DESTDIR)@LIBRARY_DIR@"
 MODULES = @MODULES@
 INSTMODE = 0755
-MAKEARGS = 'PROGS=${PROGS}' 'FLAGS=${FLAGS}' 'CC=${CC}' 'LDLIBS=${LDLIBS}' 'MODULES=${MODULES}' 'MODPATH=${MODPATH}' 'LIBPATH=${LIBPATH}' 'INSTMODE=${INSTMODE}'
+MAKEARGS = 'PROGS=${PROGS}' 'FLAGS=${FLAGS}' 'NICEFLAGS=${NICEFLAGS}' 'CC=${CC}' 'LDLIBS=${LDLIBS}' 'MODULES=${MODULES}' 'MODPATH=${MODPATH}' 'LIBPATH=${LIBPATH}' 'INSTMODE=${INSTMODE}'
 
 all: @MAKEORDER@ finishmessage
 
@@ -38,11 +40,10 @@ debug:
 	@echo "*      experiencing problems.       *"
 	@echo "*                                   *"
 	@echo "*************************************"
-	${MAKE} -C . 'FLAGS=${DEBUG}' all
+	@${MAKE} -C . 'FLAGS=${DEBUG}' 'NICEFLAGS=${NICEDEBUG}' all
 
 mods:
-	@echo "Making modules..."
-	${MAKE} -C src/modules DIRNAME="src/modules" $(MAKEARGS)
+	@${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
@@ -60,10 +61,10 @@ ircd:
 	@echo "*                                   *"
 	@echo "*   This will take a *long* time.   *"
 	@echo "*     Why not read our wiki at      *"
-	@echo "*   http://www.inspircd.org/wiki    *"
+	@echo "*     http://wiki.inspircd.org      *"
 	@echo "*  while you wait for make to run?  *"
 	@echo "*************************************"
-	${MAKE} -C src DIRNAME="src" $(MAKEARGS)
+	@${MAKE} -C src DIRNAME="src" $(MAKEARGS)
 
 install: all@EXTRA_DIR@
 	@-install -d -m $(INSTMODE) $(BASE)
@@ -71,24 +72,8 @@ install: all@EXTRA_DIR@
 	@-install -d -m $(INSTMODE) $(BINPATH)
 	@-install -d -m $(INSTMODE) $(CONPATH)
 	@-install -d -m $(INSTMODE) $(MODPATH)
-@INSTALL_LIST@	-install -m $(INSTMODE) src/inspircd $(BINPATH)
 	-install -m $(INSTMODE) @STARTSCRIPT@ $(@DESTINATION@) 2>/dev/null
-	@-cp .gdbargs $(BASE)
-	@-cp conf/inspircd.quotes.example $(CONPATH)
-	@-cp conf/inspircd.rules.example $(CONPATH)
-	@-cp conf/inspircd.motd.example $(CONPATH)
-	@-cp conf/inspircd.helpop-full.example $(CONPATH)
-	@-cp conf/inspircd.helpop.example $(CONPATH)
-	@-cp conf/inspircd.censor.example $(CONPATH)
-	@-cp conf/inspircd.filter.example $(CONPATH)
-	@-cp conf/key.pem $(CONPATH)
-	@-cp conf/cert.pem $(CONPATH)
-	@-cp docs/inspircd.conf.example $(CONPATH)
-	${MAKE} modinstall
-
-modinstall: mods
-	${MAKE} -C src/modules DIRNAME="src/modules" $(MAKEARGS) modinst
-	@echo ""
+@INSTALL_LIST@	@echo ""
 	@echo "*************************************"
 	@echo "*        INSTALL COMPLETE!          *"
 	@echo "*                                   *"
@@ -99,11 +84,11 @@ modinstall: mods
 	@echo "*************************************"
 
 module:
-	${MAKE} -C src/modules DIRNAME="src/modules" $(MAKEARGS) ${name}
+	@${MAKE} -C src/modules DIRNAME="src/modules" $(MAKEARGS) ${name}
 
 clean:
 	@echo Cleaning...
-	@rm -rvf src/*.so src/*.dylib src/*.o src/inspircd src/modules/*.so src/modules/*.o *~ src/*~ src/modules/*~ src/modules/extra/*~ src/modes/*~ src/modes/*.o src/modes/*.a src/commands/*.so src/commands/*.o src/modules/*/*.o src/modules/*/*.so src/socketengines/*.o
+	@rm -rf src/*.so src/*.dylib src/*.o src/inspircd src/modules/*.so src/modules/*.o *~ src/*~ src/modules/*~ src/modules/extra/*~ src/modes/*~ src/modes/*.o src/modes/*.a src/commands/*.so src/commands/*.o src/modules/*/*.o src/modules/*/*.so src/socketengines/*.o
 	@echo Completed.
 
 modclean:
@@ -115,6 +100,9 @@ modclean:
 	rm -rf lib/*.so
 	rm -f bin/inspircd
 
+deinstall:
+@UNINSTALL_LIST@
+
 squeakyclean: distclean
 
 launchd_dir:
@@ -122,11 +110,11 @@ launchd_dir:
 
 configureclean:
 	rm -f .config.cache
-	rm src/modules/Makefile
-	rm src/Makefile
-	rm Makefile
-	rm include/inspircd_config.h
-	rm include/inspircd_se_config.h
+	rm -f src/modules/Makefile
+	rm -f src/Makefile
+	rm -f Makefile
+	rm -f include/inspircd_config.h
+	rm -f include/inspircd_se_config.h
 
 distclean: modclean clean configureclean