# HG changeset patch # User alpar # Date 1112968963 0 # Node ID eca0735339907e37317a770af08fc2d20a8dcf63 # Parent 3aaadfb7de3d58ec8b9f19c4288e5e2656a38461 Only lp_xyz's are linked against -lglpk diff -r 3aaadfb7de3d -r eca073533990 src/demo/Makefile.am --- a/src/demo/Makefile.am Fri Apr 08 06:46:12 2005 +0000 +++ b/src/demo/Makefile.am Fri Apr 08 14:02:43 2005 +0000 @@ -1,5 +1,5 @@ AM_CPPFLAGS = -I$(top_srcdir)/src -LDADD = $(top_builddir)/src/lemon/libemon.la -lglpk +LDADD = $(top_builddir)/src/lemon/libemon.la EXTRA_DIST = sub_graph_wrapper_demo.dim noinst_PROGRAMS = dim_to_dot \ @@ -15,6 +15,7 @@ graph_to_eps_demo_SOURCES = graph_to_eps_demo.cc +lp_demo_LDADD = $(top_builddir)/src/lemon/libemon.la -lglpk lp_demo_SOURCES = lp_demo.cc dim_to_lgf_SOURCES = dim_to_lgf.cc \ No newline at end of file diff -r 3aaadfb7de3d -r eca073533990 src/test/Makefile.am --- a/src/test/Makefile.am Fri Apr 08 06:46:12 2005 +0000 +++ b/src/test/Makefile.am Fri Apr 08 14:02:43 2005 +0000 @@ -1,5 +1,5 @@ AM_CPPFLAGS = -I$(top_srcdir)/src -LDADD = $(top_builddir)/src/lemon/libemon.la -lglpk +LDADD = $(top_builddir)/src/lemon/libemon.la EXTRA_DIST = preflow_graph.dim dijkstra_test.lgf noinst_HEADERS = \ @@ -43,7 +43,6 @@ graph_utils_test_SOURCES = graph_utils_test.cc graph_wrapper_test_SOURCES = graph_wrapper_test.cc kruskal_test_SOURCES = kruskal_test.cc -lp_test_SOURCES = lp_test.cc maps_test_SOURCES = maps_test.cc min_cost_flow_test_SOURCES = min_cost_flow_test.cc max_matching_test_SOURCES = max_matching_test.cc @@ -57,3 +56,7 @@ xy_test_SOURCES = xy_test.cc undir_graph_test_SOURCES = undir_graph_test.cc heap_test_SOURCES = heap_test.cc + +lp_test_LDADD = $(top_builddir)/src/lemon/libemon.la -lglpk +lp_test_SOURCES = lp_test.cc +