Changeset 1996 for trunk/Clp/src


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

conditional addition of dependent libraries into project libs via LIBADD

Location:
trunk/Clp/src
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/Clp/src/Makefile.am

    r1967 r1996  
    88
    99AUTOMAKE_OPTIONS = foreign
    10 
    11 if COIN_HAS_OSI
    12   SUBDIRS = OsiClp
    13 endif
    1410
    1511########################################################################
    … …  
    139135endif
    140136
     137# List all additionally required libraries
     138if DEPENDENCY_LINKING
     139libClp_la_LIBADD = $(CLPLIB_LIBS)
     140endif
     141
    141142# This is for libtool
    142143libClp_la_LDFLAGS = $(LT_LDFLAGS)

  • trunk/Clp/src/Makefile.in

    r1967 r1996  
    129129libLTLIBRARIES_INSTALL = $(INSTALL)
    130130LTLIBRARIES = $(lib_LTLIBRARIES)
    131 libClp_la_LIBADD =
     131am__DEPENDENCIES_1 =
     132@DEPENDENCY_LINKING_TRUE@libClp_la_DEPENDENCIES =  \
     133@DEPENDENCY_LINKING_TRUE@       $(am__DEPENDENCIES_1)
    132134am__libClp_la_SOURCES_DIST = ClpConfig.h ClpCholeskyBase.cpp \
    133135        ClpCholeskyBase.hpp ClpCholeskyDense.cpp ClpCholeskyDense.hpp \
    … …  
    259261        MyMessageHandler.$(OBJEXT) unitTest.$(OBJEXT)
    260262clp_OBJECTS = $(am_clp_OBJECTS)
    261 am__DEPENDENCIES_1 =
    262263depcomp = $(SHELL) $(top_srcdir)/depcomp
    263264am__depfiles_maybe = depfiles
    … …  
    280281SOURCES = $(libClp_la_SOURCES) $(clp_SOURCES)
    281282DIST_SOURCES = $(am__libClp_la_SOURCES_DIST) $(clp_SOURCES)
    282 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
    283         html-recursive info-recursive install-data-recursive \
    284         install-exec-recursive install-info-recursive \
    285         install-recursive installcheck-recursive installdirs-recursive \
    286         pdf-recursive ps-recursive uninstall-info-recursive \
    287         uninstall-recursive
    288283am__includecoin_HEADERS_DIST = Clp_C_Interface.h ClpCholeskyBase.hpp \
    289284        ClpCholeskyDense.hpp ClpConstraint.hpp ClpConstraintLinear.hpp \
    … …  
    309304ETAGS = etags
    310305CTAGS = ctags
    311 DIST_SUBDIRS = OsiClp
    312306DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
    313307ABSBUILDDIR = @ABSBUILDDIR@
    … …  
    412406DEFS = @DEFS@
    413407DEPDIR = @DEPDIR@
     408DEPENDENCY_LINKING_FALSE = @DEPENDENCY_LINKING_FALSE@
     409DEPENDENCY_LINKING_TRUE = @DEPENDENCY_LINKING_TRUE@
    414410ECHO = @ECHO@
    415411ECHO_C = @ECHO_C@
    … …  
    573569target_alias = @target_alias@
    574570AUTOMAKE_OPTIONS = foreign
    575 @COIN_HAS_OSI_TRUE@SUBDIRS = OsiClp
    576571
    577572########################################################################
    … …  
    621616        $(am__append_4) $(am__append_5) $(am__append_6)
    622617
     618# List all additionally required libraries
     619@DEPENDENCY_LINKING_TRUE@libClp_la_LIBADD = $(CLPLIB_LIBS)
     620
    623621# This is for libtool
    624622libClp_la_LDFLAGS = $(LT_LDFLAGS)
    … …  
    680678        CbcOrClpParam.cpp
    681679all: config.h config_clp.h
    682         $(MAKE) $(AM_MAKEFLAGS) all-recursive
     680        $(MAKE) $(AM_MAKEFLAGS) all-am
    683681
    684682.SUFFIXES:
    … …  
    948946        done
    949947
    950 # This directory's subdirectories are mostly independent; you can cd
    951 # into them and run `make' without going through this Makefile.
    952 # To change the values of `make' variables: instead of editing Makefiles,
    953 # (1) if the variable is set in `config.status', edit `config.status'
    954 #     (which will cause the Makefiles to be regenerated when you run `make');
    955 # (2) otherwise, pass the desired values on the `make' command line.
    956 $(RECURSIVE_TARGETS):
    957         @failcom='exit 1'; \
    958         for f in x $$MAKEFLAGS; do \
    959           case $$f in \
    960             *=* | --[!k]*);; \
    961             *k*) failcom='fail=yes';; \
    962           esac; \
    963         done; \
    964         dot_seen=no; \
    965         target=`echo $@ | sed s/-recursive//`; \
    966         list='$(SUBDIRS)'; for subdir in $$list; do \
    967           echo "Making $$target in $$subdir"; \
    968           if test "$$subdir" = "."; then \
    969             dot_seen=yes; \
    970             local_target="$$target-am"; \
    971           else \
    972             local_target="$$target"; \
    973           fi; \
    974           (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
    975           || eval $$failcom; \
    976         done; \
    977         if test "$$dot_seen" = "no"; then \
    978           $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
    979         fi; test -z "$$fail"
    980 
    981 mostlyclean-recursive clean-recursive distclean-recursive \
    982 maintainer-clean-recursive:
    983         @failcom='exit 1'; \
    984         for f in x $$MAKEFLAGS; do \
    985           case $$f in \
    986             *=* | --[!k]*);; \
    987             *k*) failcom='fail=yes';; \
    988           esac; \
    989         done; \
    990         dot_seen=no; \
    991         case "$@" in \
    992           distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
    993           *) list='$(SUBDIRS)' ;; \
    994         esac; \
    995         rev=''; for subdir in $$list; do \
    996           if test "$$subdir" = "."; then :; else \
    997             rev="$$subdir $$rev"; \
    998           fi; \
    999         done; \
    1000         rev="$$rev ."; \
    1001         target=`echo $@ | sed s/-recursive//`; \
    1002         for subdir in $$rev; do \
    1003           echo "Making $$target in $$subdir"; \
    1004           if test "$$subdir" = "."; then \
    1005             local_target="$$target-am"; \
    1006           else \
    1007             local_target="$$target"; \
    1008           fi; \
    1009           (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
    1010           || eval $$failcom; \
    1011         done && test -z "$$fail"
    1012 tags-recursive:
    1013         list='$(SUBDIRS)'; for subdir in $$list; do \
    1014           test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
    1015         done
    1016 ctags-recursive:
    1017         list='$(SUBDIRS)'; for subdir in $$list; do \
    1018           test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
    1019         done
    1020 
    1021948ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
    1022949        list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
    … …  
    1029956tags: TAGS
    1030957
    1031 TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in config_clp.h.in $(TAGS_DEPENDENCIES) \
     958TAGS: $(HEADERS) $(SOURCES) config.h.in config_clp.h.in $(TAGS_DEPENDENCIES) \
    1032959                $(TAGS_FILES) $(LISP)
    1033960        tags=; \
    1034961        here=`pwd`; \
    1035         if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
    1036           include_option=--etags-include; \
    1037           empty_fix=.; \
    1038         else \
    1039           include_option=--include; \
    1040           empty_fix=; \
    1041         fi; \
    1042         list='$(SUBDIRS)'; for subdir in $$list; do \
    1043           if test "$$subdir" = .; then :; else \
    1044             test ! -f $$subdir/TAGS || \
    1045               tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
    1046           fi; \
    1047         done; \
    1048962        list='$(SOURCES) $(HEADERS) config.h.in config_clp.h.in $(LISP) $(TAGS_FILES)'; \
    1049963        unique=`for i in $$list; do \
    … …  
    1058972        fi
    1059973ctags: CTAGS
    1060 CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in config_clp.h.in $(TAGS_DEPENDENCIES) \
     974CTAGS: $(HEADERS) $(SOURCES) config.h.in config_clp.h.in $(TAGS_DEPENDENCIES) \
    1061975                $(TAGS_FILES) $(LISP)
    1062976        tags=; \
    … …  
    11071021          fi; \
    11081022        done
    1109         list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
    1110           if test "$$subdir" = .; then :; else \
    1111             test -d "$(distdir)/$$subdir" \
    1112             || $(mkdir_p) "$(distdir)/$$subdir" \
    1113             || exit 1; \
    1114             distdir=`$(am__cd) $(distdir) && pwd`; \
    1115             top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
    1116             (cd $$subdir && \
    1117               $(MAKE) $(AM_MAKEFLAGS) \
    1118                 top_distdir="$$top_distdir" \
    1119                 distdir="$$distdir/$$subdir" \
    1120                 distdir) \
    1121               || exit 1; \
    1122           fi; \
    1123         done
    11241023check-am: all-am
    1125 check: check-recursive
     1024check: check-am
    11261025all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS) config.h \
    11271026                config_clp.h
    11281027install-binPROGRAMS: install-libLTLIBRARIES
    11291028
    1130 installdirs: installdirs-recursive
    1131 installdirs-am:
     1029installdirs:
    11321030        for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(includecoindir)"; do \
    11331031          test -z "$$dir" || $(mkdir_p) "$$dir"; \
    11341032        done
    1135 install: install-recursive
    1136 install-exec: install-exec-recursive
    1137 install-data: install-data-recursive
    1138 uninstall: uninstall-recursive
     1033install: install-am
     1034install-exec: install-exec-am
     1035install-data: install-data-am
     1036uninstall: uninstall-am
    11391037
    11401038install-am: all-am
    11411039        @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
    11421040
    1143 installcheck: installcheck-recursive
     1041installcheck: installcheck-am
    11441042install-strip:
    11451043        $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
    … …  
    11581056        @echo "it deletes files that may require special tools to rebuild."
    11591057@COIN_CXX_IS_CL_FALSE@install-exec-hook:
    1160 clean: clean-recursive
     1058clean: clean-am
    11611059
    11621060clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
    11631061        clean-libtool mostlyclean-am
    11641062
    1165 distclean: distclean-recursive
     1063distclean: distclean-am
    11661064        -rm -rf ./$(DEPDIR)
    11671065        -rm -f Makefile
    … …  
    11691067        distclean-hdr distclean-libtool distclean-tags
    11701068
    1171 dvi: dvi-recursive
     1069dvi: dvi-am
    11721070
    11731071dvi-am:
    11741072
    1175 html: html-recursive
    1176 
    1177 info: info-recursive
     1073html: html-am
     1074
     1075info: info-am
    11781076
    11791077info-am:
    … …  
    11861084        $(MAKE) $(AM_MAKEFLAGS) install-exec-hook
    11871085
    1188 install-info: install-info-recursive
     1086install-info: install-info-am
    11891087
    11901088install-man:
    … …  
    11921090installcheck-am:
    11931091
    1194 maintainer-clean: maintainer-clean-recursive
     1092maintainer-clean: maintainer-clean-am
    11951093        -rm -rf ./$(DEPDIR)
    11961094        -rm -f Makefile
    11971095maintainer-clean-am: distclean-am maintainer-clean-generic
    11981096
    1199 mostlyclean: mostlyclean-recursive
     1097mostlyclean: mostlyclean-am
    12001098
    12011099mostlyclean-am: mostlyclean-compile mostlyclean-generic \
    12021100        mostlyclean-libtool
    12031101
    1204 pdf: pdf-recursive
     1102pdf: pdf-am
    12051103
    12061104pdf-am:
    12071105
    1208 ps: ps-recursive
     1106ps: ps-am
    12091107
    12101108ps-am:
    … …  
    12131111        uninstall-info-am uninstall-libLTLIBRARIES uninstall-local
    12141112
    1215 uninstall-info: uninstall-info-recursive
    1216 
    1217 .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
    1218         clean clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
    1219         clean-libtool clean-recursive ctags ctags-recursive distclean \
    1220         distclean-compile distclean-generic distclean-hdr \
    1221         distclean-libtool distclean-recursive distclean-tags distdir \
    1222         dvi dvi-am html html-am info info-am install install-am \
    1223         install-binPROGRAMS install-data install-data-am install-exec \
    1224         install-exec-am install-exec-hook install-exec-local \
     1113.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
     1114        clean-generic clean-libLTLIBRARIES clean-libtool ctags \
     1115        distclean distclean-compile distclean-generic distclean-hdr \
     1116        distclean-libtool distclean-tags distdir dvi dvi-am html \
     1117        html-am info info-am install install-am install-binPROGRAMS \
     1118        install-data install-data-am install-exec install-exec-am \
     1119        install-exec-hook install-exec-local \
    12251120        install-includecoinHEADERS install-info install-info-am \
    12261121        install-libLTLIBRARIES install-man install-strip installcheck \
    1227         installcheck-am installdirs installdirs-am maintainer-clean \
    1228         maintainer-clean-generic maintainer-clean-recursive \
    1229         mostlyclean mostlyclean-compile mostlyclean-generic \
    1230         mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
    1231         tags tags-recursive uninstall uninstall-am \
    1232         uninstall-binPROGRAMS uninstall-includecoinHEADERS \
    1233         uninstall-info-am uninstall-libLTLIBRARIES uninstall-local
     1122        installcheck-am installdirs maintainer-clean \
     1123        maintainer-clean-generic mostlyclean mostlyclean-compile \
     1124        mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
     1125        tags uninstall uninstall-am uninstall-binPROGRAMS \
     1126        uninstall-includecoinHEADERS uninstall-info-am \
     1127        uninstall-libLTLIBRARIES uninstall-local
    12341128
    12351129

  • trunk/Clp/src/OsiClp/Makefile.am

    r1781 r1996  
    1919libOsiClp_la_SOURCES = OsiClpSolverInterface.cpp OsiClpSolverInterface.hpp
    2020
     21# List all additionally required libraries
     22if DEPENDENCY_LINKING
     23libOsiClp_la_LIBADD = $(OSICLPLIB_LIBS) ../libClp.la
     24endif
     25
    2126# This is for libtool (on Windows)
    2227libOsiClp_la_LDFLAGS = $(LT_LDFLAGS)

  • trunk/Clp/src/OsiClp/Makefile.in

    r1965 r1996  
    6565libLTLIBRARIES_INSTALL = $(INSTALL)
    6666LTLIBRARIES = $(lib_LTLIBRARIES)
    67 libOsiClp_la_LIBADD =
     67am__DEPENDENCIES_1 =
     68@DEPENDENCY_LINKING_TRUE@libOsiClp_la_DEPENDENCIES =  \
     69@DEPENDENCY_LINKING_TRUE@       $(am__DEPENDENCIES_1) ../libClp.la
    6870am_libOsiClp_la_OBJECTS = OsiClpSolverInterface.lo
    6971libOsiClp_la_OBJECTS = $(am_libOsiClp_la_OBJECTS)
    … …  
    194196DEFS = @DEFS@
    195197DEPDIR = @DEPDIR@
     198DEPENDENCY_LINKING_FALSE = @DEPENDENCY_LINKING_FALSE@
     199DEPENDENCY_LINKING_TRUE = @DEPENDENCY_LINKING_TRUE@
    196200ECHO = @ECHO@
    197201ECHO_C = @ECHO_C@
    … …  
    366370libOsiClp_la_SOURCES = OsiClpSolverInterface.cpp OsiClpSolverInterface.hpp
    367371
     372# List all additionally required libraries
     373@DEPENDENCY_LINKING_TRUE@libOsiClp_la_LIBADD = $(OSICLPLIB_LIBS) ../libClp.la
     374
    368375# This is for libtool (on Windows)
    369376libOsiClp_la_LDFLAGS = $(LT_LDFLAGS)
Note: See TracChangeset for help on using the changeset viewer.