# HG changeset patch # User Alpar Juttner # Date 1327917289 -3600 # Node ID cdd2c7dad989a1032b4b88389befb3c08f989bed # Parent 48e17328c1551cb8196973d6056a04e40e5d624a Remove autotool related files (#434) diff -r 48e17328c155 -r cdd2c7dad989 Makefile.am --- a/Makefile.am Sun Jan 29 22:33:14 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,80 +0,0 @@ -ACLOCAL_AMFLAGS = -I m4 - -AM_CXXFLAGS = $(WARNINGCXXFLAGS) - -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir) -LDADD = $(top_builddir)/lemon/libemon.la - -EXTRA_DIST = \ - AUTHORS \ - LICENSE \ - m4/lx_check_cplex.m4 \ - m4/lx_check_glpk.m4 \ - m4/lx_check_soplex.m4 \ - m4/lx_check_coin.m4 \ - CMakeLists.txt \ - cmake/FindGhostscript.cmake \ - cmake/FindCPLEX.cmake \ - cmake/FindGLPK.cmake \ - cmake/FindCOIN.cmake \ - cmake/LEMONConfig.cmake.in \ - cmake/version.cmake.in \ - cmake/version.cmake \ - cmake/nsis/lemon.ico \ - cmake/nsis/uninstall.ico - -pkgconfigdir = $(libdir)/pkgconfig -lemondir = $(pkgincludedir) -bitsdir = $(lemondir)/bits -conceptdir = $(lemondir)/concepts -pkgconfig_DATA = -lib_LTLIBRARIES = -lemon_HEADERS = -bits_HEADERS = -concept_HEADERS = -noinst_HEADERS = -noinst_PROGRAMS = -bin_PROGRAMS = -check_PROGRAMS = -dist_bin_SCRIPTS = -TESTS = -XFAIL_TESTS = - -include lemon/Makefile.am -include test/Makefile.am -include doc/Makefile.am -include tools/Makefile.am -include scripts/Makefile.am - -DIST_SUBDIRS = demo - -demo: - $(MAKE) $(AM_MAKEFLAGS) -C demo - -MRPROPERFILES = \ - aclocal.m4 \ - config.h.in \ - config.h.in~ \ - configure \ - Makefile.in \ - build-aux/config.guess \ - build-aux/config.sub \ - build-aux/depcomp \ - build-aux/install-sh \ - build-aux/ltmain.sh \ - build-aux/missing \ - doc/doxygen.log - -mrproper: - $(MAKE) $(AM_MAKEFLAGS) maintainer-clean - -rm -f $(MRPROPERFILES) - -dist-bz2: dist - zcat $(PACKAGE)-$(VERSION).tar.gz | \ - bzip2 --best -c > $(PACKAGE)-$(VERSION).tar.bz2 - -distcheck-bz2: distcheck - zcat $(PACKAGE)-$(VERSION).tar.gz | \ - bzip2 --best -c > $(PACKAGE)-$(VERSION).tar.bz2 - -.PHONY: demo mrproper dist-bz2 distcheck-bz2 diff -r 48e17328c155 -r cdd2c7dad989 configure.ac --- a/configure.ac Sun Jan 29 22:33:14 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,157 +0,0 @@ -dnl Process this file with autoconf to produce a configure script. - -dnl Version information. -m4_define([lemon_version_number], - [m4_normalize(esyscmd([echo ${LEMON_VERSION}]))]) -dnl m4_define([lemon_version_number], []) -m4_define([lemon_hg_path], [m4_normalize(esyscmd([./scripts/chg-len.py]))]) -m4_define([lemon_hg_revision], [m4_normalize(esyscmd([hg id -i 2> /dev/null]))]) -m4_define([lemon_version], [ifelse(lemon_version_number(), - [], - [ifelse(lemon_hg_revision(), - [], - [hg-tip], - [lemon_hg_path().lemon_hg_revision()])], - [lemon_version_number()])]) - -AC_PREREQ([2.59]) -AC_INIT([LEMON], [lemon_version()], [lemon-user@lemon.cs.elte.hu], [lemon]) -AC_CONFIG_AUX_DIR([build-aux]) -AC_CONFIG_MACRO_DIR([m4]) -AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects nostdinc]) -AC_CONFIG_SRCDIR([lemon/list_graph.h]) -AC_CONFIG_HEADERS([config.h lemon/config.h]) - -AC_DEFINE([LEMON_VERSION], [lemon_version()], [The version string]) - -dnl Do compilation tests using the C++ compiler. -AC_LANG([C++]) - -dnl Check the existence of long long type. -AC_CHECK_TYPE(long long, [long_long_found=yes], [long_long_found=no]) -if test x"$long_long_found" = x"yes"; then - AC_DEFINE([LEMON_HAVE_LONG_LONG], [1], [Define to 1 if you have long long.]) -fi - -dnl Checks for programs. -AC_PROG_CXX -AC_PROG_CXXCPP -AC_PROG_INSTALL -AC_DISABLE_SHARED -AC_PROG_LIBTOOL - -AC_CHECK_PROG([doxygen_found],[doxygen],[yes],[no]) -AC_CHECK_PROG([python_found],[python],[yes],[no]) -AC_CHECK_PROG([gs_found],[gs],[yes],[no]) - -dnl Detect Intel compiler. -AC_MSG_CHECKING([whether we are using the Intel C++ compiler]) -AC_COMPILE_IFELSE([#ifndef __INTEL_COMPILER -choke me -#endif], [ICC=[yes]], [ICC=[no]]) -if test x"$ICC" = x"yes"; then - AC_MSG_RESULT([yes]) -else - AC_MSG_RESULT([no]) -fi - -dnl Set custom compiler flags when using g++. -if test "$GXX" = yes -a "$ICC" = no; then - WARNINGCXXFLAGS="-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 -ansi -fno-strict-aliasing -Wold-style-cast -Wno-unknown-pragmas" -fi -AC_SUBST([WARNINGCXXFLAGS]) - -dnl Checks for libraries. -LX_CHECK_GLPK -LX_CHECK_CPLEX -LX_CHECK_SOPLEX -LX_CHECK_COIN - -AM_CONDITIONAL([HAVE_LP], [test x"$lx_lp_found" = x"yes"]) -AM_CONDITIONAL([HAVE_MIP], [test x"$lx_mip_found" = x"yes"]) - -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 Support for running test cases using valgrind. -use_valgrind=no -AC_ARG_ENABLE([valgrind], -AS_HELP_STRING([--enable-valgrind], [use valgrind when running tests]), - [use_valgrind=yes]) - -if [[ "$use_valgrind" = "yes" ]]; then - AC_CHECK_PROG(HAVE_VALGRIND, valgrind, yes, no) - - if [[ "$HAVE_VALGRIND" = "no" ]]; then - AC_MSG_ERROR([Valgrind not found in PATH.]) - fi -fi -AM_CONDITIONAL(USE_VALGRIND, [test "$use_valgrind" = "yes"]) - -dnl Checks for header files. -AC_CHECK_HEADERS(limits.h sys/time.h sys/times.h unistd.h) - -dnl Checks for typedefs, structures, and compiler characteristics. -AC_C_CONST -AC_C_INLINE -AC_TYPE_SIZE_T -AC_HEADER_TIME -AC_STRUCT_TM - -dnl Checks for library functions. -AC_HEADER_STDC -AC_CHECK_FUNCS(gettimeofday times ctime_r) - -dnl Add dependencies on files generated by configure. -AC_SUBST([CONFIG_STATUS_DEPENDENCIES], - ['$(top_srcdir)/doc/Doxyfile.in $(top_srcdir)/doc/mainpage.dox.in $(top_srcdir)/lemon/lemon.pc.in $(top_srcdir)/cmake/version.cmake.in']) - -AC_CONFIG_FILES([ -Makefile -demo/Makefile -cmake/version.cmake -doc/Doxyfile -doc/mainpage.dox -lemon/lemon.pc -]) - -AC_OUTPUT - -echo -echo '****************************** SUMMARY ******************************' -echo -echo Package version............... : $PACKAGE-$VERSION -echo -echo C++ compiler.................. : $CXX -echo C++ compiles flags............ : $WARNINGCXXFLAGS $CXXFLAGS -echo -echo Compiler supports long long... : $long_long_found -echo -echo GLPK support.................. : $lx_glpk_found -echo CPLEX support................. : $lx_cplex_found -echo SOPLEX support................ : $lx_soplex_found -echo CLP support................... : $lx_clp_found -echo CBC support................... : $lx_cbc_found -echo -echo Build additional tools........ : $enable_tools -echo Use valgrind for tests........ : $use_valgrind -echo -echo The packace will be installed in -echo -n ' ' -echo $prefix. -echo -echo '*********************************************************************' - -echo -echo Configure complete, now type \'make\' and then \'make install\'. -echo diff -r 48e17328c155 -r cdd2c7dad989 demo/Makefile.am --- a/demo/Makefile.am Sun Jan 29 22:33:14 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,17 +0,0 @@ -AM_CXXFLAGS = $(WARNINGCXXFLAGS) - -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir) -LDADD = $(top_builddir)/lemon/libemon.la - -EXTRA_DIST = \ - CMakeLists.txt \ - digraph.lgf - -noinst_PROGRAMS = \ - arg_parser_demo \ - graph_to_eps_demo \ - lgf_demo - -arg_parser_demo_SOURCES = arg_parser_demo.cc -graph_to_eps_demo_SOURCES = graph_to_eps_demo.cc -lgf_demo_SOURCES = lgf_demo.cc diff -r 48e17328c155 -r cdd2c7dad989 doc/Makefile.am --- a/doc/Makefile.am Sun Jan 29 22:33:14 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,125 +0,0 @@ -EXTRA_DIST += \ - doc/Doxyfile.in \ - doc/DoxygenLayout.xml \ - doc/coding_style.dox \ - doc/dirs.dox \ - doc/groups.dox \ - doc/lgf.dox \ - doc/license.dox \ - doc/mainpage.dox \ - doc/migration.dox \ - doc/min_cost_flow.dox \ - doc/named-param.dox \ - doc/namespaces.dox \ - doc/references.bib \ - doc/template.h \ - doc/html \ - doc/CMakeLists.txt - -DOC_EPS_IMAGES18 = \ - grid_graph.eps \ - nodeshape_0.eps \ - nodeshape_1.eps \ - nodeshape_2.eps \ - nodeshape_3.eps \ - nodeshape_4.eps - -DOC_EPS_IMAGES27 = \ - bipartite_matching.eps \ - bipartite_partitions.eps \ - connected_components.eps \ - edge_biconnected_components.eps \ - matching.eps \ - node_biconnected_components.eps \ - planar.eps \ - strongly_connected_components.eps - -DOC_EPS_IMAGES = \ - $(DOC_EPS_IMAGES18) \ - $(DOC_EPS_IMAGES27) - -DOC_PNG_IMAGES = \ - $(DOC_EPS_IMAGES:%.eps=doc/gen-images/%.png) - -EXTRA_DIST += $(DOC_EPS_IMAGES:%=doc/images/%) - -doc/html: - $(MAKE) $(AM_MAKEFLAGS) html - -GS_COMMAND=gs -dNOPAUSE -dBATCH -q -dEPSCrop -dTextAlphaBits=4 -dGraphicsAlphaBits=4 - -$(DOC_EPS_IMAGES18:%.eps=doc/gen-images/%.png): doc/gen-images/%.png: doc/images/%.eps - -mkdir doc/gen-images - if test ${gs_found} = yes; then \ - $(GS_COMMAND) -sDEVICE=pngalpha -r18 -sOutputFile=$@ $<; \ - else \ - echo; \ - echo "Ghostscript not found."; \ - echo; \ - exit 1; \ - fi - -$(DOC_EPS_IMAGES27:%.eps=doc/gen-images/%.png): doc/gen-images/%.png: doc/images/%.eps - -mkdir doc/gen-images - if test ${gs_found} = yes; then \ - $(GS_COMMAND) -sDEVICE=pngalpha -r27 -sOutputFile=$@ $<; \ - else \ - echo; \ - echo "Ghostscript not found."; \ - echo; \ - exit 1; \ - fi - -references.dox: doc/references.bib - if test ${python_found} = yes; then \ - cd doc; \ - python @abs_top_srcdir@/scripts/bib2dox.py @abs_top_builddir@/$< >$@; \ - cd ..; \ - else \ - echo; \ - echo "Python not found."; \ - echo; \ - exit 1; \ - fi - -html-local: $(DOC_PNG_IMAGES) references.dox - if test ${doxygen_found} = yes; then \ - cd doc; \ - doxygen Doxyfile; \ - cd ..; \ - else \ - echo; \ - echo "Doxygen not found."; \ - echo; \ - exit 1; \ - fi - -clean-local: - -rm -rf doc/html - -rm -f doc/doxygen.log - -rm -f $(DOC_PNG_IMAGES) - -rm -rf doc/gen-images - -update-external-tags: - wget -O doc/libstdc++.tag.tmp http://gcc.gnu.org/onlinedocs/libstdc++/latest-doxygen/libstdc++.tag && \ - mv doc/libstdc++.tag.tmp doc/libstdc++.tag || \ - rm doc/libstdc++.tag.tmp - -install-html-local: doc/html - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(htmldir)/html - for p in doc/html/*.{html,css,png,map,gif,tag} ; do \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " $(INSTALL_DATA) $$p $(DESTDIR)$(htmldir)/html/$$f"; \ - $(INSTALL_DATA) $$p $(DESTDIR)$(htmldir)/html/$$f; \ - done - -uninstall-local: - @$(NORMAL_UNINSTALL) - for p in doc/html/*.{html,css,png,map,gif,tag} ; do \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " rm -f $(DESTDIR)$(htmldir)/html/$$f"; \ - rm -f $(DESTDIR)$(htmldir)/html/$$f; \ - done - -.PHONY: update-external-tags diff -r 48e17328c155 -r cdd2c7dad989 lemon/CMakeLists.txt --- a/lemon/CMakeLists.txt Sun Jan 29 22:33:14 2012 +0100 +++ b/lemon/CMakeLists.txt Mon Jan 30 10:54:49 2012 +0100 @@ -4,12 +4,12 @@ ) CONFIGURE_FILE( - ${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake + ${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h ) CONFIGURE_FILE( - ${CMAKE_CURRENT_SOURCE_DIR}/lemon.pc.cmake + ${CMAKE_CURRENT_SOURCE_DIR}/lemon.pc.in ${CMAKE_CURRENT_BINARY_DIR}/lemon.pc @ONLY ) diff -r 48e17328c155 -r cdd2c7dad989 lemon/Makefile.am --- a/lemon/Makefile.am Sun Jan 29 22:33:14 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,155 +0,0 @@ -EXTRA_DIST += \ - lemon/lemon.pc.in \ - lemon/lemon.pc.cmake \ - lemon/CMakeLists.txt \ - lemon/config.h.cmake - -pkgconfig_DATA += lemon/lemon.pc - -lib_LTLIBRARIES += lemon/libemon.la - -lemon_libemon_la_SOURCES = \ - lemon/arg_parser.cc \ - lemon/base.cc \ - lemon/color.cc \ - lemon/lp_base.cc \ - lemon/lp_skeleton.cc \ - lemon/random.cc \ - lemon/bits/windows.cc - -nodist_lemon_HEADERS = lemon/config.h - -lemon_libemon_la_CXXFLAGS = \ - $(AM_CXXFLAGS) \ - $(GLPK_CFLAGS) \ - $(CPLEX_CFLAGS) \ - $(SOPLEX_CXXFLAGS) \ - $(CLP_CXXFLAGS) \ - $(CBC_CXXFLAGS) - -lemon_libemon_la_LDFLAGS = \ - $(GLPK_LIBS) \ - $(CPLEX_LIBS) \ - $(SOPLEX_LIBS) \ - $(CLP_LIBS) \ - $(CBC_LIBS) - -if HAVE_GLPK -lemon_libemon_la_SOURCES += lemon/glpk.cc -endif - -if HAVE_CPLEX -lemon_libemon_la_SOURCES += lemon/cplex.cc -endif - -if HAVE_SOPLEX -lemon_libemon_la_SOURCES += lemon/soplex.cc -endif - -if HAVE_CLP -lemon_libemon_la_SOURCES += lemon/clp.cc -endif - -if HAVE_CBC -lemon_libemon_la_SOURCES += lemon/cbc.cc -endif - -lemon_HEADERS += \ - lemon/adaptors.h \ - lemon/arg_parser.h \ - lemon/assert.h \ - lemon/bellman_ford.h \ - lemon/bfs.h \ - lemon/bin_heap.h \ - lemon/binomial_heap.h \ - lemon/bucket_heap.h \ - lemon/capacity_scaling.h \ - lemon/cbc.h \ - lemon/circulation.h \ - lemon/clp.h \ - lemon/color.h \ - lemon/concept_check.h \ - lemon/connectivity.h \ - lemon/core.h \ - lemon/cost_scaling.h \ - lemon/counter.h \ - lemon/cplex.h \ - lemon/cycle_canceling.h \ - lemon/dfs.h \ - lemon/dheap.h \ - lemon/dijkstra.h \ - lemon/dim2.h \ - lemon/dimacs.h \ - lemon/edge_set.h \ - lemon/elevator.h \ - lemon/error.h \ - lemon/euler.h \ - lemon/fib_heap.h \ - lemon/fractional_matching.h \ - lemon/full_graph.h \ - lemon/glpk.h \ - lemon/gomory_hu.h \ - lemon/graph_to_eps.h \ - lemon/grid_graph.h \ - lemon/grosso_locatelli_pullan_mc.h \ - lemon/hartmann_orlin_mmc.h \ - lemon/howard_mmc.h \ - lemon/hypercube_graph.h \ - lemon/karp_mmc.h \ - lemon/kruskal.h \ - lemon/hao_orlin.h \ - lemon/lgf_reader.h \ - lemon/lgf_writer.h \ - lemon/list_graph.h \ - lemon/lp.h \ - lemon/lp_base.h \ - lemon/lp_skeleton.h \ - lemon/maps.h \ - lemon/matching.h \ - lemon/math.h \ - lemon/min_cost_arborescence.h \ - lemon/max_cardinality_search.h \ - lemon/nagamochi_ibaraki.h \ - lemon/nauty_reader.h \ - lemon/network_simplex.h \ - lemon/pairing_heap.h \ - lemon/path.h \ - lemon/planarity.h \ - lemon/preflow.h \ - lemon/quad_heap.h \ - lemon/radix_heap.h \ - lemon/radix_sort.h \ - lemon/random.h \ - lemon/smart_graph.h \ - lemon/soplex.h \ - lemon/static_graph.h \ - lemon/suurballe.h \ - lemon/time_measure.h \ - lemon/tolerance.h \ - lemon/unionfind.h \ - lemon/bits/windows.h - -bits_HEADERS += \ - lemon/bits/alteration_notifier.h \ - lemon/bits/array_map.h \ - lemon/bits/bezier.h \ - lemon/bits/default_map.h \ - lemon/bits/edge_set_extender.h \ - lemon/bits/enable_if.h \ - lemon/bits/graph_adaptor_extender.h \ - lemon/bits/graph_extender.h \ - lemon/bits/lock.h \ - lemon/bits/map_extender.h \ - lemon/bits/path_dump.h \ - lemon/bits/solver_bits.h \ - lemon/bits/traits.h \ - lemon/bits/variant.h \ - lemon/bits/vector_map.h - -concept_HEADERS += \ - lemon/concepts/digraph.h \ - lemon/concepts/graph.h \ - lemon/concepts/graph_components.h \ - lemon/concepts/heap.h \ - lemon/concepts/maps.h \ - lemon/concepts/path.h diff -r 48e17328c155 -r cdd2c7dad989 lemon/config.h.cmake --- a/lemon/config.h.cmake Sun Jan 29 22:33:14 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,10 +0,0 @@ -#define LEMON_VERSION "@PROJECT_VERSION@" -#cmakedefine LEMON_HAVE_LONG_LONG 1 -#cmakedefine LEMON_HAVE_LP 1 -#cmakedefine LEMON_HAVE_MIP 1 -#cmakedefine LEMON_HAVE_GLPK 1 -#cmakedefine LEMON_HAVE_CPLEX 1 -#cmakedefine LEMON_HAVE_CLP 1 -#cmakedefine LEMON_HAVE_CBC 1 -#cmakedefine LEMON_USE_PTHREAD 1 -#cmakedefine LEMON_USE_WIN32_THREADS 1 diff -r 48e17328c155 -r cdd2c7dad989 lemon/config.h.in --- a/lemon/config.h.in Sun Jan 29 22:33:14 2012 +0100 +++ b/lemon/config.h.in Mon Jan 30 10:54:49 2012 +0100 @@ -1,32 +1,10 @@ -/* The version string */ -#undef LEMON_VERSION - -/* Define to 1 if you have long long */ -#undef LEMON_HAVE_LONG_LONG - -/* Define to 1 if you have any LP solver. */ -#undef LEMON_HAVE_LP - -/* Define to 1 if you have any MIP solver. */ -#undef LEMON_HAVE_MIP - -/* Define to 1 if you have CPLEX. */ -#undef LEMON_HAVE_CPLEX - -/* Define to 1 if you have GLPK. */ -#undef LEMON_HAVE_GLPK - -/* Define to 1 if you have SOPLEX */ -#undef LEMON_HAVE_SOPLEX - -/* Define to 1 if you have CLP */ -#undef LEMON_HAVE_CLP - -/* Define to 1 if you have CBC */ -#undef LEMON_HAVE_CBC - -/* Define to 1 if you have pthread */ -#undef LEMON_USE_PTHREAD - -/* Define to 1 if you have win32 threads */ -#undef LEMON_USE_WIN32_THREADS +#define LEMON_VERSION "@PROJECT_VERSION@" +#cmakedefine LEMON_HAVE_LONG_LONG 1 +#cmakedefine LEMON_HAVE_LP 1 +#cmakedefine LEMON_HAVE_MIP 1 +#cmakedefine LEMON_HAVE_GLPK 1 +#cmakedefine LEMON_HAVE_CPLEX 1 +#cmakedefine LEMON_HAVE_CLP 1 +#cmakedefine LEMON_HAVE_CBC 1 +#cmakedefine LEMON_USE_PTHREAD 1 +#cmakedefine LEMON_USE_WIN32_THREADS 1 diff -r 48e17328c155 -r cdd2c7dad989 lemon/lemon.pc.cmake --- a/lemon/lemon.pc.cmake Sun Jan 29 22:33:14 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,10 +0,0 @@ -prefix=@CMAKE_INSTALL_PREFIX@ -exec_prefix=@CMAKE_INSTALL_PREFIX@/bin -libdir=@CMAKE_INSTALL_PREFIX@/lib -includedir=@CMAKE_INSTALL_PREFIX@/include - -Name: @PROJECT_NAME@ -Description: Library for Efficient Modeling and Optimization in Networks -Version: @PROJECT_VERSION@ -Libs: -L${libdir} -lemon @GLPK_LIBS@ @CPLEX_LIBS@ @SOPLEX_LIBS@ @CLP_LIBS@ @CBC_LIBS@ -Cflags: -I${includedir} diff -r 48e17328c155 -r cdd2c7dad989 lemon/lemon.pc.in --- a/lemon/lemon.pc.in Sun Jan 29 22:33:14 2012 +0100 +++ b/lemon/lemon.pc.in Mon Jan 30 10:54:49 2012 +0100 @@ -1,10 +1,10 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ +prefix=@CMAKE_INSTALL_PREFIX@ +exec_prefix=@CMAKE_INSTALL_PREFIX@/bin +libdir=@CMAKE_INSTALL_PREFIX@/lib +includedir=@CMAKE_INSTALL_PREFIX@/include -Name: @PACKAGE_NAME@ +Name: @PROJECT_NAME@ Description: Library for Efficient Modeling and Optimization in Networks -Version: @PACKAGE_VERSION@ +Version: @PROJECT_VERSION@ Libs: -L${libdir} -lemon @GLPK_LIBS@ @CPLEX_LIBS@ @SOPLEX_LIBS@ @CLP_LIBS@ @CBC_LIBS@ Cflags: -I${includedir} diff -r 48e17328c155 -r cdd2c7dad989 m4/lx_check_coin.m4 --- a/m4/lx_check_coin.m4 Sun Jan 29 22:33:14 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,136 +0,0 @@ -AC_DEFUN([LX_CHECK_COIN], -[ - AC_ARG_WITH([coin], -AS_HELP_STRING([--with-coin@<:@=PREFIX@:>@], [search for CLP under PREFIX or under the default search paths if PREFIX is not given @<:@default@:>@]) -AS_HELP_STRING([--without-coin], [disable checking for CLP]), - [], [with_coin=yes]) - - AC_ARG_WITH([coin-includedir], -AS_HELP_STRING([--with-coin-includedir=DIR], [search for CLP headers in DIR]), - [], [with_coin_includedir=no]) - - AC_ARG_WITH([coin-libdir], -AS_HELP_STRING([--with-coin-libdir=DIR], [search for CLP libraries in DIR]), - [], [with_coin_libdir=no]) - - lx_clp_found=no - if test x"$with_coin" != x"no"; then - AC_MSG_CHECKING([for CLP]) - - if test x"$with_coin_includedir" != x"no"; then - CLP_CXXFLAGS="-I$with_coin_includedir" - elif test x"$with_coin" != x"yes"; then - CLP_CXXFLAGS="-I$with_coin/include" - fi - - if test x"$with_coin_libdir" != x"no"; then - CLP_LDFLAGS="-L$with_coin_libdir" - elif test x"$with_coin" != x"yes"; then - CLP_LDFLAGS="-L$with_coin/lib" - fi - CLP_LIBS="-lClp -lCoinUtils -lm" - - lx_save_cxxflags="$CXXFLAGS" - lx_save_ldflags="$LDFLAGS" - lx_save_libs="$LIBS" - CXXFLAGS="$CLP_CXXFLAGS" - LDFLAGS="$CLP_LDFLAGS" - LIBS="$CLP_LIBS" - - lx_clp_test_prog=' - #include - - int main(int argc, char** argv) - { - ClpModel clp; - return 0; - }' - - AC_LANG_PUSH(C++) - AC_LINK_IFELSE([$lx_clp_test_prog], [lx_clp_found=yes], [lx_clp_found=no]) - AC_LANG_POP(C++) - - CXXFLAGS="$lx_save_cxxflags" - LDFLAGS="$lx_save_ldflags" - LIBS="$lx_save_libs" - - if test x"$lx_clp_found" = x"yes"; then - AC_DEFINE([LEMON_HAVE_CLP], [1], [Define to 1 if you have CLP.]) - lx_lp_found=yes - AC_DEFINE([LEMON_HAVE_LP], [1], [Define to 1 if you have any LP solver.]) - AC_MSG_RESULT([yes]) - else - CLP_CXXFLAGS="" - CLP_LDFLAGS="" - CLP_LIBS="" - AC_MSG_RESULT([no]) - fi - fi - CLP_LIBS="$CLP_LDFLAGS $CLP_LIBS" - AC_SUBST(CLP_CXXFLAGS) - AC_SUBST(CLP_LIBS) - AM_CONDITIONAL([HAVE_CLP], [test x"$lx_clp_found" = x"yes"]) - - - lx_cbc_found=no - if test x"$lx_clp_found" = x"yes"; then - if test x"$with_coin" != x"no"; then - AC_MSG_CHECKING([for CBC]) - - if test x"$with_coin_includedir" != x"no"; then - CBC_CXXFLAGS="-I$with_coin_includedir" - elif test x"$with_coin" != x"yes"; then - CBC_CXXFLAGS="-I$with_coin/include" - fi - - if test x"$with_coin_libdir" != x"no"; then - CBC_LDFLAGS="-L$with_coin_libdir" - elif test x"$with_coin" != x"yes"; then - CBC_LDFLAGS="-L$with_coin/lib" - fi - CBC_LIBS="-lOsi -lCbc -lCbcSolver -lClp -lOsiClp -lCoinUtils -lVol -lOsiVol -lCgl -lm -llapack -lblas" - - lx_save_cxxflags="$CXXFLAGS" - lx_save_ldflags="$LDFLAGS" - lx_save_libs="$LIBS" - CXXFLAGS="$CBC_CXXFLAGS" - LDFLAGS="$CBC_LDFLAGS" - LIBS="$CBC_LIBS" - - lx_cbc_test_prog=' - #include - - int main(int argc, char** argv) - { - CbcModel cbc; - return 0; - }' - - AC_LANG_PUSH(C++) - AC_LINK_IFELSE([$lx_cbc_test_prog], [lx_cbc_found=yes], [lx_cbc_found=no]) - AC_LANG_POP(C++) - - CXXFLAGS="$lx_save_cxxflags" - LDFLAGS="$lx_save_ldflags" - LIBS="$lx_save_libs" - - if test x"$lx_cbc_found" = x"yes"; then - AC_DEFINE([LEMON_HAVE_CBC], [1], [Define to 1 if you have CBC.]) - lx_lp_found=yes - AC_DEFINE([LEMON_HAVE_LP], [1], [Define to 1 if you have any LP solver.]) - lx_mip_found=yes - AC_DEFINE([LEMON_HAVE_MIP], [1], [Define to 1 if you have any MIP solver.]) - AC_MSG_RESULT([yes]) - else - CBC_CXXFLAGS="" - CBC_LDFLAGS="" - CBC_LIBS="" - AC_MSG_RESULT([no]) - fi - fi - fi - CBC_LIBS="$CBC_LDFLAGS $CBC_LIBS" - AC_SUBST(CBC_CXXFLAGS) - AC_SUBST(CBC_LIBS) - AM_CONDITIONAL([HAVE_CBC], [test x"$lx_cbc_found" = x"yes"]) -]) diff -r 48e17328c155 -r cdd2c7dad989 m4/lx_check_cplex.m4 --- a/m4/lx_check_cplex.m4 Sun Jan 29 22:33:14 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,81 +0,0 @@ -AC_DEFUN([LX_CHECK_CPLEX], -[ - AC_ARG_WITH([cplex], -AS_HELP_STRING([--with-cplex@<:@=PREFIX@:>@], [search for CPLEX under PREFIX or under the default search paths if PREFIX is not given @<:@default@:>@]) -AS_HELP_STRING([--without-cplex], [disable checking for CPLEX]), - [], [with_cplex=yes]) - - AC_ARG_WITH([cplex-includedir], -AS_HELP_STRING([--with-cplex-includedir=DIR], [search for CPLEX headers in DIR]), - [], [with_cplex_includedir=no]) - - AC_ARG_WITH([cplex-libdir], -AS_HELP_STRING([--with-cplex-libdir=DIR], [search for CPLEX libraries in DIR]), - [], [with_cplex_libdir=no]) - - lx_cplex_found=no - if test x"$with_cplex" != x"no"; then - AC_MSG_CHECKING([for CPLEX]) - - if test x"$with_cplex_includedir" != x"no"; then - CPLEX_CFLAGS="-I$with_cplex_includedir" - elif test x"$with_cplex" != x"yes"; then - CPLEX_CFLAGS="-I$with_cplex/include" - elif test x"$CPLEX_INCLUDEDIR" != x; then - CPLEX_CFLAGS="-I$CPLEX_INCLUDEDIR" - fi - - if test x"$with_cplex_libdir" != x"no"; then - CPLEX_LDFLAGS="-L$with_cplex_libdir" - elif test x"$with_cplex" != x"yes"; then - CPLEX_LDFLAGS="-L$with_cplex/lib" - elif test x"$CPLEX_LIBDIR" != x; then - CPLEX_LDFLAGS="-L$CPLEX_LIBDIR" - fi - CPLEX_LIBS="-lcplex -lm -lpthread" - - lx_save_cxxflags="$CXXFLAGS" - lx_save_ldflags="$LDFLAGS" - lx_save_libs="$LIBS" - CXXFLAGS="$CPLEX_CFLAGS" - LDFLAGS="$CPLEX_LDFLAGS" - LIBS="$CPLEX_LIBS" - - lx_cplex_test_prog=' - extern "C" { - #include - } - - int main(int argc, char** argv) - { - CPXENVptr env = NULL; - return 0; - }' - - AC_LANG_PUSH(C++) - AC_LINK_IFELSE([$lx_cplex_test_prog], [lx_cplex_found=yes], [lx_cplex_found=no]) - AC_LANG_POP(C++) - - CXXFLAGS="$lx_save_cxxflags" - LDFLAGS="$lx_save_ldflags" - LIBS="$lx_save_libs" - - if test x"$lx_cplex_found" = x"yes"; then - AC_DEFINE([LEMON_HAVE_CPLEX], [1], [Define to 1 if you have CPLEX.]) - lx_lp_found=yes - AC_DEFINE([LEMON_HAVE_LP], [1], [Define to 1 if you have any LP solver.]) - lx_mip_found=yes - AC_DEFINE([LEMON_HAVE_MIP], [1], [Define to 1 if you have any MIP solver.]) - AC_MSG_RESULT([yes]) - else - CPLEX_CFLAGS="" - CPLEX_LDFLAGS="" - CPLEX_LIBS="" - AC_MSG_RESULT([no]) - fi - fi - CPLEX_LIBS="$CPLEX_LDFLAGS $CPLEX_LIBS" - AC_SUBST(CPLEX_CFLAGS) - AC_SUBST(CPLEX_LIBS) - AM_CONDITIONAL([HAVE_CPLEX], [test x"$lx_cplex_found" = x"yes"]) -]) diff -r 48e17328c155 -r cdd2c7dad989 m4/lx_check_glpk.m4 --- a/m4/lx_check_glpk.m4 Sun Jan 29 22:33:14 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,84 +0,0 @@ -AC_DEFUN([LX_CHECK_GLPK], -[ - AC_ARG_WITH([glpk], -AS_HELP_STRING([--with-glpk@<:@=PREFIX@:>@], [search for GLPK under PREFIX or under the default search paths if PREFIX is not given @<:@default@:>@]) -AS_HELP_STRING([--without-glpk], [disable checking for GLPK]), - [], [with_glpk=yes]) - - AC_ARG_WITH([glpk-includedir], -AS_HELP_STRING([--with-glpk-includedir=DIR], [search for GLPK headers in DIR]), - [], [with_glpk_includedir=no]) - - AC_ARG_WITH([glpk-libdir], -AS_HELP_STRING([--with-glpk-libdir=DIR], [search for GLPK libraries in DIR]), - [], [with_glpk_libdir=no]) - - lx_glpk_found=no - if test x"$with_glpk" != x"no"; then - AC_MSG_CHECKING([for GLPK]) - - if test x"$with_glpk_includedir" != x"no"; then - GLPK_CFLAGS="-I$with_glpk_includedir" - elif test x"$with_glpk" != x"yes"; then - GLPK_CFLAGS="-I$with_glpk/include" - fi - - if test x"$with_glpk_libdir" != x"no"; then - GLPK_LDFLAGS="-L$with_glpk_libdir" - elif test x"$with_glpk" != x"yes"; then - GLPK_LDFLAGS="-L$with_glpk/lib" - fi - GLPK_LIBS="-lglpk" - - lx_save_cxxflags="$CXXFLAGS" - lx_save_ldflags="$LDFLAGS" - lx_save_libs="$LIBS" - CXXFLAGS="$GLPK_CFLAGS" - LDFLAGS="$GLPK_LDFLAGS" - LIBS="$GLPK_LIBS" - - lx_glpk_test_prog=' - extern "C" { - #include - } - - #if (GLP_MAJOR_VERSION < 4) \ - || (GLP_MAJOR_VERSION == 4 && GLP_MINOR_VERSION < 33) - #error Supported GLPK versions: 4.33 or above - #endif - - int main(int argc, char** argv) - { - LPX *lp; - lp = lpx_create_prob(); - lpx_delete_prob(lp); - return 0; - }' - - AC_LANG_PUSH(C++) - AC_LINK_IFELSE([$lx_glpk_test_prog], [lx_glpk_found=yes], [lx_glpk_found=no]) - AC_LANG_POP(C++) - - CXXFLAGS="$lx_save_cxxflags" - LDFLAGS="$lx_save_ldflags" - LIBS="$lx_save_libs" - - if test x"$lx_glpk_found" = x"yes"; then - AC_DEFINE([LEMON_HAVE_GLPK], [1], [Define to 1 if you have GLPK.]) - lx_lp_found=yes - AC_DEFINE([LEMON_HAVE_LP], [1], [Define to 1 if you have any LP solver.]) - lx_mip_found=yes - AC_DEFINE([LEMON_HAVE_MIP], [1], [Define to 1 if you have any MIP solver.]) - AC_MSG_RESULT([yes]) - else - GLPK_CFLAGS="" - GLPK_LDFLAGS="" - GLPK_LIBS="" - AC_MSG_RESULT([no]) - fi - fi - GLPK_LIBS="$GLPK_LDFLAGS $GLPK_LIBS" - AC_SUBST(GLPK_CFLAGS) - AC_SUBST(GLPK_LIBS) - AM_CONDITIONAL([HAVE_GLPK], [test x"$lx_glpk_found" = x"yes"]) -]) diff -r 48e17328c155 -r cdd2c7dad989 m4/lx_check_soplex.m4 --- a/m4/lx_check_soplex.m4 Sun Jan 29 22:33:14 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,73 +0,0 @@ -AC_DEFUN([LX_CHECK_SOPLEX], -[ - AC_ARG_WITH([soplex], -AS_HELP_STRING([--with-soplex@<:@=PREFIX@:>@], [search for SOPLEX under PREFIX or under the default search paths if PREFIX is not given @<:@default@:>@]) -AS_HELP_STRING([--without-soplex], [disable checking for SOPLEX]), - [], [with_soplex=yes]) - - AC_ARG_WITH([soplex-includedir], -AS_HELP_STRING([--with-soplex-includedir=DIR], [search for SOPLEX headers in DIR]), - [], [with_soplex_includedir=no]) - - AC_ARG_WITH([soplex-libdir], -AS_HELP_STRING([--with-soplex-libdir=DIR], [search for SOPLEX libraries in DIR]), - [], [with_soplex_libdir=no]) - - lx_soplex_found=no - if test x"$with_soplex" != x"no"; then - AC_MSG_CHECKING([for SOPLEX]) - - if test x"$with_soplex_includedir" != x"no"; then - SOPLEX_CXXFLAGS="-I$with_soplex_includedir" - elif test x"$with_soplex" != x"yes"; then - SOPLEX_CXXFLAGS="-I$with_soplex/src" - fi - - if test x"$with_soplex_libdir" != x"no"; then - SOPLEX_LDFLAGS="-L$with_soplex_libdir" - elif test x"$with_soplex" != x"yes"; then - SOPLEX_LDFLAGS="-L$with_soplex/lib" - fi - SOPLEX_LIBS="-lsoplex -lz" - - lx_save_cxxflags="$CXXFLAGS" - lx_save_ldflags="$LDFLAGS" - lx_save_libs="$LIBS" - CXXFLAGS="$SOPLEX_CXXFLAGS" - LDFLAGS="$SOPLEX_LDFLAGS" - LIBS="$SOPLEX_LIBS" - - lx_soplex_test_prog=' - #include - - int main(int argc, char** argv) - { - soplex::SoPlex soplex; - return 0; - }' - - AC_LANG_PUSH(C++) - AC_LINK_IFELSE([$lx_soplex_test_prog], [lx_soplex_found=yes], [lx_soplex_found=no]) - AC_LANG_POP(C++) - - CXXFLAGS="$lx_save_cxxflags" - LDFLAGS="$lx_save_ldflags" - LIBS="$lx_save_libs" - - if test x"$lx_soplex_found" = x"yes"; then - AC_DEFINE([LEMON_HAVE_SOPLEX], [1], [Define to 1 if you have SOPLEX.]) - lx_lp_found=yes - AC_DEFINE([LEMON_HAVE_LP], [1], [Define to 1 if you have any LP solver.]) - AC_MSG_RESULT([yes]) - else - SOPLEX_CXXFLAGS="" - SOPLEX_LDFLAGS="" - SOPLEX_LIBS="" - AC_MSG_RESULT([no]) - fi - fi - SOPLEX_LIBS="$SOPLEX_LDFLAGS $SOPLEX_LIBS" - AC_SUBST(SOPLEX_CXXFLAGS) - AC_SUBST(SOPLEX_LIBS) - AM_CONDITIONAL([HAVE_SOPLEX], [test x"$lx_soplex_found" = x"yes"]) -]) diff -r 48e17328c155 -r cdd2c7dad989 scripts/Makefile.am --- a/scripts/Makefile.am Sun Jan 29 22:33:14 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,7 +0,0 @@ -EXTRA_DIST += \ - scripts/bib2dox.py \ - scripts/bootstrap.sh \ - scripts/chg-len.py \ - scripts/mk-release.sh \ - scripts/unify-sources.sh \ - scripts/valgrind-wrapper.sh diff -r 48e17328c155 -r cdd2c7dad989 scripts/bootstrap.sh --- a/scripts/bootstrap.sh Sun Jan 29 22:33:14 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,157 +0,0 @@ -#!/bin/bash -# -# This file is a part of LEMON, a generic C++ optimization library. -# -# Copyright (C) 2003-2009 -# Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport -# (Egervary Research Group on Combinatorial Optimization, EGRES). -# -# Permission to use, modify and distribute this software is granted -# provided that this copyright notice appears in all copies. For -# precise terms see the accompanying LICENSE file. -# -# This software is provided "AS IS" with no warranty of any kind, -# express or implied, and with no claim as to its suitability for any -# purpose. - - -if [ ! -f ~/.lemon-bootstrap ]; then - echo 'Create ~/.lemon-bootstrap'. - cat >~/.lemon-bootstrap <>~/.lemon-bootstrap - echo $3 >>~/.lemon-bootstrap - echo $1=$2 >>~/.lemon-bootstrap - fi -} - -augment_config LEMON_INSTALL_PREFIX /usr/local \ - "# LEMON installation prefix" - -augment_config GLPK_PREFIX /usr/local/ \ - "# GLPK installation root prefix" - -augment_config COIN_OR_PREFIX /usr/local/coin-or \ - "# COIN-OR installation root prefix (used for CLP/CBC)" - -augment_config SOPLEX_PREFIX /usr/local/soplex \ - "# Soplex build prefix" - - -function ask() { -echo -n "$1 [$2]? " -read _an -if [ "x$_an" == "x" ]; then - ret="$2" -else - ret=$_an -fi -} - -function yesorno() { - ret='rossz' - while [ "$ret" != "y" -a "$ret" != "n" -a "$ret" != "yes" -a "$ret" != "no" ]; do - ask "$1" "$2" - done - if [ "$ret" != "y" -a "$ret" != "yes" ]; then - return 1 - else - return 0 - fi -} - -if yesorno "External build" "n" -then - CONFIGURE_PATH=".." -else - CONFIGURE_PATH="." - if yesorno "Autoreconf" "y" - then - AUTORE=yes - else - AUTORE=no - fi -fi - -if yesorno "Optimize" "n" -then - opt_flags=' -O2' -else - opt_flags='' -fi - -if yesorno "Stop on warning" "y" -then - werror_flags=' -Werror' -else - werror_flags='' -fi - -cxx_flags="CXXFLAGS=-ggdb$opt_flags$werror_flags" - -if yesorno "Check with valgrind" "n" -then - valgrind_flags=' --enable-valgrind' -else - valgrind_flags='' -fi - -if [ -f ${GLPK_PREFIX}/include/glpk.h ]; then - if yesorno "Use GLPK" "y" - then - glpk_flag="--with-glpk=$GLPK_PREFIX" - else - glpk_flag="--without-glpk" - fi -else - glpk_flag="--without-glpk" -fi - -if [ -f ${COIN_OR_PREFIX}/include/coin/config_coinutils.h ]; then - if yesorno "Use COIN-OR (CBC/CLP)" "n" - then - coin_flag="--with-coin=$COIN_OR_PREFIX" - else - coin_flag="--without-coin" - fi -else - coin_flag="--without-coin" -fi - -if [ -f ${SOPLEX_PREFIX}/src/soplex.h ]; then - if yesorno "Use Soplex" "n" - then - soplex_flag="--with-soplex=$SOPLEX_PREFIX" - else - soplex_flag="--without-soplex" - fi -else - soplex_flag="--without-soplex" -fi - -if [ "x$AUTORE" == "xyes" ]; then - autoreconf -vif; -fi -${CONFIGURE_PATH}/configure --prefix=$LEMON_INSTALL_PREFIX \ -$valgrind_flags \ -"$cxx_flags" \ -$glpk_flag \ -$coin_flag \ -$soplex_flag \ -$* diff -r 48e17328c155 -r cdd2c7dad989 scripts/mk-release.sh --- a/scripts/mk-release.sh Sun Jan 29 22:33:14 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,49 +0,0 @@ -#!/bin/bash -# -# This file is a part of LEMON, a generic C++ optimization library. -# -# Copyright (C) 2003-2009 -# Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport -# (Egervary Research Group on Combinatorial Optimization, EGRES). -# -# Permission to use, modify and distribute this software is granted -# provided that this copyright notice appears in all copies. For -# precise terms see the accompanying LICENSE file. -# -# This software is provided "AS IS" with no warranty of any kind, -# express or implied, and with no claim as to its suitability for any -# purpose. - -set -e - -if [ $# = 0 ]; then - echo "Usage: $0 release-id" - exit 1 -else - export LEMON_VERSION=$1 -fi - -echo '*****************************************************************' -echo ' Start making release tarballs for version '${LEMON_VERSION} -echo '*****************************************************************' - -autoreconf -vif -./configure - -make -make html -make distcheck -tar xf lemon-${LEMON_VERSION}.tar.gz -zip -r lemon-${LEMON_VERSION}.zip lemon-${LEMON_VERSION} -mv lemon-${LEMON_VERSION}/doc/html lemon-doc-${LEMON_VERSION} -tar czf lemon-doc-${LEMON_VERSION}.tar.gz lemon-doc-${LEMON_VERSION} -zip -r lemon-doc-${LEMON_VERSION}.zip lemon-doc-${LEMON_VERSION} -tar czf lemon-nodoc-${LEMON_VERSION}.tar.gz lemon-${LEMON_VERSION} -zip -r lemon-nodoc-${LEMON_VERSION}.zip lemon-${LEMON_VERSION} -hg tag -m 'LEMON '${LEMON_VERSION}' released ('$(hg par --template="{node|short}")' tagged as r'${LEMON_VERSION}')' r${LEMON_VERSION} - -rm -rf lemon-${LEMON_VERSION} lemon-doc-${LEMON_VERSION} - -echo '*****************************************************************' -echo ' Release '${LEMON_VERSION}' has been created' -echo '*****************************************************************' diff -r 48e17328c155 -r cdd2c7dad989 test/Makefile.am --- a/test/Makefile.am Sun Jan 29 22:33:14 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,107 +0,0 @@ -if USE_VALGRIND -TESTS_ENVIRONMENT=$(top_srcdir)/scripts/valgrind-wrapper.sh -endif - -EXTRA_DIST += \ - test/CMakeLists.txt - -noinst_HEADERS += \ - test/graph_test.h \ - test/test_tools.h - -check_PROGRAMS += \ - test/adaptors_test \ - test/bellman_ford_test \ - test/bfs_test \ - test/circulation_test \ - test/connectivity_test \ - test/counter_test \ - test/dfs_test \ - test/digraph_test \ - test/dijkstra_test \ - test/dim_test \ - test/edge_set_test \ - test/error_test \ - test/euler_test \ - test/fractional_matching_test \ - test/gomory_hu_test \ - test/graph_copy_test \ - test/graph_test \ - test/graph_utils_test \ - test/hao_orlin_test \ - test/heap_test \ - test/kruskal_test \ - test/lgf_test \ - test/maps_test \ - test/matching_test \ - test/max_cardinality_search_test \ - test/max_clique_test \ - test/min_cost_arborescence_test \ - test/min_cost_flow_test \ - test/min_mean_cycle_test \ - test/nagamochi_ibaraki_test \ - test/path_test \ - test/planarity_test \ - test/preflow_test \ - test/radix_sort_test \ - test/random_test \ - test/suurballe_test \ - test/test_tools_fail \ - test/test_tools_pass \ - test/time_measure_test \ - test/unionfind_test - -test_test_tools_pass_DEPENDENCIES = demo - -if HAVE_LP -check_PROGRAMS += test/lp_test -endif HAVE_LP -if HAVE_MIP -check_PROGRAMS += test/mip_test -endif HAVE_MIP - -TESTS += $(check_PROGRAMS) -XFAIL_TESTS += test/test_tools_fail$(EXEEXT) - -test_adaptors_test_SOURCES = test/adaptors_test.cc -test_bellman_ford_test_SOURCES = test/bellman_ford_test.cc -test_bfs_test_SOURCES = test/bfs_test.cc -test_circulation_test_SOURCES = test/circulation_test.cc -test_counter_test_SOURCES = test/counter_test.cc -test_connectivity_test_SOURCES = test/connectivity_test.cc -test_dfs_test_SOURCES = test/dfs_test.cc -test_digraph_test_SOURCES = test/digraph_test.cc -test_dijkstra_test_SOURCES = test/dijkstra_test.cc -test_dim_test_SOURCES = test/dim_test.cc -test_edge_set_test_SOURCES = test/edge_set_test.cc -test_error_test_SOURCES = test/error_test.cc -test_euler_test_SOURCES = test/euler_test.cc -test_fractional_matching_test_SOURCES = test/fractional_matching_test.cc -test_gomory_hu_test_SOURCES = test/gomory_hu_test.cc -test_graph_copy_test_SOURCES = test/graph_copy_test.cc -test_graph_test_SOURCES = test/graph_test.cc -test_graph_utils_test_SOURCES = test/graph_utils_test.cc -test_hao_orlin_test_SOURCES = test/hao_orlin_test.cc -test_heap_test_SOURCES = test/heap_test.cc -test_kruskal_test_SOURCES = test/kruskal_test.cc -test_lgf_test_SOURCES = test/lgf_test.cc -test_lp_test_SOURCES = test/lp_test.cc -test_maps_test_SOURCES = test/maps_test.cc -test_mip_test_SOURCES = test/mip_test.cc -test_matching_test_SOURCES = test/matching_test.cc -test_max_cardinality_search_test_SOURCES = test/max_cardinality_search_test.cc -test_max_clique_test_SOURCES = test/max_clique_test.cc -test_min_cost_arborescence_test_SOURCES = test/min_cost_arborescence_test.cc -test_min_cost_flow_test_SOURCES = test/min_cost_flow_test.cc -test_min_mean_cycle_test_SOURCES = test/min_mean_cycle_test.cc -test_nagamochi_ibaraki_test_SOURCES = test/nagamochi_ibaraki_test.cc -test_path_test_SOURCES = test/path_test.cc -test_planarity_test_SOURCES = test/planarity_test.cc -test_preflow_test_SOURCES = test/preflow_test.cc -test_radix_sort_test_SOURCES = test/radix_sort_test.cc -test_suurballe_test_SOURCES = test/suurballe_test.cc -test_random_test_SOURCES = test/random_test.cc -test_test_tools_fail_SOURCES = test/test_tools_fail.cc -test_test_tools_pass_SOURCES = test/test_tools_pass.cc -test_time_measure_test_SOURCES = test/time_measure_test.cc -test_unionfind_test_SOURCES = test/unionfind_test.cc diff -r 48e17328c155 -r cdd2c7dad989 tools/Makefile.am --- a/tools/Makefile.am Sun Jan 29 22:33:14 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,17 +0,0 @@ -EXTRA_DIST += \ - tools/CMakeLists.txt - -if WANT_TOOLS - -bin_PROGRAMS += \ - tools/dimacs-solver \ - tools/dimacs-to-lgf \ - tools/lgf-gen - -dist_bin_SCRIPTS += tools/lemon-0.x-to-1.x.sh - -endif WANT_TOOLS - -tools_dimacs_solver_SOURCES = tools/dimacs-solver.cc -tools_dimacs_to_lgf_SOURCES = tools/dimacs-to-lgf.cc -tools_lgf_gen_SOURCES = tools/lgf-gen.cc