Little optimization: one less variable.

[gedcom-parse.git] / Makefile

diff --git a/Makefile b/Makefile
index 5b3e9b149afe395319d9623d52c29314ccc30164..63be764fef6506171d55b17b880983c762bf226b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,15 +4,20 @@
 YACC=bison
 LEX=flex
 
-CFLAGS=-g -Wall -pedantic
+CFLAGS=-g -W -Wall -pedantic
 YFLAGS=--debug --defines
 LFLAGS=-8
 
+all:   ansel_module gedcom_parse
+
 gedcom_parse:  standalone.o lex.gedcom_1byte_.o lex.gedcom_hilo_.o \
                 lex.gedcom_lohi_.o gedcom.tab.o message.o multilex.o \
                encoding.o
        $(CC) $(LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -o $@
 
+ansel_module:
+       cd ansel && $(MAKE)
+
 lex.gedcom_1byte_.c:   gedcom_1byte.lex gedcom.tab.h gedcom.h multilex.h
        $(LEX) $(LFLAGS) -Pgedcom_1byte_ gedcom_1byte.lex
 
@@ -28,8 +33,9 @@ gedcom.tab.c gedcom.tab.h:    gedcom.y gedcom.h
 clean:
        rm -f core gedcom_parse test_* *.o lex.gedcom_* \
         gedcom.tab.* gedcom.output
+       cd ansel && $(MAKE) clean
 
-# Test programs
+# Lexer test programs
 
 test_1byte:    lex.gedcom_1byte_.test.o message.o encoding.o
        $(CC) $(LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -o $@
@@ -48,3 +54,12 @@ test_lohi:   lex.gedcom_lohi_.test.o message.o encoding.o
 
 lex.gedcom_lohi_.test.o:       lex.gedcom_lohi_.c
        $(CC) -DLEXER_TEST -c $(CPPFLAGS) $(CFLAGS) $^ -o $@
+
+# Test of parser
+
+test:  all
+       @export GCONV_PATH=./ansel; \
+        for file in t/*.ged; do \
+         echo "=== testing $$file"; \
+         ./gedcom_parse $$file; \
+       done