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

Timestamp:

Dec 4, 2010 11:07:00 AM (9 years ago)

Author:

stefan

Message:

list .la files in xxx-uninstalled.pc files; setup binary dependencies with _DEPENDENCIES variable; rerun autotools

File:

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

trunk/Cbc/test/Makefile.am

@@ -61 +61 @@
 gamsTest_SOURCES = gamsTest.cpp
 gamsTest_LDADD = ../src/libCbcSolver.la ../src/libCbc.la $(CBCLIB_LIBS)
+gamsTest_DEPENDENCIES = ../src/libCbcSolver.la ../src/libCbc.la $(CBCLIB_DEPENDENCIES)
 gamsTest_LDFLAGS = -rpath $(libdir)
 
 AM_CPPFLAGS = -I`$(CYGPATH_W) $(srcdir)/../src` $(COINDEPEND_CFLAGS)
-
-if COIN_HAS_CLP
-  AM_CPPFLAGS += $(CLP_CFLAGS)
-#  gamsTest_LDADD += $(CLP_LIBS)
-endif
-
-if COIN_HAS_CPX
-  AM_CPPFLAGS += $(CPX_CFLAGS)
-#  gamsTest_LDADD += $(CPX_LIBS)
-endif
-
-if COIN_HAS_DYLP
-  AM_CPPFLAGS += $(DYLP_CFLAGS)
-#  gamsTest_LDADD += $(DYLP_LIBS)
-endif
-
-if COIN_HAS_GLPK
-  AM_CPPFLAGS += $(GLPK_CFLAGS)
-#  gamsTest_LDADD += $(GLPK_LIBS)
-endif
-
-if COIN_HAS_MSK
-  AM_CPPFLAGS += $(MSK_CFLAGS)
-#  gamsTest_LDADD += $(MSK_LIBS)
-endif
-
-# if COIN_HAS_SPX
-#   AM_CPPFLAGS += $(SPX_CFLAGS)
-#   gamsTest_LDADD += $(SPX_LIBS)
-# endif
-
-if COIN_HAS_VOL
-  AM_CPPFLAGS += $(VOL_CFLAGS)
-#  gamsTest_LDADD += $(VOL_LIBS)
-endif
-
-if COIN_HAS_XPR
-  AM_CPPFLAGS += $(XPR_CFLAGS)
-#  gamsTest_LDADD += $(XPR_LIBS)
-endif
+AM_CPPFLAGS += $(CLP_CFLAGS) $(CPX_CFLAGS) $(DYLP_CFLAGS) $(GLPK_CFLAGS) $(MSK_CFLAGS) $(VOL_CFLAGS) $(XPR_CFLAGS)
 
 ########################################################################
@@ -113 +75 @@
 osiUnitTest_LDADD = ../src/OsiCbc/libOsiCbc.la ../src/libCbc.la \
     $(CBCLIB_LIBS) $(OSITESTS_LIBS)
+
+osiUnitTest_DEPENDENCIES = ../src/OsiCbc/libOsiCbc.la ../src/libCbc.la \
+    $(CBCLIB_DEPENDENCIES) $(OSITESTS_DEPENDENCIES)
 
 AM_CPPFLAGS += $(OSITESTS_CFLAGS) \