--- trunk/Makefile.skel	2007/10/08 16:19:56	24
+++ trunk/Makefile.skel	2007/10/08 16:21:53	38
@@ -1,5 +1,5 @@
 #
-#  $Id: Makefile.skel,v 1.42 2006/05/17 18:07:17 debug Exp $
+#  $Id: Makefile.skel,v 1.49 2007/04/10 16:33:44 debug Exp $
 #
 #  Makefile for GXemul
 #
@@ -12,12 +12,9 @@
 
 build:
 	cd src; $(MAKE); cd ..
-	$(CC) $(COPTIM) src/*.o src/cpus/*.o src/debugger/*.o src/devices/*.o src/machines/*.o src/promemul/*.o $(LIBS) -o $(BIN)
+	$(CC) $(COPTIM) src/*.o src/cpus/*.o src/debugger/*.o src/devices/*.o src/disk/*.o src/file/*.o src/machines/*.o src/native/*.o src/net/*.o src/promemul/*.o $(LIBS) -o $(BIN)
 
-docs:
-	cd doc; $(MAKE); cd ..
-
-install: build docs
+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/"
@@ -27,9 +24,8 @@
 	@echo
 
 clean:
-	rm -f $(BIN) *core core.* *.gmon _* *.exe
+	rm -f $(BIN) *core core.* *.gmon _* *.exe ktrace.out
 	cd src; $(MAKE) clean; cd ..
-	cd doc; $(MAKE) clean; cd ..
 
 #  experiments and demos are not cleaned on a normal clean, only on a clean_all.
 
@@ -37,7 +33,8 @@
 	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
-	rm -f src/devices/Makefile src/devices/fonts/Makefile
-	rm -f src/machines/Makefile doc/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/native/Makefile src/net/Makefile
 	rm -f src/promemul/Makefile src/include/Makefile