Changeset 1979 for trunk/Cbc/src


Ignore:
Timestamp:
Nov 21, 2013 2:57:20 PM (6 years ago)
Author:
stefan
Message:

conditional addition of dependent libraries into project libs via LIBADD

Location:
trunk/Cbc/src
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/Cbc/src/Makefile.am

    r1945 r1979  
    88
    99AUTOMAKE_OPTIONS = foreign
    10 
    11 SUBDIRS = OsiCbc
    1210
    1311########################################################################
     
    104102        CbcMipStartIO.cpp CbcMipStartIO.hpp \
    105103        CbcSolverExpandKnapsack.cpp CbcSolverExpandKnapsack.hpp
     104
     105# List all additionally required libraries
     106if DEPENDENCY_LINKING
     107libCbc_la_LIBADD = $(CBCLIB_LIBS)
     108libCbcSolver_la_LIBADD = $(CBCLIB_LIBS) libCbc.la
     109endif
    106110
    107111# This is for libtool
  • trunk/Cbc/src/Makefile.in

    r1945 r1979  
    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 \
     
    117119        CbcTreeLocal.lo
    118120libCbc_la_OBJECTS = $(am_libCbc_la_OBJECTS)
    119 libCbcSolver_la_LIBADD =
     121@DEPENDENCY_LINKING_TRUE@libCbcSolver_la_DEPENDENCIES =  \
     122@DEPENDENCY_LINKING_TRUE@       $(am__DEPENDENCIES_1) libCbc.la
    120123am_libCbcSolver_la_OBJECTS = CbcCbcParam.lo Cbc_ampl.lo CbcLinked.lo \
    121124        CbcLinkedUtils.lo unitTestClp.lo CbcSolver.lo \
     
    130133@COIN_HAS_CLP_TRUE@am_cbc_OBJECTS = CoinSolve.$(OBJEXT)
    131134cbc_OBJECTS = $(am_cbc_OBJECTS)
    132 am__DEPENDENCIES_1 =
    133135am__cbc_generic_SOURCES_DIST = CbcGenBaB.cpp CbcGenCbcParam.cpp \
    134136        CbcGenCbcParam.hpp CbcGenCbcParamUtils.cpp CbcGenCtlBlk.cpp \
     
    173175DIST_SOURCES = $(libCbc_la_SOURCES) $(libCbcSolver_la_SOURCES) \
    174176        $(am__cbc_SOURCES_DIST) $(am__cbc_generic_SOURCES_DIST)
    175 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
    176         html-recursive info-recursive install-data-recursive \
    177         install-exec-recursive install-info-recursive \
    178         install-recursive installcheck-recursive installdirs-recursive \
    179         pdf-recursive ps-recursive uninstall-info-recursive \
    180         uninstall-recursive
    181177includecoinHEADERS_INSTALL = $(INSTALL_HEADER)
    182178HEADERS = $(includecoin_HEADERS)
    183179ETAGS = etags
    184180CTAGS = ctags
    185 DIST_SUBDIRS = $(SUBDIRS)
    186181DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
    187182ABSBUILDDIR = @ABSBUILDDIR@
     
    300295DEFS = @DEFS@
    301296DEPDIR = @DEPDIR@
     297DEPENDENCY_LINKING_FALSE = @DEPENDENCY_LINKING_FALSE@
     298DEPENDENCY_LINKING_TRUE = @DEPENDENCY_LINKING_TRUE@
    302299DYLP_CFLAGS = @DYLP_CFLAGS@
    303300DYLP_CFLAGS_INSTALLED = @DYLP_CFLAGS_INSTALLED@
     
    506503target_alias = @target_alias@
    507504AUTOMAKE_OPTIONS = foreign
    508 SUBDIRS = OsiCbc
    509505
    510506########################################################################
     
    602598        CbcSolverExpandKnapsack.cpp CbcSolverExpandKnapsack.hpp
    603599
     600
     601# List all additionally required libraries
     602@DEPENDENCY_LINKING_TRUE@libCbc_la_LIBADD = $(CBCLIB_LIBS)
     603@DEPENDENCY_LINKING_TRUE@libCbcSolver_la_LIBADD = $(CBCLIB_LIBS) libCbc.la
    604604
    605605# This is for libtool
     
    724724
    725725all: config.h config_cbc.h
    726         $(MAKE) $(AM_MAKEFLAGS) all-recursive
     726        $(MAKE) $(AM_MAKEFLAGS) all-am
    727727
    728728.SUFFIXES:
     
    992992        done
    993993
    994 # This directory's subdirectories are mostly independent; you can cd
    995 # into them and run `make' without going through this Makefile.
    996 # To change the values of `make' variables: instead of editing Makefiles,
    997 # (1) if the variable is set in `config.status', edit `config.status'
    998 #     (which will cause the Makefiles to be regenerated when you run `make');
    999 # (2) otherwise, pass the desired values on the `make' command line.
    1000 $(RECURSIVE_TARGETS):
    1001         @failcom='exit 1'; \
    1002         for f in x $$MAKEFLAGS; do \
    1003           case $$f in \
    1004             *=* | --[!k]*);; \
    1005             *k*) failcom='fail=yes';; \
    1006           esac; \
    1007         done; \
    1008         dot_seen=no; \
    1009         target=`echo $@ | sed s/-recursive//`; \
    1010         list='$(SUBDIRS)'; for subdir in $$list; do \
    1011           echo "Making $$target in $$subdir"; \
    1012           if test "$$subdir" = "."; then \
    1013             dot_seen=yes; \
    1014             local_target="$$target-am"; \
    1015           else \
    1016             local_target="$$target"; \
    1017           fi; \
    1018           (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
    1019           || eval $$failcom; \
    1020         done; \
    1021         if test "$$dot_seen" = "no"; then \
    1022           $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
    1023         fi; test -z "$$fail"
    1024 
    1025 mostlyclean-recursive clean-recursive distclean-recursive \
    1026 maintainer-clean-recursive:
    1027         @failcom='exit 1'; \
    1028         for f in x $$MAKEFLAGS; do \
    1029           case $$f in \
    1030             *=* | --[!k]*);; \
    1031             *k*) failcom='fail=yes';; \
    1032           esac; \
    1033         done; \
    1034         dot_seen=no; \
    1035         case "$@" in \
    1036           distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
    1037           *) list='$(SUBDIRS)' ;; \
    1038         esac; \
    1039         rev=''; for subdir in $$list; do \
    1040           if test "$$subdir" = "."; then :; else \
    1041             rev="$$subdir $$rev"; \
    1042           fi; \
    1043         done; \
    1044         rev="$$rev ."; \
    1045         target=`echo $@ | sed s/-recursive//`; \
    1046         for subdir in $$rev; do \
    1047           echo "Making $$target in $$subdir"; \
    1048           if test "$$subdir" = "."; then \
    1049             local_target="$$target-am"; \
    1050           else \
    1051             local_target="$$target"; \
    1052           fi; \
    1053           (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
    1054           || eval $$failcom; \
    1055         done && test -z "$$fail"
    1056 tags-recursive:
    1057         list='$(SUBDIRS)'; for subdir in $$list; do \
    1058           test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
    1059         done
    1060 ctags-recursive:
    1061         list='$(SUBDIRS)'; for subdir in $$list; do \
    1062           test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
    1063         done
    1064 
    1065994ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
    1066995        list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
     
    10731002tags: TAGS
    10741003
    1075 TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in config_cbc.h.in $(TAGS_DEPENDENCIES) \
     1004TAGS: $(HEADERS) $(SOURCES) config.h.in config_cbc.h.in $(TAGS_DEPENDENCIES) \
    10761005                $(TAGS_FILES) $(LISP)
    10771006        tags=; \
    10781007        here=`pwd`; \
    1079         if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
    1080           include_option=--etags-include; \
    1081           empty_fix=.; \
    1082         else \
    1083           include_option=--include; \
    1084           empty_fix=; \
    1085         fi; \
    1086         list='$(SUBDIRS)'; for subdir in $$list; do \
    1087           if test "$$subdir" = .; then :; else \
    1088             test ! -f $$subdir/TAGS || \
    1089               tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
    1090           fi; \
    1091         done; \
    10921008        list='$(SOURCES) $(HEADERS) config.h.in config_cbc.h.in $(LISP) $(TAGS_FILES)'; \
    10931009        unique=`for i in $$list; do \
     
    11021018        fi
    11031019ctags: CTAGS
    1104 CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in config_cbc.h.in $(TAGS_DEPENDENCIES) \
     1020CTAGS: $(HEADERS) $(SOURCES) config.h.in config_cbc.h.in $(TAGS_DEPENDENCIES) \
    11051021                $(TAGS_FILES) $(LISP)
    11061022        tags=; \
     
    11511067          fi; \
    11521068        done
    1153         list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
    1154           if test "$$subdir" = .; then :; else \
    1155             test -d "$(distdir)/$$subdir" \
    1156             || $(mkdir_p) "$(distdir)/$$subdir" \
    1157             || exit 1; \
    1158             distdir=`$(am__cd) $(distdir) && pwd`; \
    1159             top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
    1160             (cd $$subdir && \
    1161               $(MAKE) $(AM_MAKEFLAGS) \
    1162                 top_distdir="$$top_distdir" \
    1163                 distdir="$$distdir/$$subdir" \
    1164                 distdir) \
    1165               || exit 1; \
    1166           fi; \
    1167         done
    11681069check-am: all-am
    1169 check: check-recursive
     1070check: check-am
    11701071all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS) config.h \
    11711072                config_cbc.h
    11721073install-binPROGRAMS: install-libLTLIBRARIES
    11731074
    1174 installdirs: installdirs-recursive
    1175 installdirs-am:
     1075installdirs:
    11761076        for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(includecoindir)"; do \
    11771077          test -z "$$dir" || $(mkdir_p) "$$dir"; \
    11781078        done
    1179 install: install-recursive
    1180 install-exec: install-exec-recursive
    1181 install-data: install-data-recursive
    1182 uninstall: uninstall-recursive
     1079install: install-am
     1080install-exec: install-exec-am
     1081install-data: install-data-am
     1082uninstall: uninstall-am
    11831083
    11841084install-am: all-am
    11851085        @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
    11861086
    1187 installcheck: installcheck-recursive
     1087installcheck: installcheck-am
    11881088install-strip:
    11891089        $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
     
    12021102        @echo "it deletes files that may require special tools to rebuild."
    12031103@COIN_CXX_IS_CL_FALSE@install-exec-hook:
    1204 clean: clean-recursive
     1104clean: clean-am
    12051105
    12061106clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
    12071107        clean-libtool mostlyclean-am
    12081108
    1209 distclean: distclean-recursive
     1109distclean: distclean-am
    12101110        -rm -rf ./$(DEPDIR)
    12111111        -rm -f Makefile
     
    12131113        distclean-hdr distclean-libtool distclean-tags
    12141114
    1215 dvi: dvi-recursive
     1115dvi: dvi-am
    12161116
    12171117dvi-am:
    12181118
    1219 html: html-recursive
    1220 
    1221 info: info-recursive
     1119html: html-am
     1120
     1121info: info-am
    12221122
    12231123info-am:
     
    12301130        $(MAKE) $(AM_MAKEFLAGS) install-exec-hook
    12311131
    1232 install-info: install-info-recursive
     1132install-info: install-info-am
    12331133
    12341134install-man:
     
    12361136installcheck-am:
    12371137
    1238 maintainer-clean: maintainer-clean-recursive
     1138maintainer-clean: maintainer-clean-am
    12391139        -rm -rf ./$(DEPDIR)
    12401140        -rm -f Makefile
    12411141maintainer-clean-am: distclean-am maintainer-clean-generic
    12421142
    1243 mostlyclean: mostlyclean-recursive
     1143mostlyclean: mostlyclean-am
    12441144
    12451145mostlyclean-am: mostlyclean-compile mostlyclean-generic \
    12461146        mostlyclean-libtool
    12471147
    1248 pdf: pdf-recursive
     1148pdf: pdf-am
    12491149
    12501150pdf-am:
    12511151
    1252 ps: ps-recursive
     1152ps: ps-am
    12531153
    12541154ps-am:
     
    12571157        uninstall-info-am uninstall-libLTLIBRARIES uninstall-local
    12581158
    1259 uninstall-info: uninstall-info-recursive
    1260 
    1261 .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
    1262         clean clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
    1263         clean-libtool clean-recursive ctags ctags-recursive distclean \
    1264         distclean-compile distclean-generic distclean-hdr \
    1265         distclean-libtool distclean-recursive distclean-tags distdir \
    1266         dvi dvi-am html html-am info info-am install install-am \
    1267         install-binPROGRAMS install-data install-data-am install-exec \
    1268         install-exec-am install-exec-hook install-exec-local \
     1159.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
     1160        clean-generic clean-libLTLIBRARIES clean-libtool ctags \
     1161        distclean distclean-compile distclean-generic distclean-hdr \
     1162        distclean-libtool distclean-tags distdir dvi dvi-am html \
     1163        html-am info info-am install install-am install-binPROGRAMS \
     1164        install-data install-data-am install-exec install-exec-am \
     1165        install-exec-hook install-exec-local \
    12691166        install-includecoinHEADERS install-info install-info-am \
    12701167        install-libLTLIBRARIES install-man install-strip installcheck \
    1271         installcheck-am installdirs installdirs-am maintainer-clean \
    1272         maintainer-clean-generic maintainer-clean-recursive \
    1273         mostlyclean mostlyclean-compile mostlyclean-generic \
    1274         mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
    1275         tags tags-recursive uninstall uninstall-am \
    1276         uninstall-binPROGRAMS uninstall-includecoinHEADERS \
    1277         uninstall-info-am uninstall-libLTLIBRARIES uninstall-local
     1168        installcheck-am installdirs maintainer-clean \
     1169        maintainer-clean-generic mostlyclean mostlyclean-compile \
     1170        mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
     1171        tags uninstall uninstall-am uninstall-binPROGRAMS \
     1172        uninstall-includecoinHEADERS uninstall-info-am \
     1173        uninstall-libLTLIBRARIES uninstall-local
    12781174
    12791175
  • trunk/Cbc/src/OsiCbc/Makefile.am

    r1899 r1979  
    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)
  • trunk/Cbc/src/OsiCbc/Makefile.in

    r1933 r1979  
    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)
     
    218220DEFS = @DEFS@
    219221DEPDIR = @DEPDIR@
     222DEPENDENCY_LINKING_FALSE = @DEPENDENCY_LINKING_FALSE@
     223DEPENDENCY_LINKING_TRUE = @DEPENDENCY_LINKING_TRUE@
    220224DYLP_CFLAGS = @DYLP_CFLAGS@
    221225DYLP_CFLAGS_INSTALLED = @DYLP_CFLAGS_INSTALLED@
     
    435439libOsiCbc_la_SOURCES = OsiCbcSolverInterface.cpp OsiCbcSolverInterface.hpp
    436440
     441# List all additionally required libraries
     442@DEPENDENCY_LINKING_TRUE@libOsiCbc_la_LIBADD = $(CBCLIB_LIBS) ../libCbc.la
     443
    437444# This is for libtool (on Windows)
    438445libOsiCbc_la_LDFLAGS = $(LT_LDFLAGS)
Note: See TracChangeset for help on using the changeset viewer.