diff --git a/Makefile.am b/Makefile.am --- a/Makefile.am +++ b/Makefile.am @@ -24,6 +24,7 @@ noinst_PROGRAMS = bin_PROGRAMS = check_PROGRAMS = +dist_bin_SCRIPTS = TESTS = XFAIL_TESTS = @@ -31,7 +32,6 @@ include test/Makefile.am include doc/Makefile.am include demo/Makefile.am -include benchmark/Makefile.am include tools/Makefile.am MRPROPERFILES = \ diff --git a/README b/README --- a/README +++ b/README @@ -37,10 +37,6 @@ Contains programs to check the integrity and correctness of LEMON. -benchmark/ - - Contains programs for measuring the performance of algorithms. - tools/ Various utilities related to LEMON. diff --git a/benchmark/Makefile.am b/benchmark/Makefile.am deleted file mode 100644 --- a/benchmark/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -if WANT_BENCHMARK - -noinst_HEADERS += - -noinst_PROGRAMS += - -endif WANT_BENCHMARK diff --git a/configure.ac b/configure.ac --- a/configure.ac +++ b/configure.ac @@ -81,19 +81,6 @@ fi AM_CONDITIONAL([WANT_TOOLS], [test x"$enable_tools" != x"no"]) -dnl Disable/enable building the benchmarks. -AC_ARG_ENABLE([benchmark], -AS_HELP_STRING([--enable-benchmark], [build the benchmarks]) -AS_HELP_STRING([--disable-benchmark], [do not build the benchmarks @<:@default@:>@]), - [], [enable_benchmark=no]) -AC_MSG_CHECKING([whether to build the benchmarks]) -if test x"$enable_benchmark" != x"no"; then - AC_MSG_RESULT([yes]) -else - AC_MSG_RESULT([no]) -fi -AM_CONDITIONAL([WANT_BENCHMARK], [test x"$enable_benchmark" != x"no"]) - dnl Checks for header files. AC_CHECK_HEADERS(limits.h sys/time.h sys/times.h unistd.h) @@ -132,7 +119,6 @@ #echo CPLEX support................. : $lx_cplex_found #echo SOPLEX support................ : $lx_soplex_found #echo -echo Build benchmarks.............. : $enable_benchmark echo Build demo programs........... : $enable_demo echo Build additional tools........ : $enable_tools echo diff --git a/tools/Makefile.am b/tools/Makefile.am --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -1,5 +1,6 @@ if WANT_TOOLS bin_PROGRAMS += +dist_bin_SCRIPTS += tools/lemon-0.x-to-1.x.sh endif WANT_TOOLS diff --git a/scripts/lemon-0.x-to-1.x.sh b/tools/lemon-0.x-to-1.x.sh rename from scripts/lemon-0.x-to-1.x.sh rename to tools/lemon-0.x-to-1.x.sh