Merge branch 'anopeng' into anopeng-config

git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1428 5417fbe8-f217-4b02-8779-1006273d7864

1 files changed, 30 insertions, 57 deletions

diff --git a/Makefile.in b/Makefile.in
index 21da8f7c5..f30f5695e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,12 +1,10 @@
 CC=g++ # probably wrong but oh well.
 INCLUDEDIR=../include
 ANOPELIBS=@ANOPELIBS@
-CFLAGS=@CFLAGS@ -Wall -pedantic -Wshadow
-STRICT=-Wall -ansi -pedantic
+CFLAGS=@CFLAGS@ -Wall -ansi -pedantic -Wshadow
 PROFILE=-pg
 LDPROFILE=
 SHELL=/bin/sh
-SUBDIRS=src
 BINDEST=@BINDEST@
 DATDEST=@DATDEST@
 INSTALL=@INSTALL@
@@ -22,7 +20,6 @@ SHARED=@SHARED@
 MODULEFLAGS=@MODULEFLAGS@
 
 all:   language headers build core protocols tools modules 
-strict: language headers strict_build strict_core strict_protocols strict_tools strict_modules
 profile: language headers profile_build profile_core profile_protocols profile_tools profile_modules
 
 MAKEARGS = 'CFLAGS=${CFLAGS}' 'CC=${CC}' 'ANOPELIBS=${ANOPELIBS}' \
@@ -33,99 +30,75 @@ MAKEARGS = 'CFLAGS=${CFLAGS}' 'CC=${CC}' 'ANOPELIBS=${ANOPELIBS}' \
 	   'MYSQL=${MYSQL}' 'SHARED=${SHARED}' 'MODULEFLAGS=${MODULEFLAGS}'
 
 build: language headers
-	@for i in $(SUBDIRS); do \
-            echo "*** Building $$i";\
-            ( cd $$i; ${MAKE} ${MAKEARGS} all; ) \
-        done
-
-strict_build:  
-	@for i in $(SUBDIRS); do \
-            echo "*** Strict Building $$i";\
-            ( cd $$i; ${MAKE} ${MAKEARGS} 'CFLAGS=${CFLAGS} $(STRICT)' all; ) \
-        done
+	@${MAKE} -C src ${MAKEARGS} all
 
 profile_build:
-	@for i in $(SUBDIRS); do \
-            echo "*** Strict Building $$i";\
-            ( cd $$i; ${MAKE} ${MAKEARGS} 'CFLAGS=${CFLAGS} $(PROFILE)' 'LDFLAGS=${LDFLAGS} ${PROFILE}' all; ) \
-        done
+	@${MAKE} -C src ${MAKEARGS} 'CFLAGS=${CFLAGS} $(PROFILE)' 'LDFLAGS=${LDFLAGS} ${PROFILE}' all
 
 modules: build
-	(cd src/modules ; ./configure ; ${MAKE} ${MAKEARGS} all; )
+	@src/modules/configure src/modules
+	@${MAKE} -C src/modules ${MAKEARGS} all
 	@echo "*** All done, now (g)make install to install Anope/Modules";
 
 clean_modules:
-	(cd src ; ${MAKE} ${MAKEARGS} clean_modules )
+	@${MAKE} -C src ${MAKEARGS} clean_modules
 
 distclean_modules:
-	(cd src ; ${MAKE} ${MAKEARGS} distclean_modules )
+	@${MAKE} -C src ${MAKEARGS} distclean_modules
 
 protocols: build
 	@echo "*** Building protocol support";
-	(cd src/protocol ; ./configure ; ${MAKE} ${MAKEARGS} all; )
-
-strict_protocols: build
-	@echo "*** Building protocol support";
-	(cd src/protocol ; ./configure ; ${MAKE} ${MAKEARGS} 'CFLAGS=${CFLAGS} $(STRICT)' all; )
+	@src/protocol/configure src/protocol
+	@${MAKE} -C src/protocol ${MAKEARGS} all
 
 profile_protocols: build
 	@echo "*** Building protocol support";
-	(cd src/protocol ; ./configure ; ${MAKE} ${MAKEARGS} 'CFLAGS=${CFLAGS} ${PROFILE}' 'PROFILE=${PROFILE}' all; )
+	@src/protocol/configure src/protocol
+	@${MAKE} -C src/protocol ${MAKEARGS} 'CFLAGS=${CFLAGS} ${PROFILE}' 'PROFILE=${PROFILE}' all
 
 core: build 
 	@echo "*** Building Core modules";
