X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=gedcom%2FMakefile.am;h=a10810e2a2335bdcf115beda4464ec5b56cfb663;hb=15c373d0e5dfc9d970e41f705dcfdbe2812be019;hp=aa33f87832862d291a379278f5998e295e1c3982;hpb=1212c16d137dfadc22a0606004be47a3184bc42b;p=gedcom-parse.git

diff --git a/gedcom/Makefile.am b/gedcom/Makefile.am
index aa33f87..a10810e 100644
--- a/gedcom/Makefile.am
+++ b/gedcom/Makefile.am
@@ -6,10 +6,11 @@ SUBDIRS = calendar .
 
 localedir = $(datadir)/locale
 INCLUDES = -I $(srcdir)/../intl -I $(srcdir)/../include -I $(srcdir)/calendar \
+           -I $(srcdir)/../utf8 \
            -DPKGDATADIR=\"$(pkgdatadir)\" -DLOCALEDIR=\"$(localedir)\"
 YFLAGS   = --debug --defines
 LFLAGS   = -8
-CFLAGS   = -g -O2 -W -Wall -pedantic
+CFLAGS   = -O2 -W -Wall -pedantic -Wno-long-long @EXTRA_CFLAGS@
 
 lib_LTLIBRARIES = libgedcom.la
 libgedcom_la_SOURCES = lex.gedcom_1byte_.c \
@@ -26,9 +27,11 @@ libgedcom_la_SOURCES = lex.gedcom_1byte_.c \
 		       hash.c \
 		       xref.c \
 		       age.c \
-		       compat.c
-libgedcom_la_LDFLAGS = -export-dynamic -version-info $(LIBVERSION) $(LIBICONV)
-libgedcom_la_LIBADD  = calendar/libcalendar.la
+		       compat.c \
+		       buffer.c \
+		       write.c
+libgedcom_la_LDFLAGS = -export-dynamic -version-info $(LIBVERSION)
+libgedcom_la_LIBADD  = calendar/libcalendar.la ../utf8/libutf8.la @INTLLIBS@
 BUILT_SOURCES = lex.gedcom_1byte_.c \
 	 	lex.gedcom_hilo_.c \
 		lex.gedcom_lohi_.c \
@@ -47,14 +50,19 @@ noinst_HEADERS = encoding.h \
 		 hash.h \
 		 xref.h \
 		 age.h \
-		 compat.h
+		 compat.h \
+		 buffer.h \
+		 tag_data.h
 EXTRA_DIST = gedcom.y \
 	     gedcom_date.y \
 	     gedcom_1byte.lex \
 	     gedcom_hilo.lex \
 	     gedcom_lohi.lex \
 	     gedcom_date.lex \
-	     gedcom_lex_common.c
+	     gedcom_lex_common.c \
+	     $(BUILT_SOURCES)
+
+include $(top_srcdir)/Makefile.inc
 
 gedcom.tab.c gedcom.tab.h:	gedcom.y
 	$(YACC) $(YFLAGS) --name-prefix=gedcom_ $<
@@ -98,14 +106,3 @@ lex.gedcom_lohi_.test.o:	lex.gedcom_lohi_.c
 
 clean-local:
 	rm -f $(EXTRA_PROGRAMS)
-
-%.tabgen.h:	%.tab.h
-	if [ ! -r $(srcdir)/$@ ] ; \
-	then \
-	  touch $(srcdir)/$@; \
-	fi
-	if ! diff -q $< $(srcdir)/$@ > /dev/null; \
-	then \
-	  rm $(srcdir)/$@; \
-	  cp $(srcdir)/$< $(srcdir)/$@; \
-	fi