gravatar
ladanyi@tmit.bme.hu
ladanyi@tmit.bme.hu
Add 'demo' make target for building the demo programs
0 7 0
default
7 files changed with 27 insertions and 41 deletions:
↑ Collapse diff ↑
Ignore white space 6 line context
... ...
@@ -24,14 +24,14 @@
24 24
      This command runs the configure shell script, which does some checks and
25 25
      creates the makefiles.
26 26

	
27 27
   3. `make'
28 28

	
29 29
      This command compiles the non-template part of LEMON into libemon.a
30
      file. It also compiles the programs in the tools and demo subdirectories
31
      when enabled.
30
      file. It also compiles the programs in the tools subdirectory by
31
      default.
32 32

	
33 33
   4. `make check'
34 34

	
35 35
      This step is optional, but recommended. It runs the test programs that
36 36
      we developed for LEMON to check whether the library works properly on
37 37
      your platform.
... ...
@@ -72,20 +72,12 @@
72 72
  turns on generation of aggressively optimized Pentium-M specific code.
73 73

	
74 74
--prefix=PREFIX
75 75

	
76 76
  Set the installation prefix to PREFIX. By default it is /usr/local.
77 77

	
78
--enable-demo
79

	
80
   Build the examples in the demo subdirectory.
81

	
82
--disable-demo
83

	
84
   Do not build the examples in the demo subdirectory (default).
85

	
86 78
--enable-tools
87 79

	
88 80
   Build the programs in the tools subdirectory (default).
89 81

	
90 82
--disable-tools
91 83

	
Ignore white space 6 line context
... ...
@@ -36,15 +36,19 @@
36 36
TESTS =
37 37
XFAIL_TESTS =
38 38

	
39 39
include lemon/Makefile.am
40 40
include test/Makefile.am
41 41
include doc/Makefile.am
42
include demo/Makefile.am
43 42
include tools/Makefile.am
44 43

	
44
DIST_SUBDIRS = demo
45

	
46
demo:
47
	$(MAKE) $(AM_MAKEFLAGS) -C demo
48

	
45 49
MRPROPERFILES = \
46 50
	aclocal.m4 \
47 51
	config.h.in \
48 52
	config.h.in~ \
49 53
	configure \
50 54
	Makefile.in \
... ...
@@ -65,7 +69,7 @@
65 69
	bzip2 --best -c > $(PACKAGE)-$(VERSION).tar.bz2
66 70

	
67 71
distcheck-bz2: distcheck
68 72
	zcat $(PACKAGE)-$(VERSION).tar.gz | \
69 73
	bzip2 --best -c > $(PACKAGE)-$(VERSION).tar.bz2
70 74

	
71
.PHONY: mrproper dist-bz2 distcheck-bz2
75
.PHONY: demo mrproper dist-bz2 distcheck-bz2
Ignore white space 6 line context
... ...
@@ -61,25 +61,12 @@
61 61
LX_CHECK_SOPLEX
62 62
LX_CHECK_CLP
63 63

	
64 64
AM_CONDITIONAL([HAVE_LP], [test x"$lx_lp_found" = x"yes"])
65 65
AM_CONDITIONAL([HAVE_MIP], [test x"$lx_mip_found" = x"yes"])
66 66

	
67
dnl Disable/enable building the demo programs.
68
AC_ARG_ENABLE([demo],
69
AS_HELP_STRING([--enable-demo], [build the demo programs])
70
AS_HELP_STRING([--disable-demo], [do not build the demo programs @<:@default@:>@]),
71
              [], [enable_demo=no])
72
AC_MSG_CHECKING([whether to build the demo programs])
73
if test x"$enable_demo" != x"no"; then
74
  AC_MSG_RESULT([yes])
75
else
76
  AC_MSG_RESULT([no])
77
fi
78
AM_CONDITIONAL([WANT_DEMO], [test x"$enable_demo" != x"no"])
79

	
80 67
dnl Disable/enable building the binary tools.
81 68
AC_ARG_ENABLE([tools],
82 69
AS_HELP_STRING([--enable-tools], [build additional tools @<:@default@:>@])
83 70
AS_HELP_STRING([--disable-tools], [do not build additional tools]),
84 71
              [], [enable_tools=yes])
