X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=Makefile;h=87673b74dd56cab60bfe4e9a30ebd7c5e3ff5d3f;hb=fc87b76b187927b327435f7c7ff88f787367f4e8;hp=ac01d3922d0932afd3f0313f88ed93d8859dcd86;hpb=479f49e5a0cfe09f8600c6c6cacd3a0fb86ffe2d;p=gedcom-parse.git

diff --git a/Makefile b/Makefile
index ac01d39..87673b7 100644
--- a/Makefile
+++ b/Makefile
@@ -1,77 +1,43 @@
 # $Id$
 # $Name$
 
-YACC=bison
-LEX=flex
-
-CFLAGS=-g -W -Wall -pedantic
+DMALLOC_CFLAGS=
+DMALLOC_LOADLIBES=
+CFLAGS=-g -W -Wall -pedantic $(DMALLOC_CFLAGS)
+CPPFLAGS=-I ./include
 YFLAGS=--debug --defines
 LFLAGS=-8
+LOADLIBES=$(DMALLOC_LOADLIBES)
+LDFLAGS_GEDCOM=-Lgedcom/.libs
+
+all:	ansel_module libgedcom gedcom_parse
 
-all:	ansel_module gedcom_parse
+gedcom_parse:	standalone.o
+	$(CC) $(LDFLAGS) $(LDFLAGS_GEDCOM) -lgedcom $^ $(LOADLIBES) $(LDLIBS) -o $@
 
-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 $@
+libgedcom:
+	cd gedcom && $(MAKE) DMALLOC_CFLAGS=$(DMALLOC_CFLAGS) \
+	DMALLOC_LOADLIBES=$(DMALLOC_LOADLIBES)
 
 ansel_module:
 	cd ansel && $(MAKE)
 
-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 \
-			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 \
-			gedcom_lex_common.c encoding.h
-	$(LEX) $(LFLAGS) -Pgedcom_lohi_ gedcom_lohi.lex
-
-gedcom.tab.c gedcom.tab.h:	gedcom.y gedcom.h
-	$(YACC) $(YFLAGS) --name-prefix=gedcom_ gedcom.y
-
+.PHONY:	clean
 clean:
-	rm -f core gedcom_parse test_* *.o lex.gedcom_* \
-        gedcom.tab.* gedcom.output
+	rm -f core gedcom_parse *.o logfile
+	cd gedcom && $(MAKE) clean
 	cd ansel && $(MAKE) clean
 
-# Lexer test programs
-
-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_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_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
 	@export GCONV_PATH=./ansel; \
+	export LD_LIBRARY_PATH=gedcom/.libs; \
         for file in t/*.ged; do \
 	  echo "=== testing $$file"; \
-	  ./gedcom_parse $$file; \
+	  ./gedcom_parse -2 $$file; \
 	done
+
+testmem:	DMALLOC_CFLAGS=-DMALLOC
+testmem:	DMALLOC_LOADLIBES=-ldmalloc
+testmem:	clean test