Description: remove obsolete variables from Makefile.in and configure.in
Author: Nicolas Boulenguez <nicolas@debian.org>

--- a/Makefile.in
+++ b/Makefile.in
@@ -6,7 +6,6 @@
 .POSIX:
 
 VERSION=Florist-2016 (20160515)
-FLORIST_VERSION=$(VERSION)
 GNATPREPFLAGS = -c -r
 GCCFLAGS = -O2
 TARGET=@host_alias@
@@ -20,13 +19,9 @@
 TARGET_RUNNER=run-cross --target=ppc-elinos,5.1,qemu
 endif
 
-# How to invoke ranlib.
-RANLIB = ranlib
-
 # configure substitutions
 CC = @CC@
 LIBS = @LIBS@
-DEPS = @DEPS@
 SIGNALS_GENERATED = @SIGNALS_GENERATED@
 PREFIX = @prefix@
 
@@ -36,7 +31,7 @@
 
 GNATPREP = $(TARGET_PREFIX)gnatprep
 GPRBUILD = gprbuild
-GPRBUILD_FLAGS = $(GCCFLAGS) $(LIBRARY_TYPE_OPTION) $(PROJECT_FLAGS)
+GPRBUILD_FLAGS = $(GCCFLAGS) $(PROJECT_FLAGS)
 
 GENDIR = gensrc
 GENDIR_ON_TARGET=$(GENDIR)
@@ -166,7 +161,7 @@
 
 # remove all generated files, including configuration history
 distclean: clean
-	rm -f $(CONFIG_HISTORY) $(CONF_GENERATED)
+	rm -f $(CONFIG_HISTORY) $(CONFIG_GENERATED)
 
 # install floristlib
 # make all files read-only to prevent recompilation
--- a/configure.in
+++ b/configure.in
@@ -17,19 +17,16 @@
 AS_HELP_STRING([--disable-threads], [Do not try to build pthread support]),,
 [use_pthread=yes])
 if test "x$use_pthread" = "xyes" ; then
-  DEPS=deps
   SIGNALS_GENERATED=posix-implementation-ok_signals.ads
   THREADS_BOOL=True
 else
   AC_MSG_WARN(No pthread support.)
-  DEPS=deps_no_thread
   SIGNALS_GENERATED=
   THREADS_BOOL=False
 fi
 THREADS_OPTION=-XTHREADS=${THREADS_BOOL}
 AC_SUBST(SIGNALS_GENERATED)
 AC_SUBST(THREADS_OPTION)
-AC_SUBST(DEPS)
 
 AC_MSG_CHECKING([whether to build a shared library])
 AC_ARG_ENABLE(shared,
