From a051350ba1881e78decb42fd1a4b5cdcbbc09d1d Mon Sep 17 00:00:00 2001 From: Evan Miller Date: Sun, 11 Oct 2020 15:46:19 -0400 Subject: [PATCH] make distcheck fixes --- configure.ac | 3 --- src/Makefile.am | 2 +- src/util/Makefile.am | 1 + 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 80a377c..0f1bfd8 100644 --- a/configure.ac +++ b/configure.ac @@ -192,9 +192,6 @@ if test "x$HAVE_ODBC" = "xtrue"; then OPTDIRS="$OPTDIRS odbc" fi -dnl Turn on -Wstrict-prototypes here because AC_CHECK_LIB is dumb -CFLAGS="$CFLAGS -Wstrict-prototypes" - dnl Conditionally build odbc wide version AM_CONDITIONAL(ICONV, test "$am_cv_func_iconv" = "yes") diff --git a/src/Makefile.am b/src/Makefile.am index e4fa141..a24017c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,3 +1,3 @@ SUBDIRS = libmdb extras $(OPTDIRS) util -DIST_SUBDIRS = libmdb extras sql odbc util +DIST_SUBDIRS = libmdb extras fuzz sql odbc util DEFDIR = $(prefix) diff --git a/src/util/Makefile.am b/src/util/Makefile.am index aa80943..4d7f74c 100644 --- a/src/util/Makefile.am +++ b/src/util/Makefile.am @@ -2,6 +2,7 @@ AUTOMAKE_OPTIONS = subdir-objects SUBDIRS = bash-completion bin_PROGRAMS = mdb-export mdb-array mdb-schema mdb-tables mdb-parsecsv mdb-header mdb-sql mdb-ver mdb-prop mdb-count mdb-queries mdb-json noinst_PROGRAMS = mdb-import prtable prcat prdata prkkd prdump prole updrow prindex +noinst_HEADERS = base64.h LIBS = $(GLIB_LIBS) @LIBS@ DEFS = @DEFS@ -DLOCALEDIR=\"$(localedir)\" AM_CFLAGS = -I$(top_srcdir)/include $(GLIB_CFLAGS) -Wsign-compare