Index: eagle_bin/test_parser/Makefile
===================================================================
--- eagle_bin/test_parser/Makefile	(revision 9546)
+++ eagle_bin/test_parser/Makefile	(revision 9547)
@@ -1,6 +1,6 @@
-GENHT=../../../../../trunk/src_3rd/liblihata/genht
+GENHT=../../../../../trunk/src_3rd/liblihata
 CFLAGS = -Wall -g -ansi -pedantic -Dinline -I$(GENHT)
-HASHO = $(GENHT)/hash.o $(GENHT)/htss.o
+HASHO = $(GENHT)/genht/hash.o $(GENHT)/genht/htss.o
 
 main: main.o eagle_bin.o egb_tree.o $(HASHO)
 
Index: eagle_bin/test_parser/eagle_bin.c
===================================================================
--- eagle_bin/test_parser/eagle_bin.c	(revision 9546)
+++ eagle_bin/test_parser/eagle_bin.c	(revision 9547)
@@ -291,7 +291,7 @@
 		},
 		{ /* subsection sizes */
 			{12, 4, SS_RECURSIVE, NULL}, /* lib */
-			{2,  2, SS_DIRECT, NULL},    /* globals */
+			{2,  2, SS_DIRECT, "plain"}, /* globals */
 			{16, 4, SS_RECURSIVE, NULL}, /* package refs */
 			{20, 4, SS_RECURSIVE, NULL}, /* nets */
 			TERM
@@ -2176,7 +2176,7 @@
 
 		if (ss->ss_type == SS_DIRECT) {
 			long lp = 0;
-			printf("%s #About to parse %ld direct sub-blocks {\n", ind, numch);
+			printf("%s #About to parse %ld direct sub-blocks for %s {\n", ind, numch, ss->tree_name);
 			for(n = 0; n < numch && *numblocks > 0; n++) {
 				int res = read_block(numblocks, level+1, ctx, f, fn);
 				if (res < 0)
@@ -2188,7 +2188,7 @@
 		}
 		else {
 			long rem, lp = 0;
-			printf("%s #About to parse %ld recursive sub-blocks {\n", ind, numch);
+			printf("%s #About to parse %ld recursive sub-blocks for %s {\n", ind, numch, ss->tree_name);
 			if (ss->ss_type == SS_RECURSIVE_MINUS_1)
 				numch--;
 			rem = numch;