--- trunk/Makefile.skel	2007/10/08 16:18:00	4
+++ trunk/Makefile.skel	2007/10/08 16:21:17	34
@@ -1,5 +1,5 @@
 #
-#  $Id: Makefile.skel,v 1.28 2005/04/15 22:28:42 debug Exp $
+#  $Id: Makefile.skel,v 1.46 2007/02/07 19:50:30 debug Exp $
 #
 #  Makefile for GXemul
 #
@@ -8,12 +8,11 @@
 BIN=gxemul
 LIBS=$(XLIB) $(OTHERLIBS)
 
+all: build
+
 build:
 	cd src; $(MAKE); cd ..
-	$(CC) $(COPTIM) src/*.o src/devices/*.o $(LIBS) -o $(BIN)
-
-regtest: build
-	cd tests; $(MAKE) run_tests; cd ..
+	$(CC) $(COPTIM) src/*.o src/cpus/*.o src/debugger/*.o src/devices/*.o src/machines/*.o src/native/*.o src/net/*.o src/promemul/*.o $(LIBS) -o $(BIN)
 
 install: build
 	@echo
@@ -25,12 +24,16 @@
 	@echo
 
 clean:
-	rm -f $(BIN) *core core.* *.gmon _*
+	rm -f $(BIN) *core core.* *.gmon _* *.exe
 	cd src; $(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 ..
-	rm -f config.h Makefile src/Makefile src/devices/Makefile src/devices/fonts/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/machines/Makefile
+	rm -f src/native/Makefile src/net/Makefile
+	rm -f src/promemul/Makefile src/include/Makefile