X-Git-Url: http://gitweb.hachti.de/?a=blobdiff_plain;f=Makefile;h=29336ae726e695e733460041961112b87761abc5;hb=6ad6bd16506f180bf1a9214233bae33ccf25a299;hp=f9a129abbc3a34c6c2284d3b5e9e69156cfa63cc;hpb=fa105a9b1957e54e3a63fdcda359fd0abc453a44;p=h316.git

diff --git a/Makefile b/Makefile
index f9a129a..29336ae 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,5 @@
 # Toplevel Makefile for Hachti's H316 stuff collection
 
-<<<<<<< Makefile
 # First we need the PC side tools. Nothing runs without them!
 SUBDIRS=pc-tools/ldc pc-tools/src-filters  pc-tools/boot-maker 
 
@@ -25,22 +24,17 @@ SUBDIRS+=programs/mandelbrot\
         programs/punchomat\
 
 
-=======
-SUBDIRS=pc-tools/ldc pc-tools/src-filters  pc-tools/boot-maker lib/iolib lib/fortran \
-        lib/fortran  lib/iolib programs/mandelbrot\
-        programs/punchomat programs/tools systems
->>>>>>> 1.12
-
 #lib/fortran/vpunch-help
 
 # If you want to build the docs, too: Uncomment next line:
 #SUBDIRS+=docs/manual
-cvsclean: clean
-	touch slst/* sys/*
 
 default: 
 	@$(foreach subdir, $(SUBDIRS), $(MAKE) -C $(subdir)&&) /bin/true
 
+cvsclean: clean
+	touch slst/* sys/*
+
 %:
 	@echo $@
 	$(foreach subdir, $(SUBDIRS), $(MAKE) -C $(subdir) $@;)