85 72
AC_MSG_CHECKING([whether to build the additional tools])
... ...
@@ -107,12 +94,13 @@
107 94
dnl Add dependencies on files generated by configure.
108 95
AC_SUBST([CONFIG_STATUS_DEPENDENCIES],
109 96
  ['$(top_srcdir)/doc/Doxyfile.in $(top_srcdir)/lemon/lemon.pc.in $(top_srcdir)/cmake/version.cmake.in'])
110 97

	
111 98
AC_CONFIG_FILES([
112 99
Makefile
100
demo/Makefile
113 101
cmake/version.cmake
114 102
doc/Doxyfile
115 103
lemon/lemon.pc
116 104
])
117 105

	
118 106
AC_OUTPUT
... ...
@@ -129,13 +117,12 @@
129 117
echo
130 118
echo GLPK support.................. : $lx_glpk_found
131 119
echo CPLEX support................. : $lx_cplex_found
132 120
echo SOPLEX support................ : $lx_soplex_found
133 121
echo CLP support................... : $lx_clp_found
134 122
echo
135
echo Build demo programs........... : $enable_demo
136 123
echo Build additional tools........ : $enable_tools
137 124
echo
138 125
echo The packace will be installed in
139 126
echo -n '  '
140 127
echo $prefix.
141 128
echo
Ignore white space 6 line context
1
EXTRA_DIST += \
2
	demo/CMakeLists.txt \
3
	demo/digraph.lgf
1
AM_CXXFLAGS = $(WARNINGCXXFLAGS)
4 2

	
5
if WANT_DEMO
3
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
4
LDADD = $(top_builddir)/lemon/libemon.la
6 5

	
7
noinst_PROGRAMS += \
8
	demo/arg_parser_demo \
9
	demo/graph_to_eps_demo \
10
	demo/lgf_demo
6
EXTRA_DIST = \
7
	CMakeLists.txt \
8
	digraph.lgf
11 9

	
12
endif WANT_DEMO
10
noinst_PROGRAMS = \
11
	arg_parser_demo \
12
	graph_to_eps_demo \
13
	lgf_demo
13 14

	
14
demo_arg_parser_demo_SOURCES = demo/arg_parser_demo.cc
15
demo_graph_to_eps_demo_SOURCES = demo/graph_to_eps_demo.cc
16
demo_lgf_demo_SOURCES = demo/lgf_demo.cc
15
arg_parser_demo_SOURCES = arg_parser_demo.cc
16
graph_to_eps_demo_SOURCES = graph_to_eps_demo.cc
17
lgf_demo_SOURCES = lgf_demo.cc
Ignore white space 12 line context
... ...
@@ -668,14 +668,14 @@
668 668

	
669 669
@defgroup demos Demo Programs
670 670

	
671 671
Some demo programs are listed here. Their full source codes can be found in
672 672
the \c demo subdirectory of the source tree.
673 673

	
674
It order to compile them, use <tt>--enable-demo</tt> configure option when
675
build the library.
674
In order to compile them, use the <tt>make demo</tt> or the
675
<tt>make check</tt> commands.
676 676
*/
677 677

	
678 678
/**
679 679
@defgroup tools Standalone Utility Applications
680 680

	
681 681
Some utility applications are listed here.
Ignore white space 6 line context
... ...
@@ -11,13 +11,13 @@
11 11

	
12 12
echo '*****************************************************************'
13 13
echo ' Start making release tarballs for version '${LEMON_VERSION}
14 14
echo '*****************************************************************'
15 15

	
16 16
autoreconf -vif
17
./configure --enable-demo
17
./configure
18 18

	
19 19
make
20 20
make html
21 21
make distcheck
22 22
tar xf lemon-${LEMON_VERSION}.tar.gz
23 23
zip -r lemon-${LEMON_VERSION}.zip lemon-${LEMON_VERSION}
Ignore white space 6 line context
... ...
@@ -34,12 +34,14 @@
34 34
	test/suurballe_test \
35 35
	test/test_tools_fail \
36 36
	test/test_tools_pass \
37 37
	test/time_measure_test \
38 38
	test/unionfind_test
39 39

	
40
test_test_tools_pass_DEPENDENCIES = demo
41

	
40 42
if HAVE_LP
41 43
check_PROGRAMS += test/lp_test
42 44
endif HAVE_LP
43 45
if HAVE_MIP
44 46
check_PROGRAMS += test/mip_test
45 47
endif HAVE_MIP
0 comments (0 inline)