Changeset 1387:37d1b20cd9ef in lemon-0.x for src/test/Makefile.am

Timestamp:

04/25/05 10:19:38 (19 years ago)

Author:

Akos Ladanyi

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@1840

Message:

• include config.h instead of manually adding -DHAVE_{CPLEX,GLPK} to CXXFLAGS
• removed the checking of LpSkeleton? from lp_test.cc, because it is an abstract base class now
• removed unnecessary LDFLAGS when linking with libemon.la

File:

• src/test/Makefile.am (modified) (2 diffs)

src/test/Makefile.am

@@ -36 +36 @@
 if HAVE_GLPK
 check_PROGRAMS += lp_test
-endif
+else !HAVE_GLPK
+if HAVE_CPLEX
+check_PROGRAMS += lp_test
+endif HAVE_CPLEX
+endif !HAVE_GLPK
 
 TESTS = $(check_PROGRAMS)
@@ -63 +67 @@
 
 lp_test_SOURCES = lp_test.cc
-lp_test_CXXFLAGS = $(GLPK_CFLAGS)
-lp_test_LDFLAGS = $(GLPK_LIBS)
+lp_test_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS)