git » fp-git.git » commit beb2ba1

diff --git a/FP/src/Makefile b/FP/src/Makefile
index fdfacc1..bed3b3c 100644
--- a/FP/src/Makefile
+++ b/FP/src/Makefile
@@ -10,7 +10,8 @@ INDEXER    = @cd ..;./install; cd src
 DOWNLOADER = @cd ..;./install -d; cd src
 REMOVER    = @rm -f
 AWK        = awk
-GREP       = @grep -v -e '^[[:space:]]*\(none[[:space:]]*\|\#.*\)\{0,1\}$$'
+GREP       = @cat
+#@grep -v -e '^[[:space:]]*\(none[[:space:]]*\|\#.*\)\{0,1\}$$'
 
 #####################
 # Operating Systems #
@@ -107,7 +108,8 @@ checkgrep:
 clean:
 	$(INFO) Erasing temporary object files...
 	$(REMOVER) $(OBJFILES) $(EXEFILE)\
-	           $(GENERATEDRESHEADERS) $(GENERATEDSTAHEADERS) $(GENERATEDTILHEADERS)
+	           $(GENERATEDRESHEADERS) $(GENERATEDSTAHEADERS) $(GENERATEDTILHEADERS)\
+						 $(SRC2)
 
 build: clean $(EXEFILE)
 
diff --git a/FP/src/conf/awk/res_conf_parts.awk b/FP/src/conf/awk/res_conf_parts.awk
index 11936e7..80bb678 100644
--- a/FP/src/conf/awk/res_conf_parts.awk
+++ b/FP/src/conf/awk/res_conf_parts.awk
@@ -33,7 +33,7 @@ BEGIN {
 	printf("\n/* parts */\n")
 } 
 
-{
+/^([ ]*[^# ].*)$/ {
 	start=offset
 	offset=end=$2+offset
 	printf (" /* %s, size=%d */\n#define res_get_part_%s(a) (((a)>>%d)&0x%08x)\n#define res_set_part_%s(a) (((a)&0x%08x)<<%d)\n",\
diff --git a/FP/src/conf/awk/states_conf_static.awk b/FP/src/conf/awk/states_conf_static.awk
index 28c702b..146ae26 100644
--- a/FP/src/conf/awk/states_conf_static.awk
+++ b/FP/src/conf/awk/states_conf_static.awk
@@ -60,6 +60,7 @@ BEGIN {
 					moveOffset=$5
 					moveType=tolower($4)
 				} else if (listType == "conditions") {
+					if ($4=="none") next
 					if (oldType != listType ) {
 						oldType=listType
 						currentCondition++
diff --git a/FP/src/conf/awk/tiles_conf_types.awk b/FP/src/conf/awk/tiles_conf_types.awk
index e82d32e..67cd7a7 100644
--- a/FP/src/conf/awk/tiles_conf_types.awk
+++ b/FP/src/conf/awk/tiles_conf_types.awk
@@ -28,7 +28,7 @@
 #  DO NOT remove this copyright notice
 #
 
-/^[ ]*tile .*$/ {
+/^[ ]*tile / {
 	a=""
 	i=15-length($2)
 	while(i--) a=sprintf(" %s",a)