Changeset 2390:8450951a8e2d in lemon-0.x

Timestamp:

03/03/07 17:04:50 (17 years ago)

Author:

Alpar Juttner

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@3221

Message:

• '-Wshadow' seemed to strict therefore removed
• a tools directory added for useful executables codes
• tools/lgf-gen.cc (a random graph generator) added

Files:

• Makefile.am (modified) (2 diffs)
• configure.ac (modified) (3 diffs)
• doc/dirs.dox (modified) (1 diff)
• lemon/arg_parser.cc (modified) (1 diff)
• tools/Makefile (added)
• tools/Makefile.am (added)
• tools/lgf-gen.cc (added)

Makefile.am

@@ -23 +23 @@
 noinst_HEADERS =
 noinst_PROGRAMS =
+bin_PROGRAMS =
 check_PROGRAMS =
 TESTS =
@@ -32 +33 @@
 include demo/Makefile.am
 include benchmark/Makefile.am
+include tools/Makefile.am
 
 MRPROPERFILES = \

configure.ac

@@ -18 +18 @@
 
 if test x"$lx_cmdline_cxxflags_set" != x"set" -a "$GXX" = yes; then
-  CXXFLAGS="$CXXFLAGS -Wall -W -Wall -W -Wunused -Wformat=2 -Wctor-dtor-privacy -Wnon-virtual-dtor -Wno-char-subscripts -Wwrite-strings -Wno-char-subscripts -Wreturn-type -Wcast-qual -Wcast-align -Wsign-promo -Woverloaded-virtual -Woverloaded-virtual -Wshadow -ansi -fno-strict-aliasing -Wold-style-cast -Wno-unknown-pragmas"
+  CXXFLAGS="$CXXFLAGS -Wall -W -Wall -W -Wunused -Wformat=2 -Wctor-dtor-privacy -Wnon-virtual-dtor -Wno-char-subscripts -Wwrite-strings -Wno-char-subscripts -Wreturn-type -Wcast-qual -Wcast-align -Wsign-promo -Woverloaded-virtual -Woverloaded-virtual -ansi -fno-strict-aliasing -Wold-style-cast -Wno-unknown-pragmas"
 fi
 
@@ -67 +67 @@
 fi
 AM_CONDITIONAL([WANT_DEMO], [test x"$enable_demo" != x"no"])
+
+dnl Disable/enable building the binary tools
+AC_ARG_ENABLE([tools],
+AS_HELP_STRING([--enable-tools], [build additional tools @<:@default@:>@])
+AS_HELP_STRING([--disable-tools], [do not build additional tools]),
+              [], [enable_tools=yes])
+AC_MSG_CHECKING([whether to build the additional tools])
+if test x"$enable_tools" != x"no"; then
+  AC_MSG_RESULT([yes])
+else
+  AC_MSG_RESULT([no])
+fi
+AM_CONDITIONAL([WANT_TOOLS], [test x"$enable_tools" != x"no"])
 
 dnl Disable/enable building the benchmarks
@@ -119 +132 @@
 echo build benchmarks.............. : $enable_benchmark
 echo build demo programs........... : $enable_demo
+echo build additional tools........ : $enable_tools
 echo
 echo The packace will be installed in

doc/dirs.dox

@@ -22 +22 @@
 */
 
+/**
+\dir tools
+\brief Some useful executables
+
+This directory contains the sources of some useful complete executables.
+
+*/
 
 

lemon/arg_parser.cc

@@ -21 +21 @@
   void ArgParser::_showHelp(void *p)
   {
-    ((ArgParser*)p)->showHelp();
+    (static_cast<ArgParser*>(p))->showHelp();
     exit(1);
   }