X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=.Makefile.inc;h=d13b8fe36bd6d902a76b43b3dc22340df05d948a;hb=4ccfaab6f7feb008028cf6e3440f9dde33fa2fbb;hp=c753bda947ee448505349c2954c542749474bea7;hpb=37283ce7b325fc5d7bbdbf03513ccdd9463762d5;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/.Makefile.inc b/.Makefile.inc index c753bda94..d13b8fe36 100644 --- a/.Makefile.inc +++ b/.Makefile.inc @@ -7,7 +7,7 @@ # CC = @CC@ -MAKE = @MAKEPROG@ +MAKE = @MAKEPROG@ -s PROGS = inspircd NICEFLAGS = @FLAGS@ FLAGS = $(NICEFLAGS) -pedantic @@ -22,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 @@ -40,11 +40,10 @@ debug: @echo "* experiencing problems. *" @echo "* *" @echo "*************************************" - ${MAKE} -C . 'FLAGS=${DEBUG}' 'NICEFLAGS=${NICEDEBUG}' 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 @@ -65,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) @@ -85,7 +84,7 @@ install: all@EXTRA_DIR@ @echo "*************************************" module: - ${MAKE} -C src/modules DIRNAME="src/modules" $(MAKEARGS) ${name} + @${MAKE} -C src/modules DIRNAME="src/modules" $(MAKEARGS) ${name} clean: @echo Cleaning...