1.1 --- a/INSTALL	Wed Apr 01 17:17:47 2009 +0100
     1.2 +++ b/INSTALL	Wed Apr 01 14:18:35 2009 +0100
     1.3 @@ -27,8 +27,8 @@
     1.4     3. `make'
     1.5  
     1.6        This command compiles the non-template part of LEMON into libemon.a
     1.7 -      file. It also compiles the programs in the tools and demo subdirectories
     1.8 -      when enabled.
     1.9 +      file. It also compiles the programs in the tools subdirectory by
    1.10 +      default.
    1.11  
    1.12     4. `make check'
    1.13  
    1.14 @@ -75,14 +75,6 @@
    1.15  
    1.16    Set the installation prefix to PREFIX. By default it is /usr/local.
    1.17  
    1.18 ---enable-demo
    1.19 -
    1.20 -   Build the examples in the demo subdirectory.
    1.21 -
    1.22 ---disable-demo
    1.23 -
    1.24 -   Do not build the examples in the demo subdirectory (default).
    1.25 -
    1.26  --enable-tools
    1.27  
    1.28     Build the programs in the tools subdirectory (default).

     2.1 --- a/Makefile.am	Wed Apr 01 17:17:47 2009 +0100
     2.2 +++ b/Makefile.am	Wed Apr 01 14:18:35 2009 +0100
     2.3 @@ -39,9 +39,13 @@
     2.4  include lemon/Makefile.am
     2.5  include test/Makefile.am
     2.6  include doc/Makefile.am
     2.7 -include demo/Makefile.am
     2.8  include tools/Makefile.am
     2.9  
    2.10 +DIST_SUBDIRS = demo
    2.11 +
    2.12 +demo:
    2.13 +	$(MAKE) $(AM_MAKEFLAGS) -C demo
    2.14 +
    2.15  MRPROPERFILES = \
    2.16  	aclocal.m4 \
    2.17  	config.h.in \
    2.18 @@ -68,4 +72,4 @@
    2.19  	zcat $(PACKAGE)-$(VERSION).tar.gz | \
    2.20  	bzip2 --best -c > $(PACKAGE)-$(VERSION).tar.bz2
    2.21  
    2.22 -.PHONY: mrproper dist-bz2 distcheck-bz2
    2.23 +.PHONY: demo mrproper dist-bz2 distcheck-bz2

     3.1 --- a/configure.ac	Wed Apr 01 17:17:47 2009 +0100
     3.2 +++ b/configure.ac	Wed Apr 01 14:18:35 2009 +0100
     3.3 @@ -64,19 +64,6 @@
     3.4  AM_CONDITIONAL([HAVE_LP], [test x"$lx_lp_found" = x"yes"])
     3.5  AM_CONDITIONAL([HAVE_MIP], [test x"$lx_mip_found" = x"yes"])
     3.6  
     3.7 -dnl Disable/enable building the demo programs.
     3.8 -AC_ARG_ENABLE([demo],
     3.9 -AS_HELP_STRING([--enable-demo], [build the demo programs])
    3.10 -AS_HELP_STRING([--disable-demo], [do not build the demo programs @<:@default@:>@]),
    3.11 -              [], [enable_demo=no])
    3.12 -AC_MSG_CHECKING([whether to build the demo programs])
    3.13 -if test x"$enable_demo" != x"no"; then
    3.14 -  AC_MSG_RESULT([yes])
    3.15 -else
    3.16 -  AC_MSG_RESULT([no])
    3.17 -fi
    3.18 -AM_CONDITIONAL([WANT_DEMO], [test x"$enable_demo" != x"no"])
    3.19 -
    3.20  dnl Disable/enable building the binary tools.
    3.21  AC_ARG_ENABLE([tools],
    3.22  AS_HELP_STRING([--enable-tools], [build additional tools @<:@default@:>@])
    3.23 @@ -110,6 +97,7 @@
    3.24  
    3.25  AC_CONFIG_FILES([
    3.26  Makefile
    3.27 +demo/Makefile
    3.28  cmake/version.cmake
    3.29  doc/Doxyfile
    3.30  lemon/lemon.pc
    3.31 @@ -132,7 +120,6 @@
    3.32  echo SOPLEX support................ : $lx_soplex_found
    3.33  echo CLP support................... : $lx_clp_found
    3.34  echo
    3.35 -echo Build demo programs........... : $enable_demo
    3.36  echo Build additional tools........ : $enable_tools
    3.37  echo
    3.38  echo The packace will be installed in

     4.1 --- a/demo/Makefile.am	Wed Apr 01 17:17:47 2009 +0100
     4.2 +++ b/demo/Makefile.am	Wed Apr 01 14:18:35 2009 +0100
     4.3 @@ -1,16 +1,17 @@
     4.4 -EXTRA_DIST += \
     4.5 -	demo/CMakeLists.txt \
     4.6 -	demo/digraph.lgf
     4.7 +AM_CXXFLAGS = $(WARNINGCXXFLAGS)
     4.8  
     4.9 -if WANT_DEMO
    4.10 +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
    4.11 +LDADD = $(top_builddir)/lemon/libemon.la
    4.12  
    4.13 -noinst_PROGRAMS += \
    4.14 -	demo/arg_parser_demo \
    4.15 -	demo/graph_to_eps_demo \
    4.16 -	demo/lgf_demo
    4.17 +EXTRA_DIST = \
    4.18 +	CMakeLists.txt \
    4.19 +	digraph.lgf
    4.20  
    4.21 -endif WANT_DEMO
    4.22 +noinst_PROGRAMS = \
    4.23 +	arg_parser_demo \
    4.24 +	graph_to_eps_demo \
    4.25 +	lgf_demo
    4.26  
    4.27 -demo_arg_parser_demo_SOURCES = demo/arg_parser_demo.cc
    4.28 -demo_graph_to_eps_demo_SOURCES = demo/graph_to_eps_demo.cc
    4.29 -demo_lgf_demo_SOURCES = demo/lgf_demo.cc
    4.30 +arg_parser_demo_SOURCES = arg_parser_demo.cc
    4.31 +graph_to_eps_demo_SOURCES = graph_to_eps_demo.cc
    4.32 +lgf_demo_SOURCES = lgf_demo.cc

     5.1 --- a/doc/groups.dox	Wed Apr 01 17:17:47 2009 +0100
     5.2 +++ b/doc/groups.dox	Wed Apr 01 14:18:35 2009 +0100
     5.3 @@ -671,8 +671,8 @@
     5.4  Some demo programs are listed here. Their full source codes can be found in
     5.5  the \c demo subdirectory of the source tree.
     5.6  
     5.7 -It order to compile them, use <tt>--enable-demo</tt> configure option when
     5.8 -build the library.
     5.9 +In order to compile them, use the <tt>make demo</tt> or the
    5.10 +<tt>make check</tt> commands.
    5.11  */
    5.12  
    5.13  /**

     6.1 --- a/scripts/mk-release.sh	Wed Apr 01 17:17:47 2009 +0100
     6.2 +++ b/scripts/mk-release.sh	Wed Apr 01 14:18:35 2009 +0100
     6.3 @@ -14,7 +14,7 @@
     6.4  echo '*****************************************************************'
     6.5  
     6.6  autoreconf -vif
     6.7 -./configure --enable-demo
     6.8 +./configure
     6.9  
    6.10  make
    6.11  make html

     7.1 --- a/test/Makefile.am	Wed Apr 01 17:17:47 2009 +0100
     7.2 +++ b/test/Makefile.am	Wed Apr 01 14:18:35 2009 +0100
     7.3 @@ -37,6 +37,8 @@
     7.4  	test/time_measure_test \
     7.5  	test/unionfind_test
     7.6  
     7.7 +test_test_tools_pass_DEPENDENCIES = demo
     7.8 +
     7.9  if HAVE_LP
    7.10  check_PROGRAMS += test/lp_test
    7.11  endif HAVE_LP