-	(cd src/ ; ${MAKE} ${MAKEARGS} core; )
-
-strict_core: build 
-	@echo "*** Building Core modules";
-	(cd src/ ; ${MAKE} ${MAKEARGS} 'CFLAGS=${CFLAGS} $(STRICT)' core; )
+	 @${MAKE} -C src ${MAKEARGS} core
 
 profile_core: build 
 	@echo "*** Building Core modules";
-	(cd src/ ; ${MAKE} ${MAKEARGS} 'CFLAGS=${CFLAGS} ${PROFILE}' 'PROFILE=${PROFILE}' core; )
+	@${MAKE} -C src ${MAKEARGS} 'CFLAGS=${CFLAGS} ${PROFILE}' 'PROFILE=${PROFILE}' core
 
 tools: build
-	(cd src/tools ; ${MAKE} ${MAKEARGS} all; )
-	@echo "*** All done, now (g)make install to install Anope/Modules/Tools";
-
-strict_tools: strict_build
-	(cd src/tools ; ${MAKE} ${MAKEARGS} 'CFLAGS=${CFLAGS} $(STRICT)' all; )
+	@${MAKE} -C src/tools ${MAKEARGS} all
 	@echo "*** All done, now (g)make install to install Anope/Modules/Tools";
 
 profile_tools: profile_build
-	(cd src/tools ; ${MAKE} ${MAKEARGS} 'CFLAGS=${CFLAGS} $(PROFILE)' all; )
+	@${MAKE} -C src/tools ${MAKEARGS} 'CFLAGS=${CFLAGS} $(PROFILE)' all
 	@echo "*** All done, now (g)make install to install Anope/Modules/Tools";
 
-strict_modules: strict_build
-	(cd src/modules ; ./configure ; ${MAKE} ${MAKEARGS} 'CFLAGS=$(CFLAGS) $(STRICT)' all; )
-	@echo "*** All done, now (g)make install to install Anope/Modules";
-
 profile_modules: profile_build
-	(cd src/modules ; ./configure ; ${MAKE} ${MAKEARGS} 'CFLAGS=${CFLAGS} ${PROFILE}' 'PROFILE=${PROFILE}' all; )
+	@src/modules/configure src/modules
+	@${MAKE} -C src/modules ${MAKEARGS} 'CFLAGS=${CFLAGS} ${PROFILE}' 'PROFILE=${PROFILE}' all
 	@echo "*** All done, now (g)make install to install Anope/Modules";
 
 language:
-	(cd lang ; $(MAKE) ${MAKEARGS} all language.h ; )
+	@$(MAKE) -C lang ${MAKEARGS} all language.h
 
 headers:
-	(cd include ; ${MAKE} ${MAKEARGS} )
+	@${MAKE} -C include ${MAKEARGS}
 
 clean:
-	(cd lang ; ${MAKE} ${MAKEARGS} clean )
-	(cd include ; ${MAKE} ${MAKEARGS} clean )
-	(cd src ; ${MAKE} ${MAKEARGS} clean )
-	(cd src/tools ; ${MAKE} ${MAKEARGS} clean )
-
+	${MAKE} -C lang ${MAKEARGS} clean
+	${MAKE} -C include ${MAKEARGS} clean
+	${MAKE} -C src ${MAKEARGS} clean
+	${MAKE} -C src/tools ${MAKEARGS} clean
+                
 distclean: clean
-	(cd lang ; ${MAKE} distclean )
-	(cd include ; ${MAKE} distclean )
-	(cd src ; ${MAKE} distclean )
-	(cd src/tools ; ${MAKE} distclean )
+	${MAKE} -C lang ${MAKEARGS} distclean
+	${MAKE} -C include ${MAKEARGS} distclean
+	${MAKE} -C src ${MAKEARGS} distclean
+	${MAKE} -C src/tools ${MAKEARGS} distclean
 	rm -f config.log config.status config.cache Makefile src/bin/anoperc
 
 install: DUMMY
-	(cd src ; ${MAKE} ${MAKEARGS} install)
-	(cd src/tools ; ${MAKE} ${MAKEARGS} install)
+	${MAKE} -C src ${MAKEARGS} install
+	${MAKE} -C src/tools ${MAKEARGS} install
 	@echo "*** All done, Anope is now installed. Please read docs/INSTALL for details on what to do now.";
 
 DUMMY: