Only lp_xyz's are linked against -lglpk
authoralpar
Fri, 08 Apr 2005 14:02:43 +0000
changeset 1324eca073533990
parent 1323 3aaadfb7de3d
child 1325 916ec8699dc3
Only lp_xyz's are linked against -lglpk
src/demo/Makefile.am
src/test/Makefile.am
     1.1 --- a/src/demo/Makefile.am	Fri Apr 08 06:46:12 2005 +0000
     1.2 +++ b/src/demo/Makefile.am	Fri Apr 08 14:02:43 2005 +0000
     1.3 @@ -1,5 +1,5 @@
     1.4  AM_CPPFLAGS = -I$(top_srcdir)/src
     1.5 -LDADD = $(top_builddir)/src/lemon/libemon.la -lglpk
     1.6 +LDADD = $(top_builddir)/src/lemon/libemon.la
     1.7  EXTRA_DIST = sub_graph_wrapper_demo.dim
     1.8  
     1.9  noinst_PROGRAMS = 	dim_to_dot 					\
    1.10 @@ -15,6 +15,7 @@
    1.11  
    1.12  graph_to_eps_demo_SOURCES = graph_to_eps_demo.cc
    1.13  
    1.14 +lp_demo_LDADD = $(top_builddir)/src/lemon/libemon.la -lglpk
    1.15  lp_demo_SOURCES = lp_demo.cc
    1.16  
    1.17  dim_to_lgf_SOURCES = dim_to_lgf.cc
    1.18 \ No newline at end of file
     2.1 --- a/src/test/Makefile.am	Fri Apr 08 06:46:12 2005 +0000
     2.2 +++ b/src/test/Makefile.am	Fri Apr 08 14:02:43 2005 +0000
     2.3 @@ -1,5 +1,5 @@
     2.4  AM_CPPFLAGS = -I$(top_srcdir)/src
     2.5 -LDADD = $(top_builddir)/src/lemon/libemon.la -lglpk
     2.6 +LDADD = $(top_builddir)/src/lemon/libemon.la
     2.7  
     2.8  EXTRA_DIST = preflow_graph.dim dijkstra_test.lgf
     2.9  noinst_HEADERS = \
    2.10 @@ -43,7 +43,6 @@
    2.11  graph_utils_test_SOURCES = graph_utils_test.cc
    2.12  graph_wrapper_test_SOURCES = graph_wrapper_test.cc
    2.13  kruskal_test_SOURCES = kruskal_test.cc
    2.14 -lp_test_SOURCES = lp_test.cc
    2.15  maps_test_SOURCES = maps_test.cc
    2.16  min_cost_flow_test_SOURCES = min_cost_flow_test.cc
    2.17  max_matching_test_SOURCES = max_matching_test.cc
    2.18 @@ -57,3 +56,7 @@
    2.19  xy_test_SOURCES = xy_test.cc
    2.20  undir_graph_test_SOURCES = undir_graph_test.cc
    2.21  heap_test_SOURCES = heap_test.cc
    2.22 +
    2.23 +lp_test_LDADD = $(top_builddir)/src/lemon/libemon.la -lglpk
    2.24 +lp_test_SOURCES = lp_test.cc
    2.25 +