[Lemon-commits] Alpar Juttner: Remove autotool related files (#434)
Lemon HG
hg at lemon.cs.elte.hu
Wed Feb 1 09:54:35 CET 2012
details: http://lemon.cs.elte.hu/hg/lemon/rev/cdd2c7dad989
changeset: 1133:cdd2c7dad989
user: Alpar Juttner <alpar [at] cs.elte.hu>
date: Mon Jan 30 10:54:49 2012 +0100
description:
Remove autotool related files (#434)
diffstat:
Makefile.am | 80 -------------------------
configure.ac | 157 --------------------------------------------------
demo/Makefile.am | 17 -----
doc/Makefile.am | 125 ---------------------------------------
lemon/CMakeLists.txt | 4 +-
lemon/Makefile.am | 155 -------------------------------------------------
lemon/config.h.cmake | 10 ---
lemon/config.h.in | 42 +++----------
lemon/lemon.pc.cmake | 10 ---
lemon/lemon.pc.in | 12 +-
m4/lx_check_coin.m4 | 136 -------------------------------------------
m4/lx_check_cplex.m4 | 81 -------------------------
m4/lx_check_glpk.m4 | 84 --------------------------
m4/lx_check_soplex.m4 | 73 -----------------------
scripts/Makefile.am | 7 --
scripts/bootstrap.sh | 157 --------------------------------------------------
scripts/mk-release.sh | 49 ---------------
test/Makefile.am | 107 ----------------------------------
tools/Makefile.am | 17 -----
19 files changed, 18 insertions(+), 1305 deletions(-)
diffs (truncated from 1429 to 300 lines):
diff --git a/Makefile.am b/Makefile.am
deleted file mode 100644
--- a/Makefile.am
+++ /dev/null
@@ -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 --git a/configure.ac b/configure.ac
deleted file mode 100644
--- a/configure.ac
+++ /dev/null
@@ -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 at 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 --git a/demo/Makefile.am b/demo/Makefile.am
deleted file mode 100644
--- a/demo/Makefile.am
+++ /dev/null
@@ -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 --git a/doc/Makefile.am b/doc/Makefile.am
deleted file mode 100644
--- a/doc/Makefile.am
+++ /dev/null
@@ -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
-
More information about the Lemon-commits
mailing list