lsm/mdbtools
1
0
Fork 0
mirror of https://github.com/mdbtools/mdbtools.git synced 2026-02-26 13:52:42 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update autoconf/automake standards

Browse Source 
Generated files config.guess config.sub depcomp install-sh ltmain.sh missing
and ylwrap have been moved to build-aux/

Ran autoupdate

Replaced AC_TRY_LINK/AC_TRY_COMPILE by AC_LINK_IFELSE/AC_COMPILE_IFELSE

Droped -I$(top_srcdir)/include from CFLAGS since AC_CONFIG_HEADERS already
adds the -I

Fixed bison detection

Added AM_PROG_AR as required by autoreconf -i -Wall

Updated NEWS and .gitignore
This commit is contained in:
Nirgal Vourgère
2013-07-09 18:39:03 +02:00
parent a021708dae
commit 088493d499
10 changed files with 43 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/extras/Makefile.am
View File

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

3
src/gmdb2/Makefile.am
View File

@@ -4,8 +4,7 @@ include_HEADERS = gmdb.h
gmdb2_SOURCES = main2.c file.c table.c info.c table_def.c table_data.c table_export.c debug.c sql.c schema.c prefs.c
LIBS = -rdynamic $(GNOME_LIBS) @LIBS@ @LEXLIB@
AM_CPPFLAGS = -I$(top_srcdir)/include \
$(GNOME_CFLAGS) \
AM_CFLAGS = $(GNOME_CFLAGS) \
-DDATADIR="\"$(datadir)\"" \
-DGMDB_ICONDIR="\"$(datadir)/gmdb/glade/\"" \
-DGMDB_GLADEDIR="\"$(datadir)/gmdb/glade/\""

4
src/libmdb/Makefile.am
View File

@@ -1,5 +1,5 @@
lib_LTLIBRARIES = libmdb.la
libmdb_la_SOURCES= catalog.c mem.c file.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 options.c iconv.c
libmdb_la_LDFLAGS = -version-info 2:1:0 -export-symbols-regex '^(mdb_|_mdb_put_int16$$|_mdb_put_int32$$)'
AM_CPPFLAGS = -I$(top_srcdir)/include $(GLIB_CFLAGS)
LIBS = $(GLIB_LIBS) @LIBS@
AM_CFLAGS = $(GLIB_CFLAGS)
LIBS = $(GLIB_LIBS) @LIBS@ @LIBICONV@

6
src/odbc/Makefile.am
View File

@@ -1,15 +1,15 @@
noinst_PROGRAMS = unittest
lib_LTLIBRARIES = libmdbodbc.la
AM_CPPFLAGS = -I$(top_srcdir)/include $(GLIB_CFLAGS) $(ODBC_CFLAGS)
AM_CFLAGS = $(GLIB_CFLAGS) $(ODBC_CFLAGS)
libmdbodbc_la_SOURCES = odbc.c connectparams.c mdbodbc.h connectparams.h
libmdbodbc_la_LIBADD = ../libmdb/libmdb.la ../sql/libmdbsql.la
libmdbodbc_la_LDFLAGS = -avoid-version -export-symbols-regex '^(SQL|ODBCINST)'
if ICONV
lib_LTLIBRARIES += libmdbodbcW.la
libmdbodbcW_la_SOURCES = $(libmdbodbc_la_SOURCES)
libmdbodbcW_la_LIBADD = $(libmdbodbc_la_LIBADD)
libmdbodbcW_la_LIBADD = $(libmdbodbc_la_LIBADD) @LIBICONV@
libmdbodbcW_la_LDFLAGS = $(libmdbodbc_la_LDFLAGS)
libmdbodbcW_la_CFLAGS = -D ENABLE_ODBC_W=1
libmdbodbcW_la_CFLAGS = $(AM_CFLAGS) -D ENABLE_ODBC_W=1
endif
LIBS = @LEXLIB@ $(GLIB_LIBS) $(ODBC_LIBS)
unittest_LDADD = libmdbodbc.la ../libmdb/libmdb.la ../sql/libmdbsql.la

2
src/sql/Makefile.am
View File

@@ -2,7 +2,7 @@ lib_LTLIBRARIES = libmdbsql.la
libmdbsql_la_SOURCES= mdbsql.c parser.y lexer.l
libmdbsql_la_LDFLAGS = -version-info 2:0:0 -export-symbols-regex '^mdb_sql_'
CLEANFILES = parser.c parser.h lexer.c
AM_CPPFLAGS = -I$(top_srcdir)/include $(GLIB_CFLAGS)
AM_CFLAGS = $(GLIB_CFLAGS)
LIBS = $(GLIB_LIBS)
libmdbsql_la_LIBADD = ../libmdb/libmdb.la
YACC = @YACC@ -d

2
src/util/Makefile.am
View File

@@ -2,7 +2,7 @@ bin_PROGRAMS = mdb-export mdb-array mdb-schema mdb-tables mdb-parsecsv mdb-heade
noinst_PROGRAMS = mdb-import prtable prcat prdata prkkd prdump prole updrow prindex
LIBS = $(GLIB_LIBS) @LIBS@ @LEXLIB@
DEFS = @DEFS@ -DLOCALEDIR=\"$(localedir)\"
AM_CPPFLAGS = -I$(top_srcdir)/include $(GLIB_CFLAGS)
AM_CFLAGS = $(GLIB_CFLAGS)
LDADD = ../libmdb/libmdb.la
if SQL
mdb_sql_LDADD = ../libmdb/libmdb.la ../sql/libmdbsql.la $(LIBREADLINE)