Some portability fixes.

[gedcom-parse.git] / gedcom / Makefile.am

diff --git a/gedcom/Makefile.am b/gedcom/Makefile.am
index f219f9ab1d9aeef7dc05a2218d10f51fbf19df44..01c6cc57a551e0e749b7c5d2ecf6bb436ffa0302 100644 (file)
--- a/gedcom/Makefile.am
+++ b/gedcom/Makefile.am
@@ -5,12 +5,12 @@
 SUBDIRS = calendar .
 
 localedir = $(datadir)/locale
-INCLUDES = -I $(srcdir)/../intl -I $(srcdir)/../include -I $(srcdir)/calendar \
-           -I $(srcdir)/../utf8 \
+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 -Wno-long-long @EXTRA_CFLAGS@
+CFLAGS   = -O2 -W -Wall -pedantic -Wno-long-long @EXTRA_CFLAGS@
 
 lib_LTLIBRARIES = libgedcom.la
 libgedcom_la_SOURCES = lex.gedcom_1byte_.c \
@@ -31,7 +31,7 @@ libgedcom_la_SOURCES = lex.gedcom_1byte_.c \
                       buffer.c \
                       write.c
 libgedcom_la_LDFLAGS = -export-dynamic -version-info $(LIBVERSION)
-libgedcom_la_LIBADD  = calendar/libcalendar.la ../utf8/libutf8.la @INTLLIBS@
+libgedcom_la_LIBADD  = calendar/libcalendar.la @INTLLIBS@
 BUILT_SOURCES = lex.gedcom_1byte_.c \
                lex.gedcom_hilo_.c \
                lex.gedcom_lohi_.c \
@@ -41,7 +41,8 @@ BUILT_SOURCES = lex.gedcom_1byte_.c \
                gedcom.tabgen.h \
                gedcom_date.tab.c \
                gedcom_date.tab.h \
-               gedcom_date.tabgen.h
+               gedcom_date.tabgen.h \
+               tag_names.h
 noinst_HEADERS = encoding.h \
                 gedcom_internal.h \
                 interface.h \
@@ -60,6 +61,10 @@ EXTRA_DIST = gedcom.y \
             gedcom_lohi.lex \
             gedcom_date.lex \
             gedcom_lex_common.c \
+            gedcom.tabgen.h \
+            gedcom_date.tabgen.h \
+            tag_names.h \
+            process_tags
             $(BUILT_SOURCES)
 
 include $(top_srcdir)/Makefile.inc
@@ -82,6 +87,10 @@ lex.gedcom_lohi_.c:  gedcom_lohi.lex
 lex.gedcom_date_.c:    gedcom_date.lex
        $(LEX) $(LFLAGS) -Pgedcom_date_ $<
 
+tag_names.h:   $(srcdir)/gedcom.tabgen.h process_tags
+       srcdir=$(srcdir); export srcdir; \
+        perl $(srcdir)/process_tags
+
 lex.gedcom_1byte_.c:   gedcom.tabgen.h gedcom_lex_common.c
 lex.gedcom_hilo_.c:    gedcom.tabgen.h gedcom_lex_common.c
 lex.gedcom_lohi_.c:    gedcom.tabgen.h gedcom_lex_common.c