From 16ecc4fe4d08cf74c5a28bb7c38d8c1d95d72eae Mon Sep 17 00:00:00 2001 From: brianb Date: Thu, 21 Mar 2002 04:29:40 +0000 Subject: [PATCH] remove bad file from Makefile.am --- Makefile | 2 +- include/Makefile | 2 +- src/Makefile | 8 ++++---- src/extras/Makefile | 4 ++-- src/libmdb/Makefile | 4 ++-- src/odbc/Makefile | 4 ++-- src/sql/Makefile | 4 ++-- src/util/Makefile | 28 ++++++++++------------------ src/util/Makefile.am | 4 +++- src/util/Makefile.in | 24 ++++++++---------------- 10 files changed, 35 insertions(+), 49 deletions(-) diff --git a/Makefile b/Makefile index a60989e..f19b3e3 100644 --- a/Makefile +++ b/Makefile @@ -70,7 +70,7 @@ MAKEINFO = makeinfo NM = /usr/bin/nm -B OBJDUMP = @OBJDUMP@ ODBC = -ODBC_INC = /usr/local/include +ODBC_INC = PACKAGE = mdbtools RANLIB = ranlib READLINE_LIBS = -lncurses -lreadline diff --git a/include/Makefile b/include/Makefile index d606fe7..112cb07 100644 --- a/include/Makefile +++ b/include/Makefile @@ -70,7 +70,7 @@ MAKEINFO = makeinfo NM = /usr/bin/nm -B OBJDUMP = @OBJDUMP@ ODBC = -ODBC_INC = /usr/local/include +ODBC_INC = PACKAGE = mdbtools RANLIB = ranlib READLINE_LIBS = -lncurses -lreadline diff --git a/src/Makefile b/src/Makefile index 3c0e354..fe168dc 100644 --- a/src/Makefile +++ b/src/Makefile @@ -70,17 +70,17 @@ MAKEINFO = makeinfo NM = /usr/bin/nm -B OBJDUMP = @OBJDUMP@ ODBC = -ODBC_INC = /usr/local/include +ODBC_INC = PACKAGE = mdbtools RANLIB = ranlib READLINE_LIBS = -lncurses -lreadline SQL = VERSION = 0.3 YACC = bison -y -SUBDIRS = libmdb sql util extras -#SUBDIRS = libmdb util extras -DEFDIR = $(prefix) +#SUBDIRS = libmdb sql util extras +SUBDIRS = libmdb util extras #DEFDIR = $(prefix) +DEFDIR = $(prefix) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_CLEAN_FILES = DIST_COMMON = Makefile.am Makefile.in diff --git a/src/extras/Makefile b/src/extras/Makefile index 9b6f8a1..dd1969f 100644 --- a/src/extras/Makefile +++ b/src/extras/Makefile @@ -70,7 +70,7 @@ MAKEINFO = makeinfo NM = /usr/bin/nm -B OBJDUMP = @OBJDUMP@ ODBC = -ODBC_INC = /usr/local/include +ODBC_INC = PACKAGE = mdbtools RANLIB = ranlib READLINE_LIBS = -lncurses -lreadline @@ -95,7 +95,7 @@ mdb_dump_OBJECTS = mdb-dump.o mdbsupport.o mdb_dump_LDADD = $(LDADD) mdb_dump_DEPENDENCIES = ../libmdb/libmdb.la mdb_dump_LDFLAGS = -CFLAGS = -g -O2 -DIODBC -DSQL +CFLAGS = -g -O2 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) diff --git a/src/libmdb/Makefile b/src/libmdb/Makefile index 1758dbf..45969fa 100644 --- a/src/libmdb/Makefile +++ b/src/libmdb/Makefile @@ -70,7 +70,7 @@ MAKEINFO = makeinfo NM = /usr/bin/nm -B OBJDUMP = @OBJDUMP@ ODBC = -ODBC_INC = /usr/local/include +ODBC_INC = PACKAGE = mdbtools RANLIB = ranlib READLINE_LIBS = -lncurses -lreadline @@ -94,7 +94,7 @@ libmdb_la_LDFLAGS = libmdb_la_LIBADD = libmdb_la_OBJECTS = catalog.lo mem.lo file.lo kkd.lo table.lo data.lo \ dump.lo backend.lo money.lo sargs.lo index.lo like.lo -CFLAGS = -g -O2 -DIODBC -DSQL +CFLAGS = -g -O2 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) diff --git a/src/odbc/Makefile b/src/odbc/Makefile index a23bae8..478e40c 100644 --- a/src/odbc/Makefile +++ b/src/odbc/Makefile @@ -70,7 +70,7 @@ MAKEINFO = makeinfo NM = /usr/bin/nm -B OBJDUMP = @OBJDUMP@ ODBC = -ODBC_INC = /usr/local/include +ODBC_INC = PACKAGE = mdbtools RANLIB = ranlib READLINE_LIBS = -lncurses -lreadline @@ -116,7 +116,7 @@ unittest_OBJECTS = unittest.o unittest_DEPENDENCIES = libmdbodbc.la ../libmdb/libmdb.la \ ../sql/libmdbsql.la unittest_LDFLAGS = -CFLAGS = -g -O2 -DIODBC -DSQL +CFLAGS = -g -O2 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) diff --git a/src/sql/Makefile b/src/sql/Makefile index 53679da..c961c71 100644 --- a/src/sql/Makefile +++ b/src/sql/Makefile @@ -70,7 +70,7 @@ MAKEINFO = makeinfo NM = /usr/bin/nm -B OBJDUMP = @OBJDUMP@ ODBC = -ODBC_INC = /usr/local/include +ODBC_INC = PACKAGE = mdbtools RANLIB = ranlib READLINE_LIBS = -lncurses -lreadline @@ -96,7 +96,7 @@ libmdbsql_la_LIBADD = libmdbsql_la_OBJECTS = mdbsql.lo parser.lo lexer.lo LEX_OUTPUT_ROOT = lex.yy LEXLIB = -lfl -CFLAGS = -g -O2 -DIODBC -DSQL +CFLAGS = -g -O2 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) diff --git a/src/util/Makefile b/src/util/Makefile index b11f60b..0ce9aea 100644 --- a/src/util/Makefile +++ b/src/util/Makefile @@ -70,7 +70,7 @@ MAKEINFO = makeinfo NM = /usr/bin/nm -B OBJDUMP = @OBJDUMP@ ODBC = -ODBC_INC = /usr/local/include +ODBC_INC = PACKAGE = mdbtools RANLIB = ranlib READLINE_LIBS = -lncurses -lreadline @@ -78,11 +78,11 @@ SQL = VERSION = 0.3 YACC = bison -y -bin_PROGRAMS = mdb-export mdb-array mdb-schema mdb-tables mdb-parsecsv mdb-header mdb-sql mdb-ver prtable prcat prdata prkkd prdump msysobjects +bin_PROGRAMS = mdb-export mdb-array mdb-schema mdb-tables mdb-parsecsv mdb-header mdb-sql mdb-ver prtable prcat prdata prkkd prdump LIBS = `glib-config --libs` $(READLINE_LIBS) -lfl INCLUDES = -I$(top_srcdir)/include `glib-config --cflags` LDADD = ../libmdb/libmdb.la -mdb_sql_LDADD = ../libmdb/libmdb.la ../sql/libmdbsql.la +#mdb_sql_LDADD = #../libmdb/libmdb.la ../sql/libmdbsql.la mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_CLEAN_FILES = PROGRAMS = $(bin_PROGRAMS) @@ -123,7 +123,8 @@ mdb_header_DEPENDENCIES = ../libmdb/libmdb.la mdb_header_LDFLAGS = mdb_sql_SOURCES = mdb-sql.c mdb_sql_OBJECTS = mdb-sql.o -mdb_sql_DEPENDENCIES = ../libmdb/libmdb.la ../sql/libmdbsql.la +#mdb_sql_DEPENDENCIES = ../libmdb/libmdb.la \ +#../sql/libmdbsql.la mdb_sql_LDFLAGS = mdb_ver_SOURCES = mdb-ver.c mdb_ver_OBJECTS = mdb-ver.o @@ -155,12 +156,7 @@ prdump_OBJECTS = prdump.o prdump_LDADD = $(LDADD) prdump_DEPENDENCIES = ../libmdb/libmdb.la prdump_LDFLAGS = -msysobjects_SOURCES = msysobjects.c -msysobjects_OBJECTS = msysobjects.o -msysobjects_LDADD = $(LDADD) -msysobjects_DEPENDENCIES = ../libmdb/libmdb.la -msysobjects_LDFLAGS = -CFLAGS = -g -O2 -DIODBC -DSQL +CFLAGS = -g -O2 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) @@ -174,10 +170,10 @@ TAR = gtar GZIP_ENV = --best DEP_FILES = .deps/mdb-array.P .deps/mdb-export.P .deps/mdb-header.P \ .deps/mdb-parsecsv.P .deps/mdb-schema.P .deps/mdb-sql.P \ -.deps/mdb-tables.P .deps/mdb-ver.P .deps/msysobjects.P .deps/prcat.P \ -.deps/prdata.P .deps/prdump.P .deps/prkkd.P .deps/prtable.P -SOURCES = mdb-export.c mdb-array.c mdb-schema.c mdb-tables.c mdb-parsecsv.c mdb-header.c mdb-sql.c mdb-ver.c prtable.c prcat.c prdata.c prkkd.c prdump.c msysobjects.c -OBJECTS = mdb-export.o mdb-array.o mdb-schema.o mdb-tables.o mdb-parsecsv.o mdb-header.o mdb-sql.o mdb-ver.o prtable.o prcat.o prdata.o prkkd.o prdump.o msysobjects.o +.deps/mdb-tables.P .deps/mdb-ver.P .deps/prcat.P .deps/prdata.P \ +.deps/prdump.P .deps/prkkd.P .deps/prtable.P +SOURCES = mdb-export.c mdb-array.c mdb-schema.c mdb-tables.c mdb-parsecsv.c mdb-header.c mdb-sql.c mdb-ver.c prtable.c prcat.c prdata.c prkkd.c prdump.c +OBJECTS = mdb-export.o mdb-array.o mdb-schema.o mdb-tables.o mdb-parsecsv.o mdb-header.o mdb-sql.o mdb-ver.o prtable.o prcat.o prdata.o prkkd.o prdump.o all: all-redirect .SUFFIXES: @@ -299,10 +295,6 @@ prdump: $(prdump_OBJECTS) $(prdump_DEPENDENCIES) @rm -f prdump $(LINK) $(prdump_LDFLAGS) $(prdump_OBJECTS) $(prdump_LDADD) $(LIBS) -msysobjects: $(msysobjects_OBJECTS) $(msysobjects_DEPENDENCIES) - @rm -f msysobjects - $(LINK) $(msysobjects_LDFLAGS) $(msysobjects_OBJECTS) $(msysobjects_LDADD) $(LIBS) - tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) diff --git a/src/util/Makefile.am b/src/util/Makefile.am index 2d3c334..c17ddfc 100644 --- a/src/util/Makefile.am +++ b/src/util/Makefile.am @@ -1,5 +1,7 @@ -bin_PROGRAMS = mdb-export mdb-array mdb-schema mdb-tables mdb-parsecsv mdb-header mdb-sql mdb-ver prtable prcat prdata prkkd prdump msysobjects +bin_PROGRAMS = mdb-export mdb-array mdb-schema mdb-tables mdb-parsecsv mdb-header mdb-sql mdb-ver prtable prcat prdata prkkd prdump LIBS = `glib-config --libs` $(READLINE_LIBS) @LEXLIB@ INCLUDES = -I$(top_srcdir)/include `glib-config --cflags` LDADD = ../libmdb/libmdb.la +if SQL mdb_sql_LDADD = ../libmdb/libmdb.la ../sql/libmdbsql.la +endif diff --git a/src/util/Makefile.in b/src/util/Makefile.in index 43e60bc..a0c87de 100644 --- a/src/util/Makefile.in +++ b/src/util/Makefile.in @@ -78,11 +78,11 @@ SQL = @SQL@ VERSION = @VERSION@ YACC = @YACC@ -bin_PROGRAMS = mdb-export mdb-array mdb-schema mdb-tables mdb-parsecsv mdb-header mdb-sql mdb-ver prtable prcat prdata prkkd prdump msysobjects +bin_PROGRAMS = mdb-export mdb-array mdb-schema mdb-tables mdb-parsecsv mdb-header mdb-sql mdb-ver prtable prcat prdata prkkd prdump LIBS = `glib-config --libs` $(READLINE_LIBS) @LEXLIB@ INCLUDES = -I$(top_srcdir)/include `glib-config --cflags` LDADD = ../libmdb/libmdb.la -mdb_sql_LDADD = ../libmdb/libmdb.la ../sql/libmdbsql.la +@SQL_TRUE@mdb_sql_LDADD = @SQL_TRUE@../libmdb/libmdb.la ../sql/libmdbsql.la mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_CLEAN_FILES = PROGRAMS = $(bin_PROGRAMS) @@ -123,7 +123,8 @@ mdb_header_DEPENDENCIES = ../libmdb/libmdb.la mdb_header_LDFLAGS = mdb_sql_SOURCES = mdb-sql.c mdb_sql_OBJECTS = mdb-sql.o -mdb_sql_DEPENDENCIES = ../libmdb/libmdb.la ../sql/libmdbsql.la +@SQL_TRUE@mdb_sql_DEPENDENCIES = ../libmdb/libmdb.la \ +@SQL_TRUE@../sql/libmdbsql.la mdb_sql_LDFLAGS = mdb_ver_SOURCES = mdb-ver.c mdb_ver_OBJECTS = mdb-ver.o @@ -155,11 +156,6 @@ prdump_OBJECTS = prdump.o prdump_LDADD = $(LDADD) prdump_DEPENDENCIES = ../libmdb/libmdb.la prdump_LDFLAGS = -msysobjects_SOURCES = msysobjects.c -msysobjects_OBJECTS = msysobjects.o -msysobjects_LDADD = $(LDADD) -msysobjects_DEPENDENCIES = ../libmdb/libmdb.la -msysobjects_LDFLAGS = CFLAGS = @CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -174,10 +170,10 @@ TAR = gtar GZIP_ENV = --best DEP_FILES = .deps/mdb-array.P .deps/mdb-export.P .deps/mdb-header.P \ .deps/mdb-parsecsv.P .deps/mdb-schema.P .deps/mdb-sql.P \ -.deps/mdb-tables.P .deps/mdb-ver.P .deps/msysobjects.P .deps/prcat.P \ -.deps/prdata.P .deps/prdump.P .deps/prkkd.P .deps/prtable.P -SOURCES = mdb-export.c mdb-array.c mdb-schema.c mdb-tables.c mdb-parsecsv.c mdb-header.c mdb-sql.c mdb-ver.c prtable.c prcat.c prdata.c prkkd.c prdump.c msysobjects.c -OBJECTS = mdb-export.o mdb-array.o mdb-schema.o mdb-tables.o mdb-parsecsv.o mdb-header.o mdb-sql.o mdb-ver.o prtable.o prcat.o prdata.o prkkd.o prdump.o msysobjects.o +.deps/mdb-tables.P .deps/mdb-ver.P .deps/prcat.P .deps/prdata.P \ +.deps/prdump.P .deps/prkkd.P .deps/prtable.P +SOURCES = mdb-export.c mdb-array.c mdb-schema.c mdb-tables.c mdb-parsecsv.c mdb-header.c mdb-sql.c mdb-ver.c prtable.c prcat.c prdata.c prkkd.c prdump.c +OBJECTS = mdb-export.o mdb-array.o mdb-schema.o mdb-tables.o mdb-parsecsv.o mdb-header.o mdb-sql.o mdb-ver.o prtable.o prcat.o prdata.o prkkd.o prdump.o all: all-redirect .SUFFIXES: @@ -299,10 +295,6 @@ prdump: $(prdump_OBJECTS) $(prdump_DEPENDENCIES) @rm -f prdump $(LINK) $(prdump_LDFLAGS) $(prdump_OBJECTS) $(prdump_LDADD) $(LIBS) -msysobjects: $(msysobjects_OBJECTS) $(msysobjects_DEPENDENCIES) - @rm -f msysobjects - $(LINK) $(msysobjects_LDFLAGS) $(msysobjects_OBJECTS) $(msysobjects_LDADD) $(LIBS) - tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP)