revert Makefile changes

Makefile

@@ -34,33 +34,18 @@ MODULES=ast type lexer common genxml parser typecore optimizer typeload \
 codegen gencommon genas3 gencpp genjs genneko genphp genswf8 \
 	genswf9 genswf genjava gencs interp typer matcher dce main
 
-ADDITIONAL_LIBS=neko javalib ziplib swflib
-
 export HAXE_STD_PATH=$(CURDIR)/std
 
-all: haxe
-
-libs: $(ADDITIONAL_LIBS) extlib extc xml-light
-
-$(ADDITIONAL_LIBS):
-	$(MAKE) $(MFLAGS) -C libs/$@
-
-extlib:
-	$(MAKE) $(MFLAGS) -C libs/extlib opt
-
-extc: extlib
-	$(MAKE) $(MFLAGS) -C libs/extc native
-
-xml-light:
-	$(MAKE) $(MFLAGS) -C libs/xml-light xml-light.cmxa
-
-neko: extlib
+all: libs haxe
 
-javalib: extlib
-
-ziplib: extc extlib
-
-swflib: extlib extc
+libs:
+	make -C libs/extlib opt
+	make -C libs/extc native
+	make -C libs/neko
+	make -C libs/javalib
+	make -C libs/ziplib
+	make -C libs/swflib
+	make -C libs/xml-light xml-light.cmxa
 
 haxe: $(MODULES:=.cmx)
 	$(OCAMLOPT) -o $(OUTPUT) $(NATIVE_LIBS) $(LIBS) $(MODULES:=.cmx)
@@ -100,11 +85,9 @@ export:
 	cp haxe*.exe doc/CHANGES.txt $(EXPORT)
 	rsync -a --exclude .svn --exclude *.n --exclude std/libs --delete std $(EXPORT)
 
-ast.cmx: extlib
+codegen.cmx: optimizer.cmx typeload.cmx typecore.cmx type.cmx genxml.cmx common.cmx ast.cmx
 
-codegen.cmx: optimizer.cmx typeload.cmx typecore.cmx type.cmx genxml.cmx common.cmx ast.cmx xml-light
-
-common.cmx: type.cmx ast.cmx  swflib javalib
+common.cmx: type.cmx ast.cmx
 
 dce.cmx: ast.cmx common.cmx type.cmx
 
@@ -116,15 +99,15 @@ gencpp.cmx: type.cmx lexer.cmx common.cmx codegen.cmx ast.cmx
 
 gencs.cmx: type.cmx lexer.cmx gencommon.cmx common.cmx codegen.cmx ast.cmx
 
-genjava.cmx: type.cmx gencommon.cmx common.cmx codegen.cmx ast.cmx ziplib
+genjava.cmx: type.cmx gencommon.cmx common.cmx codegen.cmx ast.cmx
 
 genjs.cmx: type.cmx optimizer.cmx lexer.cmx common.cmx codegen.cmx ast.cmx
 
-genneko.cmx: type.cmx lexer.cmx common.cmx codegen.cmx ast.cmx neko
+genneko.cmx: type.cmx lexer.cmx common.cmx codegen.cmx ast.cmx
 
 genphp.cmx: type.cmx lexer.cmx common.cmx codegen.cmx ast.cmx
 
-genswf.cmx: type.cmx genswf9.cmx genswf8.cmx common.cmx ast.cmx ziplib
+genswf.cmx: type.cmx genswf9.cmx genswf8.cmx common.cmx ast.cmx
 
 genswf8.cmx: type.cmx lexer.cmx common.cmx codegen.cmx ast.cmx
 
@@ -134,8 +117,6 @@ genxml.cmx: type.cmx lexer.cmx common.cmx ast.cmx
 
 interp.cmx: typecore.cmx type.cmx lexer.cmx genneko.cmx common.cmx codegen.cmx ast.cmx genswf.cmx parser.cmx
 
-lexer.cmx: ast.cmx lexer.ml
-
 matcher.cmx: optimizer.cmx codegen.cmx typecore.cmx type.cmx typer.cmx common.cmx ast.cmx
 
 main.cmx: dce.cmx matcher.cmx typer.cmx typeload.cmx typecore.cmx type.cmx parser.cmx optimizer.cmx lexer.cmx interp.cmx genxml.cmx genswf.cmx genphp.cmx genneko.cmx genjs.cmx gencpp.cmx genas3.cmx common.cmx codegen.cmx ast.cmx gencommon.cmx genjava.cmx gencs.cmx
@@ -153,14 +134,21 @@ typeload.cmx: typecore.cmx type.cmx parser.cmx optimizer.cmx lexer.cmx common.cm
 
 typer.cmx: typeload.cmx typecore.cmx type.cmx parser.cmx optimizer.cmx lexer.cmx interp.cmx genneko.cmx genjs.cmx common.cmx codegen.cmx ast.cmx
 
-clean: clean_libs clean_haxe clean_tools
+lexer.cmx: lexer.ml
+
+lexer.cmx: ast.cmx
 
-CLEANLIB_pattern=clean_lib_%
 
-$(CLEANLIB_pattern):
-	$(MAKE) $(MFLAGS) -C libs/$* clean
+clean: clean_libs clean_haxe clean_tools
 
-clean_libs: $(patsubst %,$(CLEANLIB_pattern), extlib extc neko ziplib javalib swflib xml-light)
+clean_libs:
+	make -C libs/extlib clean
+	make -C libs/extc clean
+	make -C libs/neko clean
+	make -C libs/ziplib clean
+	make -C libs/javalib clean
+	make -C libs/swflib clean
+	make -C libs/xml-light clean
 
 clean_haxe:
 	rm -f $(MODULES:=.obj) $(MODULES:=.o) $(MODULES:=.cmx) $(MODULES:=.cmi) lexer.ml