bandb: make Makefile work with BSD make again

This commit is contained in:
Lee Starnes 2014-05-29 17:53:43 -04:00
parent 497e30a0bb
commit 74ab6be094
3 changed files with 14 additions and 10 deletions

View file

@ -46,22 +46,16 @@ PROGS = $(pkglibexec_PROGS) $(bin_PROGS)
BANDB_SOURCES = \ BANDB_SOURCES = \
bandb.c \ bandb.c \
rsdb_snprintf.c \ rsdb_snprintf.c \
rsdb_sqlite3.c rsdb_sqlite3.c \
@SQLITE_SRC@
ifndef SQLITE_LIB
BANDB_SOURCES+=sqlite3.c
endif
BANDB_OBJECTS = ${BANDB_SOURCES:.c=.o} BANDB_OBJECTS = ${BANDB_SOURCES:.c=.o}
BANTOOL_SOURCES = \ BANTOOL_SOURCES = \
bantool.c \ bantool.c \
rsdb_snprintf.c \ rsdb_snprintf.c \
rsdb_sqlite3.c rsdb_sqlite3.c \
@SQLITE_SRC@
ifndef SQLITE_LIB
BANTOOL_SOURCES+=sqlite3.c
endif
BANTOOL_OBJECTS = ${BANTOOL_SOURCES:.c=.o} BANTOOL_OBJECTS = ${BANTOOL_SOURCES:.c=.o}

6
configure vendored
View file

@ -642,6 +642,7 @@ HELP_DIR
logdir logdir
LOG_DIR LOG_DIR
ETC_DIR ETC_DIR
SQLITE_SRC
SQLITE_LD SQLITE_LD
ZLIB_LD ZLIB_LD
ENCSPEED ENCSPEED
@ -7312,6 +7313,11 @@ fi
fi
if test "$shared_sqlite" = no; then
SQLITE_SRC=sqlite3.c
fi fi

View file

@ -579,6 +579,10 @@ AC_CHECK_HEADER(sqlite3.h, [
fi fi
if test "$shared_sqlite" = no; then
AC_SUBST(SQLITE_SRC, sqlite3.c)
fi
dnl IO Loop Selection dnl IO Loop Selection
dnl ================= dnl =================