Changeset 1349:83388a4aa3af in lemon-0.x
- Timestamp:
- 04/14/05 14:02:14 (20 years ago)
- Branch:
- default
- Phase:
- public
- Convert:
- svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@1793
- Files:
-
- 1 added
- 4 edited
-
config/lp.m4 (added)
-
configure.ac (modified) (3 diffs)
-
src/demo/Makefile.am (modified) (1 diff)
-
src/lemon/Makefile.am (modified) (1 diff)
-
src/test/Makefile.am (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
-
configure.ac
r1348 r1349 5 5 AC_CONFIG_SRCDIR([src/lemon/invalid.h]) 6 6 AM_CONFIG_HEADER([config.h]) 7 AC_PREREQ( 2.57)7 AC_PREREQ([2.53]) 8 8 9 9 dnl Checks for programs. … … 13 13 AC_PROG_LIBTOOL 14 14 15 dnl I know this is not perfect. A better solution will come soon.16 15 if test $CXX != icc -a $CXX != icpc; then 17 CXXFLAGS="$CXXFLAGS -Wall "16 CXXFLAGS="$CXXFLAGS -Wall -W" 18 17 fi 19 18 20 19 dnl Checks for libraries. 20 LX_CHECK_GLPK 21 21 22 22 dnl Checks for header files. … … 46 46 src/test/Makefile 47 47 ]) 48 48 49 AC_OUTPUT -
src/demo/Makefile.am
r1342 r1349 1 1 AM_CPPFLAGS = -I$(top_srcdir)/src 2 2 LDADD = $(top_builddir)/src/lemon/libemon.la 3 3 4 EXTRA_DIST = sub_graph_wrapper_demo.dim 4 5 5 noinst_PROGRAMS = dim_to_dot \ 6 sub_graph_wrapper_demo \ 7 graph_to_eps_demo \ 8 lp_demo \ 9 dim_to_lgf \ 10 min_route 6 noinst_PROGRAMS = \ 7 dim_to_dot \ 8 dim_to_lgf \ 9 graph_to_eps_demo \ 10 min_route \ 11 sub_graph_wrapper_demo 12 13 if HAVE_GLPK 14 noinst_PROGRAMS += lp_demo 15 endif 11 16 12 17 dim_to_dot_SOURCES = dim_to_dot.cc 13 min_route_SOURCES = min_route.cc14 18 15 sub_graph_wrapper_demo_SOURCES = sub_graph_wrapper_demo.cc \ 16 tight_edge_filter_map.h 19 dim_to_lgf_SOURCES = dim_to_lgf.cc 17 20 18 21 graph_to_eps_demo_SOURCES = graph_to_eps_demo.cc 19 22 20 lp_demo_LDADD = $(top_builddir)/src/lemon/libemon.la -lglpk 23 min_route_SOURCES = min_route.cc 24 25 sub_graph_wrapper_demo_SOURCES = \ 26 sub_graph_wrapper_demo.cc \ 27 tight_edge_filter_map.h 28 21 29 lp_demo_SOURCES = lp_demo.cc 22 23 dim_to_lgf_SOURCES = dim_to_lgf.cc 30 lp_demo_CXXFLAGS = $(GLPK_CFLAGS) 31 lp_demo_LDFLAGS = $(GLPK_LIBS) -
src/lemon/Makefile.am
r1340 r1349 5 5 6 6 lib_LTLIBRARIES = libemon.la 7 libemon_la_SOURCES = \ 8 lp_base.cc\9 lp_ glpk.cc\7 8 libemon_la_SOURCES = \ 9 lp_base.cc \ 10 10 lp_skeleton.cc 11 11 12 pkginclude_HEADERS = \ 13 bezier.h \ 14 bfs.h \ 15 dfs.h \ 16 bin_heap.h \ 17 dijkstra.h \ 18 dimacs.h \ 19 error.h \ 20 fib_heap.h \ 21 full_graph.h \ 22 graph_wrapper.h \ 23 graph_utils.h \ 24 graph_to_eps.h \ 25 invalid.h \ 26 kruskal.h \ 27 list_graph.h \ 28 maps.h \ 29 max_matching.h \ 30 min_cost_flow.h \ 31 suurballe.h \ 32 preflow.h \ 33 path.h \ 34 radix_heap.h \ 35 smart_graph.h \ 36 time_measure.h \ 37 unionfind.h \ 38 xy.h \ 39 concept_check.h \ 40 utility.h \ 41 graph_reader.h \ 42 graph_writer.h \ 43 map_utils.h \ 44 bits/alteration_notifier.h \ 45 bits/map_iterator.h \ 46 bits/array_map.h \ 47 bits/default_map.h \ 48 bits/extended_pair.h \ 49 bits/vector_map.h \ 50 bits/iterable_graph_extender.h \ 51 bits/extendable_graph_extender.h \ 52 bits/clearable_graph_extender.h \ 53 bits/erasable_graph_extender.h \ 54 bits/undir_graph_extender.h 12 if HAVE_GLPK 13 libemon_la_SOURCES += lp_glpk.cc 14 libemon_la_CXXFLAGS = $(GLPK_CFLAGS) 15 libemon_la_LDFLAGS = $(GLPK_LIBS) 16 endif 55 17 56 noinst_HEADERS = \ 57 lp_base.h \ 58 lp_glpk.h \ 59 lp_skeleton.h \ 60 concept/graph.h \ 61 concept/graph_component.h \ 62 concept/undir_graph.h \ 63 concept/sym_graph.h \ 64 concept/maps.h \ 65 concept/heap.h \ 18 pkginclude_HEADERS = \ 19 bezier.h \ 20 bfs.h \ 21 dfs.h \ 22 bin_heap.h \ 23 dijkstra.h \ 24 dimacs.h \ 25 error.h \ 26 fib_heap.h \ 27 full_graph.h \ 28 graph_wrapper.h \ 29 graph_utils.h \ 30 graph_to_eps.h \ 31 invalid.h \ 32 kruskal.h \ 33 list_graph.h \ 34 maps.h \ 35 max_matching.h \ 36 min_cost_flow.h \ 37 suurballe.h \ 38 preflow.h \ 39 path.h \ 40 radix_heap.h \ 41 smart_graph.h \ 42 time_measure.h \ 43 unionfind.h \ 44 xy.h \ 45 concept_check.h \ 46 utility.h \ 47 graph_reader.h \ 48 graph_writer.h \ 49 map_utils.h \ 50 bits/alteration_notifier.h \ 51 bits/map_iterator.h \ 52 bits/array_map.h \ 53 bits/default_map.h \ 54 bits/extended_pair.h \ 55 bits/vector_map.h \ 56 bits/iterable_graph_extender.h \ 57 bits/extendable_graph_extender.h \ 58 bits/clearable_graph_extender.h \ 59 bits/erasable_graph_extender.h \ 60 bits/undir_graph_extender.h 61 62 noinst_HEADERS = \ 63 lp_base.h \ 64 lp_glpk.h \ 65 lp_skeleton.h \ 66 concept/graph.h \ 67 concept/graph_component.h \ 68 concept/undir_graph.h \ 69 concept/sym_graph.h \ 70 concept/maps.h \ 71 concept/heap.h \ 66 72 concept/path.h -
src/test/Makefile.am
r1324 r1349 3 3 4 4 EXTRA_DIST = preflow_graph.dim dijkstra_test.lgf 5 5 6 noinst_HEADERS = \ 6 7 test_tools.h \ … … 19 20 graph_utils_test \ 20 21 kruskal_test \ 21 lp_test \ 22 max_matching_test \ 23 maps_test \ 22 max_matching_test \ 23 maps_test \ 24 24 min_cost_flow_test \ 25 25 suurballe_test \ … … 33 33 xy_test \ 34 34 heap_test 35 36 if HAVE_GLPK 37 check_PROGRAMS += lp_test 38 endif 35 39 36 40 TESTS = $(check_PROGRAMS) … … 58 62 heap_test_SOURCES = heap_test.cc 59 63 60 lp_test_LDADD = $(top_builddir)/src/lemon/libemon.la -lglpk61 64 lp_test_SOURCES = lp_test.cc 62 65 lp_test_CXXFLAGS = $(GLPK_CFLAGS) 66 lp_test_LDFLAGS = $(GLPK_LIBS)
Note: See TracChangeset
for help on using the changeset viewer.
