--- Makefile.orig	2003-09-08 13:08:35.000000000 +0200
+++ Makefile	2005-08-28 21:42:32.000000000 +0200
@@ -30,47 +30,36 @@
 CFLAGS := "-Wall -pedantic -O2 -fexpensive-optimizations -fno-common -fverbose-asm -static"
 
 ## Programm Environment stuff
-CC := gcc $(CFLAGS) $(DEFS)
+CC := gcc
 
 
 ## Make Targets #######################################################
 
-banner : 
-	@echo -e $(VIRUS_MAKE_BANNER)
-
 ## actual stuff doing the build:
 ##------------------------------
 
 OBJECTS := virus.o
-BINARY_LIST := vi virus
+BINARY_LIST := virus
 
 ## create a .o file for every .c file
 %.o : %.c
-	gcc -c $< -o $@
+	$(CC) $(CFLAGS) $(DEFS) -c $< -o $@
+
+virus : $(OBJECTS)
+	$(CC) $(CFLAGS) $(DEFS) -o virus $(OBJECTS)
 
-virus : banner $(OBJECTS)
-	@echo xx creating main binary
-	$(CC) -o virus $(OBJECTS)
-	cp virus vi
-
-strip : banner virus $(OBJECTS)
-	@echo xx stripping binaries
-	strip virus
-	strip vi
+strip : strip virus
 
-all: banner virus strip
-	@echo xx done creating all files
+all: virus strip
 
 
 ## cleanup stuff
 .PHONY : clean
-clean : banner
-	@echo xx cleaning up intermediate objects
+clean :
 	rm -f $(OBJECTS)
 
 .PHONY : distclean
-distclean : banner
-	@echo xx cleaning up
+distclean :
 	rm -f $(BINARY_LIST)
 	rm -f $(OBJECTS)
-	
+