initial merge of David Paktor's fine work.

I redid all of the Makefiles and fixed some minor 
issues with the code.



git-svn-id: svn://coreboot.org/openbios/fcode-utils@76 f158a5a8-5612-0410-a976-696ce0be7e32

Author: Stefan Reinauer

detok/Makefile

@@ -1,11 +1,12 @@
 #
-#                     OpenBIOS - free your system! 
-#                            ( detokenizer )
-#                          
-#  This program is part of a free implementation of the IEEE 1275-1994 
+#                     OpenBIOS - free your system!
+#                             ( Utilities )
+#
+#  This program is part of a free implementation of the IEEE 1275-1994
 #  Standard for Boot (Initialization Configuration) Firmware.
 #
-#  Copyright (C) 2001-2005 Stefan Reinauer, <stepan@openbios.org>
+#  Copyright (C) 2001-2006  Stefan Reinauer <stepan@openbios.org>
+#  Copyright (C) 2006 coresystems GmbH <info@coresystems.de>
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -21,48 +22,37 @@
 #  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
 #
 
-ARCH     := $(shell uname -m | sed -e s/i.86/x86/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/ -e s/x86_64/amd64/ -e "s/Power Macintosh/ppc/")
-TOPDIR   := $(shell /bin/pwd)
-BUILDDIR ?= $(TOPDIR)/obj-$(ARCH)
+PROGRAM = detok
 
-VPATH    := $(BUILDDIR)
+CC      = gcc
+STRIP	= strip
+INCLUDES = -I../shared
+#CFLAGS  = -O2 -g -Wall 
+CFLAGS  = -Os -Wall -Wno-pointer-sign 
+LDFLAGS = 
 
+OBJS  = addfcodes.o decode.o detok.o dictionary.o pcihdr.o printformats.o \
+        stream.o ../shared/classcodes.o
 
-include $(TOPDIR)/Rules.make
+all: .dependencies $(PROGRAM)
 
+$(PROGRAM): $(OBJS)
+	$(CC) -o $(PROGRAM) $(OBJS) $(LDFLAGS)
+	$(STRIP) -s $(PROGRAM)
 
-CC	  =  gcc
-CFLAGS	  =  -O2 -Wall -ansi
+clean:
+	rm -f $(OBJS) *~
 
-# For debugging the indentation code of detok, define DEBUG_INDENT
-#CFLAGS	 :=  $(CFLAGS) -DDEBUG_INDENT
+distclean: clean
+	rm -f $(PROGRAM) .dependencies
+	
+.dependencies: *.c 
+	@$(CC) $(CFLAGS) $(INCLUDES) -MM *.c > .dependencies
 
-all: main detok
-	@echo -e "\nOpenBIOS detokenizer detok build finished\n"
+.PHONY: all clean distclean 
 
-main:
-	@echo -e "\nWelcome to the OpenBIOS detokenizer.."
-	@test -r $(BUILDDIR) || ( mkdir -p $(BUILDDIR); \
-	  echo -e "\nCreating build directory $(BUILDDIR)" )
-		
-detok: detok.o dictionary.o decode.o stream.o 
-	@echo -en "\nLinking fcode detokenizer detok..."
-	@cd $(BUILDDIR) && ( $(CC) $(CFLAGS) $^ -o $@; strip detok )
-	@echo -e "\tok"
-	
-clean:
-	@test ! -d $(BUILDDIR) && \
-		echo "Architecture $(ARCH) is already clean." || \
-		( 						 \
-			echo "Cleaning up architecture $(ARCH)"; \
-			rm -rf $(BUILDDIR)			 \
-			rm forth.dict.core			 \
-		)
+-include .dependencies
 
-distclean: clean
-	rm -f detok
+.c.o:
+	$(CC) -c $(CFLAGS) $(INCLUDES) $< -o $@ 
 
-detok.o:      detok.h stream.h detok.c
-stream.o:     detok.h stream.c
-decode.o:     detok.h stream.h decode.c Makefile
-dictionary.o: detok.h dictionary.c