X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=.Makefile.inc;h=d13b8fe36bd6d902a76b43b3dc22340df05d948a;hb=b07868e77c0527642ed72bce84bf5895bf921e87;hp=398a2902ebdd56c04ae5749924ec22fbf26029dd;hpb=e281922d55e302bd823be89895006239248505e3;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/.Makefile.inc b/.Makefile.inc
index 398a2902e..d13b8fe36 100644
--- a/.Makefile.inc
+++ b/.Makefile.inc
@@ -7,10 +7,12 @@
 #
 
 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@
@@ -20,7 +22,7 @@ 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
@@ -63,7 +64,7 @@ ircd:
 	@echo "*   http://www.inspircd.org/wiki    *"
 	@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
+	@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
 	@echo Completed.
 
 modclean:
@@ -115,6 +100,9 @@ modclean:
 	rm -rf lib/*.so
 	rm -f bin/inspircd
 
+deinstall:
+@UNINSTALL_LIST@
+
 squeakyclean: distclean
 
 launchd_dir: