Changeset 1992
- Timestamp:
- Dec 15, 2013 6:57:12 PM (7 years ago)
- Location:
- stable/2.8/Cbc
- Files:
-
- 7 edited
- 1 copied
Legend:
- Unmodified
- Added
- Removed
-
stable/2.8/Cbc
- Property svn:mergeinfo changed
/trunk/Cbc merged: 1979,1984,1989-1990
- Property svn:mergeinfo changed
-
stable/2.8/Cbc/Makefile.am
r1739 r1992 14 14 15 15 SUBDIRS = src 16 17 # Don't do src/OsiCbc recursively, since src/OsiCbc/libOsiCbc depends on src/libCbc 18 SUBDIRS += src/OsiCbc 16 19 17 20 # We don't want to compile the test subdirectory, unless the test target is … … 140 143 echo "-libpath:`$(CYGPATH_W) @abs_lib_dir@` libCbc.lib @CBCLIB_LIBS_INSTALLED@" > $(addlibsdir)/cbc_addlibs.txt 141 144 else 142 echo -L@abs_lib_dir@ -lCbc @CBCLIB_LIBS_INSTALLED@ > $(addlibsdir)/cbc_addlibs.txt145 echo -L@abs_lib_dir@ -lCbcSolver -lCbc @CBCLIB_LIBS_INSTALLED@ > $(addlibsdir)/cbc_addlibs.txt 143 146 endif 144 147 endif -
stable/2.8/Cbc/Makefile.in
r1975 r1992 100 100 ETAGS = etags 101 101 CTAGS = ctags 102 DIST_SUBDIRS = src test102 DIST_SUBDIRS = src src/OsiCbc test 103 103 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) 104 104 distdir = $(PACKAGE)-$(VERSION) … … 439 439 # Subdirectories # 440 440 ######################################################################## 441 SUBDIRS = src $(am__append_1) 441 442 # Don't do src/OsiCbc recursively, since src/OsiCbc/libOsiCbc depends on src/libCbc 443 SUBDIRS = src src/OsiCbc $(am__append_1) 442 444 443 445 ######################################################################## -
stable/2.8/Cbc/src/Makefile.am
r1936 r1992 8 8 9 9 AUTOMAKE_OPTIONS = foreign 10 11 SUBDIRS = OsiCbc12 10 13 11 ######################################################################## … … 103 101 CbcMipStartIO.cpp CbcMipStartIO.hpp \ 104 102 CbcSolverExpandKnapsack.cpp CbcSolverExpandKnapsack.hpp 103 104 # List all additionally required libraries 105 if DEPENDENCY_LINKING 106 libCbc_la_LIBADD = $(CBCLIB_LIBS) 107 libCbcSolver_la_LIBADD = $(CBCLIB_LIBS) libCbc.la 108 endif 105 109 106 110 # This is for libtool -
stable/2.8/Cbc/src/Makefile.in
r1975 r1992 89 89 libLTLIBRARIES_INSTALL = $(INSTALL) 90 90 LTLIBRARIES = $(lib_LTLIBRARIES) 91 libCbc_la_LIBADD = 91 am__DEPENDENCIES_1 = 92 @DEPENDENCY_LINKING_TRUE@libCbc_la_DEPENDENCIES = \ 93 @DEPENDENCY_LINKING_TRUE@ $(am__DEPENDENCIES_1) 92 94 am_libCbc_la_OBJECTS = Cbc_C_Interface.lo CbcBranchAllDifferent.lo \ 93 95 CbcBranchCut.lo CbcBranchDecision.lo \ … … 116 118 CbcTreeLocal.lo 117 119 libCbc_la_OBJECTS = $(am_libCbc_la_OBJECTS) 118 libCbcSolver_la_LIBADD = 120 @DEPENDENCY_LINKING_TRUE@libCbcSolver_la_DEPENDENCIES = \ 121 @DEPENDENCY_LINKING_TRUE@ $(am__DEPENDENCIES_1) libCbc.la 119 122 am_libCbcSolver_la_OBJECTS = CbcCbcParam.lo Cbc_ampl.lo CbcLinked.lo \ 120 123 CbcLinkedUtils.lo unitTestClp.lo CbcSolver.lo \ … … 129 132 @COIN_HAS_CLP_TRUE@am_cbc_OBJECTS = CoinSolve.$(OBJEXT) 130 133 cbc_OBJECTS = $(am_cbc_OBJECTS) 131 am__DEPENDENCIES_1 =132 134 am__cbc_generic_SOURCES_DIST = CbcGenBaB.cpp CbcGenCbcParam.cpp \ 133 135 CbcGenCbcParam.hpp CbcGenCbcParamUtils.cpp CbcGenCtlBlk.cpp \ … … 172 174 DIST_SOURCES = $(libCbc_la_SOURCES) $(libCbcSolver_la_SOURCES) \ 173 175 $(am__cbc_SOURCES_DIST) $(am__cbc_generic_SOURCES_DIST) 174 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \175 html-recursive info-recursive install-data-recursive \176 install-exec-recursive install-info-recursive \177 install-recursive installcheck-recursive installdirs-recursive \178 pdf-recursive ps-recursive uninstall-info-recursive \179 uninstall-recursive180 176 includecoinHEADERS_INSTALL = $(INSTALL_HEADER) 181 177 HEADERS = $(includecoin_HEADERS) 182 178 ETAGS = etags 183 179 CTAGS = ctags 184 DIST_SUBDIRS = $(SUBDIRS)185 180 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) 186 181 ABSBUILDDIR = @ABSBUILDDIR@ … … 507 502 target_alias = @target_alias@ 508 503 AUTOMAKE_OPTIONS = foreign 509 SUBDIRS = OsiCbc510 504 511 505 ######################################################################## … … 602 596 CbcSolverExpandKnapsack.cpp CbcSolverExpandKnapsack.hpp 603 597 598 599 # List all additionally required libraries 600 @DEPENDENCY_LINKING_TRUE@libCbc_la_LIBADD = $(CBCLIB_LIBS) 601 @DEPENDENCY_LINKING_TRUE@libCbcSolver_la_LIBADD = $(CBCLIB_LIBS) libCbc.la 604 602 605 603 # This is for libtool … … 723 721 724 722 all: config.h config_cbc.h 725 $(MAKE) $(AM_MAKEFLAGS) all- recursive723 $(MAKE) $(AM_MAKEFLAGS) all-am 726 724 727 725 .SUFFIXES: … … 990 988 done 991 989 992 # This directory's subdirectories are mostly independent; you can cd993 # into them and run `make' without going through this Makefile.994 # To change the values of `make' variables: instead of editing Makefiles,995 # (1) if the variable is set in `config.status', edit `config.status'996 # (which will cause the Makefiles to be regenerated when you run `make');997 # (2) otherwise, pass the desired values on the `make' command line.998 $(RECURSIVE_TARGETS):999 @failcom='exit 1'; \1000 for f in x $$MAKEFLAGS; do \1001 case $$f in \1002 *=* | --[!k]*);; \1003 *k*) failcom='fail=yes';; \1004 esac; \1005 done; \1006 dot_seen=no; \1007 target=`echo $@ | sed s/-recursive//`; \1008 list='$(SUBDIRS)'; for subdir in $$list; do \1009 echo "Making $$target in $$subdir"; \1010 if test "$$subdir" = "."; then \1011 dot_seen=yes; \1012 local_target="$$target-am"; \1013 else \1014 local_target="$$target"; \1015 fi; \1016 (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \1017 || eval $$failcom; \1018 done; \1019 if test "$$dot_seen" = "no"; then \1020 $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \1021 fi; test -z "$$fail"1022 1023 mostlyclean-recursive clean-recursive distclean-recursive \1024 maintainer-clean-recursive:1025 @failcom='exit 1'; \1026 for f in x $$MAKEFLAGS; do \1027 case $$f in \1028 *=* | --[!k]*);; \1029 *k*) failcom='fail=yes';; \1030 esac; \1031 done; \1032 dot_seen=no; \1033 case "$@" in \1034 distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \1035 *) list='$(SUBDIRS)' ;; \1036 esac; \1037 rev=''; for subdir in $$list; do \1038 if test "$$subdir" = "."; then :; else \1039 rev="$$subdir $$rev"; \1040 fi; \1041 done; \1042 rev="$$rev ."; \1043 target=`echo $@ | sed s/-recursive//`; \1044 for subdir in $$rev; do \1045 echo "Making $$target in $$subdir"; \1046 if test "$$subdir" = "."; then \1047 local_target="$$target-am"; \1048 else \1049 local_target="$$target"; \1050 fi; \1051 (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \1052 || eval $$failcom; \1053 done && test -z "$$fail"1054 tags-recursive:1055 list='$(SUBDIRS)'; for subdir in $$list; do \1056 test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \1057 done1058 ctags-recursive:1059 list='$(SUBDIRS)'; for subdir in $$list; do \1060 test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \1061 done1062 1063 990 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) 1064 991 list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ … … 1071 998 tags: TAGS 1072 999 1073 TAGS: tags-recursive$(HEADERS) $(SOURCES) config.h.in config_cbc.h.in $(TAGS_DEPENDENCIES) \1000 TAGS: $(HEADERS) $(SOURCES) config.h.in config_cbc.h.in $(TAGS_DEPENDENCIES) \ 1074 1001 $(TAGS_FILES) $(LISP) 1075 1002 tags=; \ 1076 1003 here=`pwd`; \ 1077 if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \1078 include_option=--etags-include; \1079 empty_fix=.; \1080 else \1081 include_option=--include; \1082 empty_fix=; \1083 fi; \1084 list='$(SUBDIRS)'; for subdir in $$list; do \1085 if test "$$subdir" = .; then :; else \1086 test ! -f $$subdir/TAGS || \1087 tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \1088 fi; \1089 done; \1090 1004 list='$(SOURCES) $(HEADERS) config.h.in config_cbc.h.in $(LISP) $(TAGS_FILES)'; \ 1091 1005 unique=`for i in $$list; do \ … … 1100 1014 fi 1101 1015 ctags: CTAGS 1102 CTAGS: ctags-recursive$(HEADERS) $(SOURCES) config.h.in config_cbc.h.in $(TAGS_DEPENDENCIES) \1016 CTAGS: $(HEADERS) $(SOURCES) config.h.in config_cbc.h.in $(TAGS_DEPENDENCIES) \ 1103 1017 $(TAGS_FILES) $(LISP) 1104 1018 tags=; \ … … 1149 1063 fi; \ 1150 1064 done 1151 list='$(DIST_SUBDIRS)'; for subdir in $$list; do \1152 if test "$$subdir" = .; then :; else \1153 test -d "$(distdir)/$$subdir" \1154 || $(mkdir_p) "$(distdir)/$$subdir" \1155 || exit 1; \1156 distdir=`$(am__cd) $(distdir) && pwd`; \1157 top_distdir=`$(am__cd) $(top_distdir) && pwd`; \1158 (cd $$subdir && \1159 $(MAKE) $(AM_MAKEFLAGS) \1160 top_distdir="$$top_distdir" \1161 distdir="$$distdir/$$subdir" \1162 distdir) \1163 || exit 1; \1164 fi; \1165 done1166 1065 check-am: all-am 1167 check: check- recursive1066 check: check-am 1168 1067 all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS) config.h \ 1169 1068 config_cbc.h 1170 1069 install-binPROGRAMS: install-libLTLIBRARIES 1171 1070 1172 installdirs: installdirs-recursive 1173 installdirs-am: 1071 installdirs: 1174 1072 for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(includecoindir)"; do \ 1175 1073 test -z "$$dir" || $(mkdir_p) "$$dir"; \ 1176 1074 done 1177 install: install- recursive1178 install-exec: install-exec- recursive1179 install-data: install-data- recursive1180 uninstall: uninstall- recursive1075 install: install-am 1076 install-exec: install-exec-am 1077 install-data: install-data-am 1078 uninstall: uninstall-am 1181 1079 1182 1080 install-am: all-am 1183 1081 @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am 1184 1082 1185 installcheck: installcheck- recursive1083 installcheck: installcheck-am 1186 1084 install-strip: 1187 1085 $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ … … 1200 1098 @echo "it deletes files that may require special tools to rebuild." 1201 1099 @COIN_CXX_IS_CL_FALSE@install-exec-hook: 1202 clean: clean- recursive1100 clean: clean-am 1203 1101 1204 1102 clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \ 1205 1103 clean-libtool mostlyclean-am 1206 1104 1207 distclean: distclean- recursive1105 distclean: distclean-am 1208 1106 -rm -rf ./$(DEPDIR) 1209 1107 -rm -f Makefile … … 1211 1109 distclean-hdr distclean-libtool distclean-tags 1212 1110 1213 dvi: dvi- recursive1111 dvi: dvi-am 1214 1112 1215 1113 dvi-am: 1216 1114 1217 html: html- recursive1218 1219 info: info- recursive1115 html: html-am 1116 1117 info: info-am 1220 1118 1221 1119 info-am: … … 1228 1126 $(MAKE) $(AM_MAKEFLAGS) install-exec-hook 1229 1127 1230 install-info: install-info- recursive1128 install-info: install-info-am 1231 1129 1232 1130 install-man: … … 1234 1132 installcheck-am: 1235 1133 1236 maintainer-clean: maintainer-clean- recursive1134 maintainer-clean: maintainer-clean-am 1237 1135 -rm -rf ./$(DEPDIR) 1238 1136 -rm -f Makefile 1239 1137 maintainer-clean-am: distclean-am maintainer-clean-generic 1240 1138 1241 mostlyclean: mostlyclean- recursive1139 mostlyclean: mostlyclean-am 1242 1140 1243 1141 mostlyclean-am: mostlyclean-compile mostlyclean-generic \ 1244 1142 mostlyclean-libtool 1245 1143 1246 pdf: pdf- recursive1144 pdf: pdf-am 1247 1145 1248 1146 pdf-am: 1249 1147 1250 ps: ps- recursive1148 ps: ps-am 1251 1149 1252 1150 ps-am: … … 1255 1153 uninstall-info-am uninstall-libLTLIBRARIES uninstall-local 1256 1154 1257 uninstall-info: uninstall-info-recursive 1258 1259 .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ 1260 clean clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \ 1261 clean-libtool clean-recursive ctags ctags-recursive distclean \ 1262 distclean-compile distclean-generic distclean-hdr \ 1263 distclean-libtool distclean-recursive distclean-tags distdir \ 1264 dvi dvi-am html html-am info info-am install install-am \ 1265 install-binPROGRAMS install-data install-data-am install-exec \ 1266 install-exec-am install-exec-hook install-exec-local \ 1155 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ 1156 clean-generic clean-libLTLIBRARIES clean-libtool ctags \ 1157 distclean distclean-compile distclean-generic distclean-hdr \ 1158 distclean-libtool distclean-tags distdir dvi dvi-am html \ 1159 html-am info info-am install install-am install-binPROGRAMS \ 1160 install-data install-data-am install-exec install-exec-am \ 1161 install-exec-hook install-exec-local \ 1267 1162 install-includecoinHEADERS install-info install-info-am \ 1268 1163 install-libLTLIBRARIES install-man install-strip installcheck \ 1269 installcheck-am installdirs installdirs-am maintainer-clean \ 1270 maintainer-clean-generic maintainer-clean-recursive \ 1271 mostlyclean mostlyclean-compile mostlyclean-generic \ 1272 mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \ 1273 tags tags-recursive uninstall uninstall-am \ 1274 uninstall-binPROGRAMS uninstall-includecoinHEADERS \ 1275 uninstall-info-am uninstall-libLTLIBRARIES uninstall-local 1164 installcheck-am installdirs maintainer-clean \ 1165 maintainer-clean-generic mostlyclean mostlyclean-compile \ 1166 mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ 1167 tags uninstall uninstall-am uninstall-binPROGRAMS \ 1168 uninstall-includecoinHEADERS uninstall-info-am \ 1169 uninstall-libLTLIBRARIES uninstall-local 1276 1170 1277 1171 -
stable/2.8/Cbc/src/OsiCbc/Makefile.am
r1902 r1992 18 18 # List all source files for this library, including headers 19 19 libOsiCbc_la_SOURCES = OsiCbcSolverInterface.cpp OsiCbcSolverInterface.hpp 20 21 # List all additionally required libraries 22 if DEPENDENCY_LINKING 23 libOsiCbc_la_LIBADD = $(CBCLIB_LIBS) ../libCbc.la 24 endif 20 25 21 26 # This is for libtool (on Windows) -
stable/2.8/Cbc/src/OsiCbc/Makefile.in
r1975 r1992 75 75 libLTLIBRARIES_INSTALL = $(INSTALL) 76 76 LTLIBRARIES = $(lib_LTLIBRARIES) 77 libOsiCbc_la_LIBADD = 77 am__DEPENDENCIES_1 = 78 @DEPENDENCY_LINKING_TRUE@libOsiCbc_la_DEPENDENCIES = \ 79 @DEPENDENCY_LINKING_TRUE@ $(am__DEPENDENCIES_1) ../libCbc.la 78 80 am_libOsiCbc_la_OBJECTS = OsiCbcSolverInterface.lo 79 81 libOsiCbc_la_OBJECTS = $(am_libOsiCbc_la_OBJECTS) … … 437 439 libOsiCbc_la_SOURCES = OsiCbcSolverInterface.cpp OsiCbcSolverInterface.hpp 438 440 441 # List all additionally required libraries 442 @DEPENDENCY_LINKING_TRUE@libOsiCbc_la_LIBADD = $(CBCLIB_LIBS) ../libCbc.la 443 439 444 # This is for libtool (on Windows) 440 445 libOsiCbc_la_LDFLAGS = $(LT_LDFLAGS)
Note: See TracChangeset
for help on using the changeset viewer.