--- Makefile.orig	Tue Jul  4 13:02:19 2006
+++ Makefile	Thu Apr 12 13:34:51 2007
@@ -21,7 +21,7 @@
 	touch ${COMMON_TARGETS}
 	for adaptor in $(ADAPTORS) Adaptor ; do \
 		echo Cleaning $$adaptor ; \
-		( cd $${adaptor} ; make clean ) ; \
+		( cd $${adaptor} ; $(MAKE) $(MFLAGS) clean ) ; \
 	done
 
 OS_NOT_DEFINED:
@@ -29,22 +29,9 @@
 	exit 1
 
 ${COMMON_TARGETS}: Adaptor
-	cd Adaptor ; make
+	cd Adaptor ; $(MAKE) $(MFLAGS)
 
-CGI::
-	cd CGI ; make
+$(ADAPTORS) :
+	$(MAKE) -C $@ $(MFLAGS)
 
-Apache::
-	cd Apache ; make
-
-Apache2::
-	cd Apache2 ; make
-
-Apache2.2::
-	cd Apache2.2 ; make
-
-IIS::
-	cd IIS ; make
-
-NSAPI::
-	cd NSAPI ; make
+.PHONY: all clean $(ADAPTORS)