1.1 --- a/src/test/Makefile.am	Wed Apr 13 06:49:42 2005 +0000
     1.2 +++ b/src/test/Makefile.am	Thu Apr 14 12:02:14 2005 +0000
     1.3 @@ -2,6 +2,7 @@
     1.4  LDADD = $(top_builddir)/src/lemon/libemon.la
     1.5  
     1.6  EXTRA_DIST = preflow_graph.dim dijkstra_test.lgf
     1.7 +
     1.8  noinst_HEADERS = \
     1.9  	test_tools.h \
    1.10  	graph_test.h \
    1.11 @@ -18,9 +19,8 @@
    1.12  	graph_wrapper_test \
    1.13  	graph_utils_test \
    1.14  	kruskal_test \
    1.15 -	lp_test \
    1.16 -        max_matching_test \
    1.17 -        maps_test \
    1.18 +	max_matching_test \
    1.19 +	maps_test \
    1.20  	min_cost_flow_test \
    1.21  	suurballe_test \
    1.22  	path_test \
    1.23 @@ -33,6 +33,10 @@
    1.24  	xy_test \
    1.25  	heap_test
    1.26  
    1.27 +if HAVE_GLPK
    1.28 +check_PROGRAMS += lp_test
    1.29 +endif
    1.30 +
    1.31  TESTS = $(check_PROGRAMS)
    1.32  XFAIL_TESTS = test_tools_fail$(EXEEXT)
    1.33  
    1.34 @@ -57,6 +61,6 @@
    1.35  undir_graph_test_SOURCES = undir_graph_test.cc
    1.36  heap_test_SOURCES = heap_test.cc
    1.37  
    1.38 -lp_test_LDADD = $(top_builddir)/src/lemon/libemon.la -lglpk
    1.39  lp_test_SOURCES = lp_test.cc
    1.40 -
    1.41 +lp_test_CXXFLAGS = $(GLPK_CFLAGS)
    1.42 +lp_test_LDFLAGS = $(GLPK_LIBS)