gravatar
alpar (Alpar Juttner)
alpar@cs.elte.hu
Merge
2 4 1
merge default
2 files changed with 2 insertions and 26 deletions:
↑ Collapse diff ↑
Ignore white space 6 line context
... ...
@@ -15,32 +15,32 @@
15 15
lemondir = $(pkgincludedir)
16 16
bitsdir = $(lemondir)/bits
17 17
conceptdir = $(lemondir)/concepts
18 18
pkgconfig_DATA =
19 19
lib_LTLIBRARIES =
20 20
lemon_HEADERS =
21 21
bits_HEADERS =
22 22
concept_HEADERS =
23 23
noinst_HEADERS =
24 24
noinst_PROGRAMS =
25 25
bin_PROGRAMS =
26 26
check_PROGRAMS =
27
dist_bin_SCRIPTS =
27 28
TESTS =
28 29
XFAIL_TESTS =
29 30

	
30 31
include lemon/Makefile.am
31 32
include test/Makefile.am
32 33
include doc/Makefile.am
33 34
include demo/Makefile.am
34
include benchmark/Makefile.am
35 35
include tools/Makefile.am
36 36

	
37 37
MRPROPERFILES = \
38 38
	aclocal.m4 \
39 39
	config.h.in \
40 40
	config.h.in~ \
41 41
	configure \
42 42
	Makefile.in \
43 43
	build-aux/config.guess \
44 44
	build-aux/config.sub \
45 45
	build-aux/depcomp \
46 46
	build-aux/install-sh \
Ignore white space 6 line context
... ...
@@ -28,19 +28,15 @@
28 28
doc/
29 29

	
30 30
   Documentation of LEMON. The starting page is doc/html/index.html.
31 31

	
32 32
demo/
33 33

	
34 34
   Some example programs to make you easier to get familiar with LEMON.
35 35

	
36 36
test/
37 37

	
38 38
   Contains programs to check the integrity and correctness of LEMON.
39 39

	
40
benchmark/
41
  
42
   Contains programs for measuring the performance of algorithms.
43

	
44 40
tools/
45 41

	
46 42
   Various utilities related to LEMON.
Ignore white space 24 line context
... ...
@@ -72,37 +72,24 @@
72 72
AC_ARG_ENABLE([tools],
73 73
AS_HELP_STRING([--enable-tools], [build additional tools @<:@default@:>@])
74 74
AS_HELP_STRING([--disable-tools], [do not build additional tools]),
75 75
              [], [enable_tools=yes])
76 76
AC_MSG_CHECKING([whether to build the additional tools])
77 77
if test x"$enable_tools" != x"no"; then
78 78
  AC_MSG_RESULT([yes])
79 79
else
80 80
  AC_MSG_RESULT([no])
81 81
fi
82 82
AM_CONDITIONAL([WANT_TOOLS], [test x"$enable_tools" != x"no"])
83 83

	
84
dnl Disable/enable building the benchmarks.
85
AC_ARG_ENABLE([benchmark],
86
AS_HELP_STRING([--enable-benchmark], [build the benchmarks])
87
AS_HELP_STRING([--disable-benchmark], [do not build the benchmarks @<:@default@:>@]),
88
              [], [enable_benchmark=no])
89
AC_MSG_CHECKING([whether to build the benchmarks])
90
if test x"$enable_benchmark" != x"no"; then
91
  AC_MSG_RESULT([yes])
92
else
93
  AC_MSG_RESULT([no])
94
fi
95
AM_CONDITIONAL([WANT_BENCHMARK], [test x"$enable_benchmark" != x"no"])
96

	
97 84
dnl Checks for header files.
98 85
AC_CHECK_HEADERS(limits.h sys/time.h sys/times.h unistd.h)
99 86

	
100 87
dnl Checks for typedefs, structures, and compiler characteristics.
101 88
AC_C_CONST
102 89
AC_C_INLINE
103 90
AC_TYPE_SIZE_T
104 91
AC_HEADER_TIME
105 92
AC_STRUCT_TM
106 93

	
107 94
dnl Checks for library functions.
108 95
AC_HEADER_STDC
... ...
@@ -123,25 +110,24 @@
123 110
echo
124 111
echo '****************************** SUMMARY ******************************'
125 112
echo
126 113
echo Package version............... : $PACKAGE-$VERSION
127 114
echo
128 115
echo C++ compiler.................. : $CXX
129 116
echo C++ compiles flags............ : $CXXFLAGS
130 117
echo
131 118
#echo GLPK support.................. : $lx_glpk_found
132 119
#echo CPLEX support................. : $lx_cplex_found
133 120
#echo SOPLEX support................ : $lx_soplex_found
134 121
#echo
135
echo Build benchmarks.............. : $enable_benchmark
136 122
echo Build demo programs........... : $enable_demo
137 123
echo Build additional tools........ : $enable_tools
138 124
echo
139 125
echo The packace will be installed in
140 126
echo -n '  '
141 127
echo $prefix.
142 128
echo
143 129
echo '*********************************************************************'
144 130

	
145 131
echo
146 132
echo Configure complete, now type \'make\' and then \'make install\'.
147 133
echo
Ignore white space 6 line context
1 1
if WANT_TOOLS
2 2

	
3 3
bin_PROGRAMS +=
4
dist_bin_SCRIPTS += tools/lemon-0.x-to-1.x.sh
4 5

	
5 6
endif WANT_TOOLS
Ignore white space 6 line context
file renamed from scripts/lemon-0.x-to-1.x.sh to tools/lemon-0.x-to-1.x.sh
Ignore white space 6 line context
1
if WANT_BENCHMARK
2

	
3
noinst_HEADERS +=
4

	
5
noinst_PROGRAMS +=
6

	
7
endif WANT_BENCHMARK
0 comments (0 inline)