X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=Makefile;h=ac01d3922d0932afd3f0313f88ed93d8859dcd86;hb=d38733b97417d5495142cf3a75d6e43d989a140a;hp=63be764fef6506171d55b17b880983c762bf226b;hpb=a54348309c92f4d7a2dd66b4055122a7be19ca28;p=gedcom-parse.git

diff --git a/Makefile b/Makefile
index 63be764..ac01d39 100644
--- a/Makefile
+++ b/Makefile
@@ -18,13 +18,16 @@ gedcom_parse:	standalone.o lex.gedcom_1byte_.o lex.gedcom_hilo_.o \
 ansel_module:
 	cd ansel && $(MAKE)
 
-lex.gedcom_1byte_.c:	gedcom_1byte.lex gedcom.tab.h gedcom.h multilex.h
+lex.gedcom_1byte_.c:	gedcom_1byte.lex gedcom.tab.h gedcom.h multilex.h \
+			gedcom_lex_common.c encoding.h
 	$(LEX) $(LFLAGS) -Pgedcom_1byte_ gedcom_1byte.lex
 
-lex.gedcom_hilo_.c:	gedcom_hilo.lex gedcom.tab.h gedcom.h multilex.h
+lex.gedcom_hilo_.c:	gedcom_hilo.lex gedcom.tab.h gedcom.h multilex.h \
+			gedcom_lex_common.c encoding.h
 	$(LEX) $(LFLAGS) -Pgedcom_hilo_ gedcom_hilo.lex
 
-lex.gedcom_lohi_.c:	gedcom_lohi.lex gedcom.tab.h gedcom.h multilex.h
+lex.gedcom_lohi_.c:	gedcom_lohi.lex gedcom.tab.h gedcom.h multilex.h \
+			gedcom_lex_common.c encoding.h
 	$(LEX) $(LFLAGS) -Pgedcom_lohi_ gedcom_lohi.lex
 
 gedcom.tab.c gedcom.tab.h:	gedcom.y gedcom.h
@@ -37,24 +40,33 @@ clean:
 
 # Lexer test programs
 
-test_1byte:	lex.gedcom_1byte_.test.o message.o encoding.o
+lexer_1byte:	lex.gedcom_1byte_.test.o message.o encoding.o
 	$(CC) $(LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -o $@
 
 lex.gedcom_1byte_.test.o:	lex.gedcom_1byte_.c
 	$(CC) -DLEXER_TEST -c $(CPPFLAGS) $(CFLAGS) $^ -o $@
 
-test_hilo:	lex.gedcom_hilo_.test.o message.o encoding.o
+test_1byte:	lexer_1byte
+	cat t/allged.ged | ./lexer_1byte
+
+lexer_hilo:	lex.gedcom_hilo_.test.o message.o encoding.o
 	$(CC) $(LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -o $@
 
 lex.gedcom_hilo_.test.o:	lex.gedcom_hilo_.c
 	$(CC) -DLEXER_TEST -c $(CPPFLAGS) $(CFLAGS) $^ -o $@
 
-test_lohi:	lex.gedcom_lohi_.test.o message.o encoding.o
+test_hilo:	lexer_hilo
+	cat t/uhlcl.ged | ./lexer_hilo
+
+lexer_lohi:	lex.gedcom_lohi_.test.o message.o encoding.o
 	$(CC) $(LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -o $@
 
 lex.gedcom_lohi_.test.o:	lex.gedcom_lohi_.c
 	$(CC) -DLEXER_TEST -c $(CPPFLAGS) $(CFLAGS) $^ -o $@
 
+test_lohi:	lexer_lohi
+	cat t/ulhcl.ged | ./lexer_lohi
+
 # Test of parser
 
 test:	all