Changeset 1501 for trunk/Cbc/test/Makefile.am

Timestamp:

Sep 13, 2010 3:41:21 AM (9 years ago)

Author:

stefan

Message:

change from COIN_HAS_MODULE to COIN_HAS_PACKAGE

File:

• trunk/Cbc/test/Makefile.am (modified) (4 diffs)

trunk/Cbc/test/Makefile.am

@@ -60 +60 @@
 
 gamsTest_SOURCES = gamsTest.cpp
-gamsTest_LDADD = ../src/libCbcSolver.la ../src/libCbc.la $(COINDEPEND_LIBS) $(ADDLIBS)
+gamsTest_LDADD = ../src/libCbcSolver.la ../src/libCbc.la $(CBCLIB_LIBS)
 gamsTest_LDFLAGS = -rpath $(libdir)
 
@@ -67 +67 @@
 if COIN_HAS_CLP
   AM_CPPFLAGS += $(CLP_CFLAGS)
-  gamsTest_LDADD += $(CLP_LIBS)
+#  gamsTest_LDADD += $(CLP_LIBS)
 endif
 
 if COIN_HAS_CPX
   AM_CPPFLAGS += $(CPX_CFLAGS)
-  gamsTest_LDADD += $(CPX_LIBS)
+#  gamsTest_LDADD += $(CPX_LIBS)
 endif
 
 if COIN_HAS_DYLP
   AM_CPPFLAGS += $(DYLP_CFLAGS)
-  gamsTest_LDADD += $(DYLP_LIBS)
+#  gamsTest_LDADD += $(DYLP_LIBS)
 endif
 
 if COIN_HAS_GLPK
   AM_CPPFLAGS += $(GLPK_CFLAGS)
-  gamsTest_LDADD += $(GLPK_LIBS)
+#  gamsTest_LDADD += $(GLPK_LIBS)
 endif
 
 if COIN_HAS_MSK
   AM_CPPFLAGS += $(MSK_CFLAGS)
-  gamsTest_LDADD += $(MSK_LIBS)
+#  gamsTest_LDADD += $(MSK_LIBS)
 endif
 
@@ -97 +97 @@
 if COIN_HAS_VOL
   AM_CPPFLAGS += $(VOL_CFLAGS)
-  gamsTest_LDADD += $(VOL_LIBS)
+#  gamsTest_LDADD += $(VOL_LIBS)
 endif
 
 if COIN_HAS_XPR
   AM_CPPFLAGS += $(XPR_CFLAGS)
-  gamsTest_LDADD += $(XPR_LIBS)
-endif
-
-if COIN_HAS_ASL
-  AM_CPPFLAGS += $(ASL_CFLAGS)
-  gamsTest_LDADD += $(ASL_LIBS)
+#  gamsTest_LDADD += $(XPR_LIBS)
 endif
 
@@ -117 +112 @@
 
 osiUnitTest_LDADD = ../src/OsiCbc/libOsiCbc.la ../src/libCbc.la \
-    $(COINDEPEND_LIBS) $(OSITESTS_LIBS) $(ADDLIBS)
+    $(CBCLIB_LIBS) $(OSITESTS_LIBS)
 
 AM_CPPFLAGS += $(OSITESTS_CFLAGS) \