Changeset 564:eda12d8ac953 in lemon-main

Timestamp:

04/01/09 15:18:35 (16 years ago)

Author:

Akos Ladanyi <ladanyi@…>

Branch:

default

Children:

565:7ab97e2a0c33, 572:be6646ac5d89

Phase:

public

Message:

Add 'demo' make target for building the demo programs

Files:

• INSTALL (modified) (2 diffs)
• Makefile.am (modified) (2 diffs)
• configure.ac (modified) (3 diffs)
• demo/Makefile.am (modified) (1 diff)
• doc/groups.dox (modified) (1 diff)
• scripts/mk-release.sh (modified) (1 diff)
• test/Makefile.am (modified) (1 diff)

INSTALL

@@ -28 +28 @@
 
       This command compiles the non-template part of LEMON into libemon.a
-      file. It also compiles the programs in the tools and demo subdirectories
-      when enabled.
+      file. It also compiles the programs in the tools subdirectory by
+      default.
 
    4. `make check'
@@ -75 +75 @@
 
   Set the installation prefix to PREFIX. By default it is /usr/local.
-
---enable-demo
-
-   Build the examples in the demo subdirectory.
-
---disable-demo
-
-   Do not build the examples in the demo subdirectory (default).
 
 --enable-tools

Makefile.am

@@ -40 +40 @@
 include test/Makefile.am
 include doc/Makefile.am
-include demo/Makefile.am
 include tools/Makefile.am
+
+DIST_SUBDIRS = demo
+
+demo:
+        $(MAKE) $(AM_MAKEFLAGS) -C demo
 
 MRPROPERFILES = \
@@ -69 +73 @@
         bzip2 --best -c > $(PACKAGE)-$(VERSION).tar.bz2
 
-.PHONY: mrproper dist-bz2 distcheck-bz2
+.PHONY: demo mrproper dist-bz2 distcheck-bz2

configure.ac

@@ -65 +65 @@
 AM_CONDITIONAL([HAVE_MIP], [test x"$lx_mip_found" = x"yes"])
 
-dnl Disable/enable building the demo programs.
-AC_ARG_ENABLE([demo],
-AS_HELP_STRING([--enable-demo], [build the demo programs])
-AS_HELP_STRING([--disable-demo], [do not build the demo programs @<:@default@:>@]),
-              [], [enable_demo=no])
-AC_MSG_CHECKING([whether to build the demo programs])
-if test x"$enable_demo" != x"no"; then
-  AC_MSG_RESULT([yes])
-else
-  AC_MSG_RESULT([no])
-fi
-AM_CONDITIONAL([WANT_DEMO], [test x"$enable_demo" != x"no"])
-
 dnl Disable/enable building the binary tools.
 AC_ARG_ENABLE([tools],
@@ -111 +98 @@
 AC_CONFIG_FILES([
 Makefile
+demo/Makefile
 cmake/version.cmake
 doc/Doxyfile
@@ -133 +121 @@
 echo CLP support................... : $lx_clp_found
 echo
-echo Build demo programs........... : $enable_demo
 echo Build additional tools........ : $enable_tools
 echo

demo/Makefile.am

@@ -1 @@
-EXTRA_DIST += \
-        demo/CMakeLists.txt \
-        demo/digraph.lgf
+AM_CXXFLAGS = $(WARNINGCXXFLAGS)
 
-if WANT_DEMO
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
+LDADD = $(top_builddir)/lemon/libemon.la
 
-noinst_PROGRAMS += \
-        demo/arg_parser_demo \
-        demo/graph_to_eps_demo \
-        demo/lgf_demo
+EXTRA_DIST = \
+        CMakeLists.txt \
+        digraph.lgf
 
-endif WANT_DEMO
+noinst_PROGRAMS = \
+        arg_parser_demo \
+        graph_to_eps_demo \
+        lgf_demo
 
-demo_arg_parser_demo_SOURCES = demo/arg_parser_demo.cc
-demo_graph_to_eps_demo_SOURCES = demo/graph_to_eps_demo.cc
-demo_lgf_demo_SOURCES = demo/lgf_demo.cc
+arg_parser_demo_SOURCES = arg_parser_demo.cc
+graph_to_eps_demo_SOURCES = graph_to_eps_demo.cc
+lgf_demo_SOURCES = lgf_demo.cc

doc/groups.dox

@@ -672 +672 @@
 the \c demo subdirectory of the source tree.
 
-It order to compile them, use <tt>--enable-demo</tt> configure option when
-build the library.
+In order to compile them, use the <tt>make demo</tt> or the
+<tt>make check</tt> commands.
 */
 

scripts/mk-release.sh

@@ -15 +15 @@
 
 autoreconf -vif
-./configure --enable-demo
+./configure
 
 make

test/Makefile.am

@@ -37 +37 @@
         test/time_measure_test \
         test/unionfind_test
+
+test_test_tools_pass_DEPENDENCIES = demo
 
 if HAVE_LP