Changeset 1992


Ignore:
Timestamp:
Dec 15, 2013 6:57:12 PM (5 years ago)
Author:
tkr
Message:

Merging r1990, r1989, r1984, r1979 from trunk

Location:
stable/2.8/Cbc
Files:
7 edited
1 copied

Legend:

Unmodified
Added
Removed
  • stable/2.8/Cbc

  • stable/2.8/Cbc/Makefile.am

    r1739 r1992  
    1414
    1515SUBDIRS = src
     16
     17# Don't do src/OsiCbc recursively, since src/OsiCbc/libOsiCbc depends on src/libCbc
     18SUBDIRS += src/OsiCbc
    1619
    1720# We don't want to compile the test subdirectory, unless the test target is
     
    140143        echo "-libpath:`$(CYGPATH_W) @abs_lib_dir@` libCbc.lib @CBCLIB_LIBS_INSTALLED@" > $(addlibsdir)/cbc_addlibs.txt
    141144else
    142         echo -L@abs_lib_dir@ -lCbc @CBCLIB_LIBS_INSTALLED@ > $(addlibsdir)/cbc_addlibs.txt
     145        echo -L@abs_lib_dir@ -lCbcSolver -lCbc @CBCLIB_LIBS_INSTALLED@ > $(addlibsdir)/cbc_addlibs.txt
    143146endif
    144147endif
  • stable/2.8/Cbc/Makefile.in

    r1975 r1992  
    100100ETAGS = etags
    101101CTAGS = ctags
    102 DIST_SUBDIRS = src test
     102DIST_SUBDIRS = src src/OsiCbc test
    103103DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
    104104distdir = $(PACKAGE)-$(VERSION)
     
    439439#                          Subdirectories                              #
    440440########################################################################
    441 SUBDIRS = src $(am__append_1)
     441
     442# Don't do src/OsiCbc recursively, since src/OsiCbc/libOsiCbc depends on src/libCbc
     443SUBDIRS = src src/OsiCbc $(am__append_1)
    442444
    443445########################################################################
  • stable/2.8/Cbc/src/Makefile.am

    r1936 r1992  
    88
    99AUTOMAKE_OPTIONS = foreign
    10 
    11 SUBDIRS = OsiCbc
    1210
    1311########################################################################
     
    103101        CbcMipStartIO.cpp CbcMipStartIO.hpp \
    104102        CbcSolverExpandKnapsack.cpp CbcSolverExpandKnapsack.hpp
     103
     104# List all additionally required libraries
     105if DEPENDENCY_LINKING
     106libCbc_la_LIBADD = $(CBCLIB_LIBS)
     107libCbcSolver_la_LIBADD = $(CBCLIB_LIBS) libCbc.la
     108endif
    105109
    106110# This is for libtool
  • stable/2.8/Cbc/src/Makefile.in

    r1975 r1992  
    8989libLTLIBRARIES_INSTALL = $(INSTALL)
    9090LTLIBRARIES = $(lib_LTLIBRARIES)
    91 libCbc_la_LIBADD =
     91am__DEPENDENCIES_1 =
     92@DEPENDENCY_LINKING_TRUE@libCbc_la_DEPENDENCIES =  \
     93@DEPENDENCY_LINKING_TRUE@       $(am__DEPENDENCIES_1)
    9294am_libCbc_la_OBJECTS = Cbc_C_Interface.lo CbcBranchAllDifferent.lo \
    9395        CbcBranchCut.lo CbcBranchDecision.lo \
     
    116118        CbcTreeLocal.lo
    117119libCbc_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
    119122am_libCbcSolver_la_OBJECTS = CbcCbcParam.lo Cbc_ampl.lo CbcLinked.lo \
    120123        CbcLinkedUtils.lo unitTestClp.lo CbcSolver.lo \
     
    129132@COIN_HAS_CLP_TRUE@am_cbc_OBJECTS = CoinSolve.$(OBJEXT)
    130133cbc_OBJECTS = $(am_cbc_OBJECTS)
    131 am__DEPENDENCIES_1 =
    132134am__cbc_generic_SOURCES_DIST = CbcGenBaB.cpp CbcGenCbcParam.cpp \
    133135        CbcGenCbcParam.hpp CbcGenCbcParamUtils.cpp CbcGenCtlBlk.cpp \
     
    172174DIST_SOURCES = $(libCbc_la_SOURCES) $(libCbcSolver_la_SOURCES) \
    173175        $(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-recursive
    180176includecoinHEADERS_INSTALL = $(INSTALL_HEADER)
    181177HEADERS = $(includecoin_HEADERS)
    182178ETAGS = etags
    183179CTAGS = ctags
    184 DIST_SUBDIRS = $(SUBDIRS)
    185180DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
    186181ABSBUILDDIR = @ABSBUILDDIR@
     
    507502target_alias = @target_alias@
    508503AUTOMAKE_OPTIONS = foreign
    509 SUBDIRS = OsiCbc
    510504
    511505########################################################################
     
    602596        CbcSolverExpandKnapsack.cpp CbcSolverExpandKnapsack.hpp
    603597
     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
    604602
    605603# This is for libtool
     
    723721
    724722all: config.h config_cbc.h
    725         $(MAKE) $(AM_MAKEFLAGS) all-recursive
     723        $(MAKE) $(AM_MAKEFLAGS) all-am
    726724
    727725.SUFFIXES:
     
    990988        done
    991989
    992 # This directory's subdirectories are mostly independent; you can cd
    993 # 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         done
    1058 ctags-recursive:
    1059         list='$(SUBDIRS)'; for subdir in $$list; do \
    1060           test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
    1061         done
    1062 
    1063990ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
    1064991        list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
     
    1071998tags: TAGS
    1072999
    1073 TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in config_cbc.h.in $(TAGS_DEPENDENCIES) \
     1000TAGS: $(HEADERS) $(SOURCES) config.h.in config_cbc.h.in $(TAGS_DEPENDENCIES) \
    10741001                $(TAGS_FILES) $(LISP)
    10751002        tags=; \
    10761003        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; \
    10901004        list='$(SOURCES) $(HEADERS) config.h.in config_cbc.h.in $(LISP) $(TAGS_FILES)'; \
    10911005        unique=`for i in $$list; do \
     
    11001014        fi
    11011015ctags: CTAGS
    1102 CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in config_cbc.h.in $(TAGS_DEPENDENCIES) \
     1016CTAGS: $(HEADERS) $(SOURCES) config.h.in config_cbc.h.in $(TAGS_DEPENDENCIES) \
    11031017                $(TAGS_FILES) $(LISP)
    11041018        tags=; \
     
    11491063          fi; \
    11501064        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         done
    11661065check-am: all-am
    1167 check: check-recursive
     1066check: check-am
    11681067all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS) config.h \
    11691068                config_cbc.h
    11701069install-binPROGRAMS: install-libLTLIBRARIES
    11711070
    1172 installdirs: installdirs-recursive
    1173 installdirs-am:
     1071installdirs:
    11741072        for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(includecoindir)"; do \
    11751073          test -z "$$dir" || $(mkdir_p) "$$dir"; \
    11761074        done
    1177 install: install-recursive
    1178 install-exec: install-exec-recursive
    1179 install-data: install-data-recursive
    1180 uninstall: uninstall-recursive
     1075install: install-am
     1076install-exec: install-exec-am
     1077install-data: install-data-am
     1078uninstall: uninstall-am
    11811079
    11821080install-am: all-am
    11831081        @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
    11841082
    1185 installcheck: installcheck-recursive
     1083installcheck: installcheck-am
    11861084install-strip:
    11871085        $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
     
    12001098        @echo "it deletes files that may require special tools to rebuild."
    12011099@COIN_CXX_IS_CL_FALSE@install-exec-hook:
    1202 clean: clean-recursive
     1100clean: clean-am
    12031101
    12041102clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
    12051103        clean-libtool mostlyclean-am
    12061104
    1207 distclean: distclean-recursive
     1105distclean: distclean-am
    12081106        -rm -rf ./$(DEPDIR)
    12091107        -rm -f Makefile
     
    12111109        distclean-hdr distclean-libtool distclean-tags
    12121110
    1213 dvi: dvi-recursive
     1111dvi: dvi-am
    12141112
    12151113dvi-am:
    12161114
    1217 html: html-recursive
    1218 
    1219 info: info-recursive
     1115html: html-am
     1116
     1117info: info-am
    12201118
    12211119info-am:
     
    12281126        $(MAKE) $(AM_MAKEFLAGS) install-exec-hook
    12291127
    1230 install-info: install-info-recursive
     1128install-info: install-info-am
    12311129
    12321130install-man:
     
    12341132installcheck-am:
    12351133
    1236 maintainer-clean: maintainer-clean-recursive
     1134maintainer-clean: maintainer-clean-am
    12371135        -rm -rf ./$(DEPDIR)
    12381136        -rm -f Makefile
    12391137maintainer-clean-am: distclean-am maintainer-clean-generic
    12401138
    1241 mostlyclean: mostlyclean-recursive
     1139mostlyclean: mostlyclean-am
    12421140
    12431141mostlyclean-am: mostlyclean-compile mostlyclean-generic \
    12441142        mostlyclean-libtool
    12451143
    1246 pdf: pdf-recursive
     1144pdf: pdf-am
    12471145
    12481146pdf-am:
    12491147
    1250 ps: ps-recursive
     1148ps: ps-am
    12511149
    12521150ps-am:
     
    12551153        uninstall-info-am uninstall-libLTLIBRARIES uninstall-local
    12561154
    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 \
    12671162        install-includecoinHEADERS install-info install-info-am \
    12681163        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
    12761170
    12771171
  • stable/2.8/Cbc/src/OsiCbc/Makefile.am

    r1902 r1992  
    1818# List all source files for this library, including headers
    1919libOsiCbc_la_SOURCES = OsiCbcSolverInterface.cpp OsiCbcSolverInterface.hpp
     20
     21# List all additionally required libraries
     22if DEPENDENCY_LINKING
     23libOsiCbc_la_LIBADD = $(CBCLIB_LIBS) ../libCbc.la
     24endif
    2025
    2126# This is for libtool (on Windows)
  • stable/2.8/Cbc/src/OsiCbc/Makefile.in

    r1975 r1992  
    7575libLTLIBRARIES_INSTALL = $(INSTALL)
    7676LTLIBRARIES = $(lib_LTLIBRARIES)
    77 libOsiCbc_la_LIBADD =
     77am__DEPENDENCIES_1 =
     78@DEPENDENCY_LINKING_TRUE@libOsiCbc_la_DEPENDENCIES =  \
     79@DEPENDENCY_LINKING_TRUE@       $(am__DEPENDENCIES_1) ../libCbc.la
    7880am_libOsiCbc_la_OBJECTS = OsiCbcSolverInterface.lo
    7981libOsiCbc_la_OBJECTS = $(am_libOsiCbc_la_OBJECTS)
     
    437439libOsiCbc_la_SOURCES = OsiCbcSolverInterface.cpp OsiCbcSolverInterface.hpp
    438440
     441# List all additionally required libraries
     442@DEPENDENCY_LINKING_TRUE@libOsiCbc_la_LIBADD = $(CBCLIB_LIBS) ../libCbc.la
     443
    439444# This is for libtool (on Windows)
    440445libOsiCbc_la_LDFLAGS = $(LT_LDFLAGS)
Note: See TracChangeset for help on using the changeset viewer.