diff -r 115e42a5b0f7 -r 83388a4aa3af src/lemon/Makefile.am --- a/src/lemon/Makefile.am Wed Apr 13 06:49:42 2005 +0000 +++ b/src/lemon/Makefile.am Thu Apr 14 12:02:14 2005 +0000 @@ -4,63 +4,69 @@ pkgconfig_DATA = lemon.pc lib_LTLIBRARIES = libemon.la -libemon_la_SOURCES = \ - lp_base.cc \ - lp_glpk.cc \ + +libemon_la_SOURCES = \ + lp_base.cc \ lp_skeleton.cc -pkginclude_HEADERS = \ - bezier.h \ - bfs.h \ - dfs.h \ - bin_heap.h \ - dijkstra.h \ - dimacs.h \ - error.h \ - fib_heap.h \ - full_graph.h \ - graph_wrapper.h \ - graph_utils.h \ - graph_to_eps.h \ - invalid.h \ - kruskal.h \ - list_graph.h \ - maps.h \ - max_matching.h \ - min_cost_flow.h \ - suurballe.h \ - preflow.h \ - path.h \ - radix_heap.h \ - smart_graph.h \ - time_measure.h \ - unionfind.h \ - xy.h \ - concept_check.h \ - utility.h \ - graph_reader.h \ - graph_writer.h \ - map_utils.h \ - bits/alteration_notifier.h \ - bits/map_iterator.h \ - bits/array_map.h \ - bits/default_map.h \ - bits/extended_pair.h \ - bits/vector_map.h \ - bits/iterable_graph_extender.h \ - bits/extendable_graph_extender.h \ - bits/clearable_graph_extender.h \ - bits/erasable_graph_extender.h \ - bits/undir_graph_extender.h +if HAVE_GLPK +libemon_la_SOURCES += lp_glpk.cc +libemon_la_CXXFLAGS = $(GLPK_CFLAGS) +libemon_la_LDFLAGS = $(GLPK_LIBS) +endif -noinst_HEADERS = \ - lp_base.h \ - lp_glpk.h \ - lp_skeleton.h \ - concept/graph.h \ - concept/graph_component.h \ - concept/undir_graph.h \ - concept/sym_graph.h \ - concept/maps.h \ - concept/heap.h \ +pkginclude_HEADERS = \ + bezier.h \ + bfs.h \ + dfs.h \ + bin_heap.h \ + dijkstra.h \ + dimacs.h \ + error.h \ + fib_heap.h \ + full_graph.h \ + graph_wrapper.h \ + graph_utils.h \ + graph_to_eps.h \ + invalid.h \ + kruskal.h \ + list_graph.h \ + maps.h \ + max_matching.h \ + min_cost_flow.h \ + suurballe.h \ + preflow.h \ + path.h \ + radix_heap.h \ + smart_graph.h \ + time_measure.h \ + unionfind.h \ + xy.h \ + concept_check.h \ + utility.h \ + graph_reader.h \ + graph_writer.h \ + map_utils.h \ + bits/alteration_notifier.h \ + bits/map_iterator.h \ + bits/array_map.h \ + bits/default_map.h \ + bits/extended_pair.h \ + bits/vector_map.h \ + bits/iterable_graph_extender.h \ + bits/extendable_graph_extender.h \ + bits/clearable_graph_extender.h \ + bits/erasable_graph_extender.h \ + bits/undir_graph_extender.h + +noinst_HEADERS = \ + lp_base.h \ + lp_glpk.h \ + lp_skeleton.h \ + concept/graph.h \ + concept/graph_component.h \ + concept/undir_graph.h \ + concept/sym_graph.h \ + concept/maps.h \ + concept/heap.h \ concept/path.h