--- trunk/Makefile.skel	2007/10/08 16:18:51	14
+++ trunk/Makefile.skel	2007/10/08 16:22:56	44
@@ -1,5 +1,5 @@
 #
-#  $Id: Makefile.skel,v 1.34 2005/08/29 14:46:30 debug Exp $
+#  $Id: Makefile.skel,v 1.53 2007/06/28 13:36:45 debug Exp $
 #
 #  Makefile for GXemul
 #
@@ -12,7 +12,7 @@
 
 build:
 	cd src; $(MAKE); cd ..
-	$(CC) $(COPTIM) src/*.o src/cpus/*.o src/devices/*.o src/promemul/*.o $(LIBS) -o $(BIN)
+	$(CC) $(COPTIM) src/*.o src/console/*.o src/cpus/*.o src/debugger/*.o src/devices/*.o src/disk/*.o src/file/*.o src/machines/*.o src/net/*.o src/promemul/*.o src/symbol/*.o src/useremul/*.o $(LIBS) -o $(BIN)
 
 install: build
 	@echo
@@ -24,13 +24,20 @@
 	@echo
 
 clean:
-	rm -f $(BIN) *core core.* *.gmon _*
+	rm -f $(BIN) *core core.* *.gmon _* *.exe ktrace.out
 	cd src; $(MAKE) clean; cd ..
 
-#  experiments 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 experiments; $(MAKE) clean_all; cd ..
+	cd demos; $(MAKE) clean; cd ..
 	rm -f config.h Makefile src/Makefile src/cpus/Makefile
-	rm -f src/devices/Makefile src/devices/fonts/Makefile
-	rm -f src/promemul/Makefile
+	rm -f src/debugger/Makefile src/devices/Makefile
+	rm -f src/devices/fonts/Makefile src/disk/Makefile
+	rm -f src/file/Makefile src/machines/Makefile
+	rm -f src/net/Makefile
+	rm -f src/promemul/Makefile src/include/Makefile
+	rm -f src/useremul/Makefile src/include/Makefile
+	rm -f src/console/Makefile src/symbol/Makefile
+