--- trunk/Makefile.skel	2007/10/08 16:17:48	2
+++ trunk/Makefile.skel	2007/10/08 16:21:34	36
@@ -1,5 +1,5 @@
 #
-#  $Id: Makefile.skel,v 1.25 2005/03/05 11:18:31 debug Exp $
+#  $Id: Makefile.skel,v 1.47 2007/03/16 14:13:59 debug Exp $
 #
 #  Makefile for GXemul
 #
@@ -8,21 +8,13 @@
 BIN=gxemul
 LIBS=$(XLIB) $(OTHERLIBS)
 
-all: $(BIN)
+all: build
 
-$(BIN): do_src do_devices
-	$(CC) $(COPTIM) src/*.o devices/*.o $(LIBS) -o $(BIN)
-
-do_src:
+build:
 	cd src; $(MAKE); cd ..
+	$(CC) $(COPTIM) src/*.o src/cpus/*.o src/debugger/*.o src/devices/*.o src/disk/*.o src/machines/*.o src/native/*.o src/net/*.o src/promemul/*.o $(LIBS) -o $(BIN)
 
-do_devices:
-	cd devices; $(MAKE); cd ..
-
-regtest: gxemul
-	cd tests; $(MAKE) run_tests; cd ..
-
-install: all
+install: build
 	@echo
 	@echo "There is no automatic 'make install'. You need to manually copy the gxemul"
 	@echo "binary and any other files you need to where you want them to reside. The man/"
@@ -32,14 +24,16 @@
 	@echo
 
 clean:
-	rm -f $(BIN) *core core.* *.gmon _*
+	rm -f $(BIN) *core core.* *.gmon _* *.exe
 	cd src; $(MAKE) clean; cd ..
-	cd devices; $(MAKE) clean; cd ..
 
-#  Tests are not cleaned on a normal clean, only on a clean_all.
+#  experiments and demos are not cleaned on a normal clean, only on a clean_all.
 
 clean_all: clean
-	cd tests; $(MAKE) clean_all; cd ..
-	cd devices; $(MAKE) clean_all; cd ..
-	rm -f config.h Makefile src/Makefile devices/Makefile tests/Makefile
-
+	cd experiments; $(MAKE) clean_all; cd ..
+	cd demos; $(MAKE) clean; cd ..
+	rm -f config.h Makefile src/Makefile src/cpus/Makefile
+	rm -f src/debugger/Makefile src/devices/Makefile
+	rm -f src/devices/fonts/Makefile src/disk/Makefile src/machines/Makefile
+	rm -f src/native/Makefile src/net/Makefile
+	rm -f src/promemul/Makefile src/include/Makefile