patch #849200

src/extras/Makefile.am

@@ -1,5 +1,6 @@
 bin_PROGRAMS	=	mdb-dump
 mdb_dump_SOURCES = mdb-dump.c mdbsupport.c
-INCLUDES	=	-I$(top_srcdir)/include $(GLIB_CFLAGS)
+EXTRA_DIST = mdbsupport.h
+AM_CPPFLAGS	=	-I$(top_srcdir)/include $(GLIB_CFLAGS)
 LDADD	=	../libmdb/libmdb.la 
 LIBS	=	$(GLIB_LIBS)

src/gmdb2/Makefile.am

@@ -3,7 +3,7 @@ bin_PROGRAMS	= gmdb2
 include_HEADERS = gmdb.h
 gmdb2_SOURCES = main2.c file.c util.c table.c query.c module.c macro.c report.c form.c info.c table_def.c table_data.c table_export.c debug.c sql.c schema.c prefs.c
 LIBS =	-rdynamic $(GNOME_LIBS) @LEXLIB@ 
-INCLUDES	=	-I$(top_srcdir)/include \
+AM_CPPFLAGS	=	-I$(top_srcdir)/include \
 	$(GNOME_CFLAGS) \
         -DDATADIR=\""$(datadir)"\"                      \
         -DGMDB_ICONDIR=\""$(datadir)/gmdb/glade/"\"        \

src/gmdb2/help/C/Makefile.am

@@ -1,5 +1,5 @@
 figs = \
-	figures/gmdb2_window.png
+	figures/gmdb2_window.png \
 	figures/gmdb2_sql_window.png
 docname = gmdb
 lang = C

src/libmdb/Makefile.am

@@ -1,4 +1,4 @@
 lib_LTLIBRARIES	=	libmdb.la
 libmdb_la_SOURCES=	catalog.c mem.c file.c kkd.c table.c data.c dump.c backend.c money.c sargs.c index.c like.c write.c stats.c map.c props.c worktable.c
-INCLUDES	=	-I$(top_srcdir)/include $(GLIB_CFLAGS)
+AM_CPPFLAGS	=	-I$(top_srcdir)/include $(GLIB_CFLAGS)
 LIBS = $(GLIB_LIBS) -lm

src/odbc/Makefile.am

@@ -6,7 +6,7 @@ MDBSOURCES     =    backend.c index.c money.c catalog.c kkd.c sargs.c \
 				data.c like.c table.c dump.c file.c mem.c
 bin_PROGRAMS	=	unittest
 lib_LTLIBRARIES	=	libmdbodbc.la
-INCLUDES	=	-I ../../include $(GLIB_CFLAGS)
+AM_CPPFLAGS	=	-I ../../include $(GLIB_CFLAGS)
 libmdbodbc_la_SOURCES=	odbc.c connectparams.c
 libmdbodbc_la_LIBADD=	$(patsubst %, $(SQLDIR)/%, \
 				$(patsubst %.c, %.lo, $(SQLSOURCES))) \

src/sql/Makefile.am

@@ -1,6 +1,8 @@
 lib_LTLIBRARIES	=	libmdbsql.la
 libmdbsql_la_SOURCES=	mdbsql.c parser.y lexer.l 
-INCLUDES	=	-I$(top_srcdir)/include $(GLIB_CFLAGS)
+EXTRA_DIST = main.c
+DISTCLEANFILES = parser.c parser.h lexer.c
+AM_CPPFLAGS	=	-I$(top_srcdir)/include $(GLIB_CFLAGS)
 LIBS	=	$(GLIB_LIBS)
 LDADD	=	../libmdb/libmdb.la 
 YACC = @YACC@ -d

src/util/Makefile.am

@@ -1,7 +1,7 @@
 bin_PROGRAMS	=	mdb-export mdb-array mdb-schema mdb-tables mdb-parsecsv mdb-header mdb-sql mdb-ver mdb-prop prtable prcat prdata prkkd prdump prole updrow prindex
 LIBS	=	$(GLIB_LIBS) $(READLINE_LIBS) @LEXLIB@ 
 DEFS = @DEFS@ -DLOCALEDIR=\"$(localedir)\"
-INCLUDES	=	-I$(top_srcdir)/include $(GLIB_CFLAGS)
+AM_CPPFLAGS	=	-I$(top_srcdir)/include $(GLIB_CFLAGS)
 LDADD	=	../libmdb/libmdb.la 
 if SQL
 mdb_sql_LDADD = ../libmdb/libmdb.la ../sql/libmdbsql.la