Changeset 2010


Ignore:
Timestamp:
Dec 16, 2013 11:30:10 AM (5 years ago)
Author:
tkr
Message:

Merging r1996 from trunk

Location:
stable/1.15/Clp
Files:
10 edited

Legend:

Unmodified
Added
Removed
  • stable/1.15/Clp

  • stable/1.15/Clp/Makefile.am

    r1803 r2010  
    1414
    1515SUBDIRS = src
     16
     17# Don't do src/OsiClp recursively, since src/OsiClp/libOsiClp depends on src/libClp
     18if COIN_HAS_OSI
     19  SUBDIRS += src/OsiClp
     20endif
    1621
    1722# We don't want to compile the test subdirectory, unless the test target is
  • stable/1.15/Clp/Makefile.in

    r2009 r2010  
    5454host_triplet = @host@
    5555
     56# Don't do src/OsiClp recursively, since src/OsiClp/libOsiClp depends on src/libClp
     57@COIN_HAS_OSI_TRUE@am__append_1 = src/OsiClp
     58
    5659# We don't want to compile the test subdirectory, unless the test target is
    5760# specified.  But we need to list it as subdirectory to make sure that it is
    5861# included in the tarball
    59 @ALWAYS_FALSE@am__append_1 = test
    60 @COIN_HAS_OSI_TRUE@am__append_2 = osi-clp.pc
     62@ALWAYS_FALSE@am__append_2 = test
     63@COIN_HAS_OSI_TRUE@am__append_3 = osi-clp.pc
    6164DIST_COMMON = README $(am__configure_deps) \
    6265        $(srcdir)/BuildTools/Makemain.inc $(srcdir)/Makefile.am \
     
    6871        $(top_srcdir)/src/OsiClp/osi-clp.pc.in AUTHORS config.guess \
    6972        config.sub depcomp install-sh ltmain.sh missing
    70 @HAVE_EXTERNALS_TRUE@am__append_3 = Dependencies
    71 @HAVE_EXTERNALS_TRUE@am__append_4 = .Dependencies-stamp
     73@HAVE_EXTERNALS_TRUE@am__append_4 = Dependencies
     74@HAVE_EXTERNALS_TRUE@am__append_5 = .Dependencies-stamp
    7275subdir = .
    7376ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
     
    102105ETAGS = etags
    103106CTAGS = ctags
    104 DIST_SUBDIRS = src test
     107DIST_SUBDIRS = src src/OsiClp test
    105108DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
    106109distdir = $(PACKAGE)-$(VERSION)
     
    373376#                          Subdirectories                              #
    374377########################################################################
    375 SUBDIRS = src $(am__append_1)
     378SUBDIRS = src $(am__append_1) $(am__append_2)
    376379
    377380########################################################################
     
    397400        examples/testBasis.cpp examples/testGub2.cpp \
    398401        examples/testGub.cpp examples/testQP.cpp \
    399         examples/useVolume.cpp $(am__append_3)
     402        examples/useVolume.cpp $(am__append_4)
    400403
    401404########################################################################
     
    403406########################################################################
    404407pkgconfiglibdir = $(libdir)/pkgconfig
    405 pkgconfiglib_DATA = clp.pc $(am__append_2)
     408pkgconfiglib_DATA = clp.pc $(am__append_3)
    406409addlibsdir = $(DESTDIR)$(datadir)/coin/doc/Clp
    407410
     
    412415
    413416# Files that are generated and should be cleaned with make distclean
    414 DISTCLEANFILES = $(am__append_4) $(VPATH_DISTCLEANFILES)
     417DISTCLEANFILES = $(am__append_5) $(VPATH_DISTCLEANFILES)
    415418DocFiles = README AUTHORS LICENSE
    416419DocInstallDir = $(datadir)/coin/doc/$(PACKAGE_NAME)
  • stable/1.15/Clp/configure

    r2009 r2010  
    59075907*-*-irix6*)
    59085908  # Find out which ABI we are using.
    5909   echo '#line 5901 "configure"' > conftest.$ac_ext
     5909  echo '#line 5909 "configure"' > conftest.$ac_ext
    59105910  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    59115911  (eval $ac_compile) 2>&5
     
    70417041
    70427042# Provide some information about the compiler.
    7043 echo "$as_me:7035:" \
     7043echo "$as_me:7043:" \
    70447044     "checking for Fortran 77 compiler version" >&5
    70457045ac_compiler=`set X $ac_compile; echo $2`
     
    81088108   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    81098109   -e 's:$: $lt_compiler_flag:'`
    8110    (eval echo "\"\$as_me:8102: $lt_compile\"" >&5)
     8110   (eval echo "\"\$as_me:8110: $lt_compile\"" >&5)
    81118111   (eval "$lt_compile" 2>conftest.err)
    81128112   ac_status=$?
    81138113   cat conftest.err >&5
    8114    echo "$as_me:8106: \$? = $ac_status" >&5
     8114   echo "$as_me:8114: \$? = $ac_status" >&5
    81158115   if (exit $ac_status) && test -s "$ac_outfile"; then
    81168116     # The compiler can only warn and ignore the option if not recognized
     
    83768376   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    83778377   -e 's:$: $lt_compiler_flag:'`
    8378    (eval echo "\"\$as_me:8370: $lt_compile\"" >&5)
     8378   (eval echo "\"\$as_me:8378: $lt_compile\"" >&5)
    83798379   (eval "$lt_compile" 2>conftest.err)
    83808380   ac_status=$?
    83818381   cat conftest.err >&5
    8382    echo "$as_me:8374: \$? = $ac_status" >&5
     8382   echo "$as_me:8382: \$? = $ac_status" >&5
    83838383   if (exit $ac_status) && test -s "$ac_outfile"; then
    83848384     # The compiler can only warn and ignore the option if not recognized
     
    84808480   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    84818481   -e 's:$: $lt_compiler_flag:'`
    8482    (eval echo "\"\$as_me:8474: $lt_compile\"" >&5)
     8482   (eval echo "\"\$as_me:8482: $lt_compile\"" >&5)
    84838483   (eval "$lt_compile" 2>out/conftest.err)
    84848484   ac_status=$?
    84858485   cat out/conftest.err >&5
    8486    echo "$as_me:8478: \$? = $ac_status" >&5
     8486   echo "$as_me:8486: \$? = $ac_status" >&5
    84878487   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    84888488   then
     
    1082510825  lt_status=$lt_dlunknown
    1082610826  cat > conftest.$ac_ext <<EOF
    10827 #line 10819 "configure"
     10827#line 10827 "configure"
    1082810828#include "confdefs.h"
    1082910829
     
    1092510925  lt_status=$lt_dlunknown
    1092610926  cat > conftest.$ac_ext <<EOF
    10927 #line 10919 "configure"
     10927#line 10927 "configure"
    1092810928#include "confdefs.h"
    1092910929
     
    1326913269   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1327013270   -e 's:$: $lt_compiler_flag:'`
    13271    (eval echo "\"\$as_me:13263: $lt_compile\"" >&5)
     13271   (eval echo "\"\$as_me:13271: $lt_compile\"" >&5)
    1327213272   (eval "$lt_compile" 2>conftest.err)
    1327313273   ac_status=$?
    1327413274   cat conftest.err >&5
    13275    echo "$as_me:13267: \$? = $ac_status" >&5
     13275   echo "$as_me:13275: \$? = $ac_status" >&5
    1327613276   if (exit $ac_status) && test -s "$ac_outfile"; then
    1327713277     # The compiler can only warn and ignore the option if not recognized
     
    1337313373   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1337413374   -e 's:$: $lt_compiler_flag:'`
    13375    (eval echo "\"\$as_me:13367: $lt_compile\"" >&5)
     13375   (eval echo "\"\$as_me:13375: $lt_compile\"" >&5)
    1337613376   (eval "$lt_compile" 2>out/conftest.err)
    1337713377   ac_status=$?
    1337813378   cat out/conftest.err >&5
    13379    echo "$as_me:13371: \$? = $ac_status" >&5
     13379   echo "$as_me:13379: \$? = $ac_status" >&5
    1338013380   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1338113381   then
     
    1494314943   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1494414944   -e 's:$: $lt_compiler_flag:'`
    14945    (eval echo "\"\$as_me:14937: $lt_compile\"" >&5)
     14945   (eval echo "\"\$as_me:14945: $lt_compile\"" >&5)
    1494614946   (eval "$lt_compile" 2>conftest.err)
    1494714947   ac_status=$?
    1494814948   cat conftest.err >&5
    14949    echo "$as_me:14941: \$? = $ac_status" >&5
     14949   echo "$as_me:14949: \$? = $ac_status" >&5
    1495014950   if (exit $ac_status) && test -s "$ac_outfile"; then
    1495114951     # The compiler can only warn and ignore the option if not recognized
     
    1504715047   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1504815048   -e 's:$: $lt_compiler_flag:'`
    15049    (eval echo "\"\$as_me:15041: $lt_compile\"" >&5)
     15049   (eval echo "\"\$as_me:15049: $lt_compile\"" >&5)
    1505015050   (eval "$lt_compile" 2>out/conftest.err)
    1505115051   ac_status=$?
    1505215052   cat out/conftest.err >&5
    15053    echo "$as_me:15045: \$? = $ac_status" >&5
     15053   echo "$as_me:15053: \$? = $ac_status" >&5
    1505415054   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1505515055   then
     
    1725417254   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1725517255   -e 's:$: $lt_compiler_flag:'`
    17256    (eval echo "\"\$as_me:17248: $lt_compile\"" >&5)
     17256   (eval echo "\"\$as_me:17256: $lt_compile\"" >&5)
    1725717257   (eval "$lt_compile" 2>conftest.err)
    1725817258   ac_status=$?
    1725917259   cat conftest.err >&5
    17260    echo "$as_me:17252: \$? = $ac_status" >&5
     17260   echo "$as_me:17260: \$? = $ac_status" >&5
    1726117261   if (exit $ac_status) && test -s "$ac_outfile"; then
    1726217262     # The compiler can only warn and ignore the option if not recognized
     
    1752217522   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1752317523   -e 's:$: $lt_compiler_flag:'`
    17524    (eval echo "\"\$as_me:17516: $lt_compile\"" >&5)
     17524   (eval echo "\"\$as_me:17524: $lt_compile\"" >&5)
    1752517525   (eval "$lt_compile" 2>conftest.err)
    1752617526   ac_status=$?
    1752717527   cat conftest.err >&5
    17528    echo "$as_me:17520: \$? = $ac_status" >&5
     17528   echo "$as_me:17528: \$? = $ac_status" >&5
    1752917529   if (exit $ac_status) && test -s "$ac_outfile"; then
    1753017530     # The compiler can only warn and ignore the option if not recognized
     
    1762617626   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1762717627   -e 's:$: $lt_compiler_flag:'`
    17628    (eval echo "\"\$as_me:17620: $lt_compile\"" >&5)
     17628   (eval echo "\"\$as_me:17628: $lt_compile\"" >&5)
    1762917629   (eval "$lt_compile" 2>out/conftest.err)
    1763017630   ac_status=$?
    1763117631   cat out/conftest.err >&5
    17632    echo "$as_me:17624: \$? = $ac_status" >&5
     17632   echo "$as_me:17632: \$? = $ac_status" >&5
    1763317633   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1763417634   then
     
    2494824948
    2494924949# Provide some information about the compiler.
    24950 echo "$as_me:24942:" \
     24950echo "$as_me:24950:" \
    2495124951     "checking for Fortran 77 compiler version" >&5
    2495224952ac_compiler=`set X $ac_compile; echo $2`
     
    2546925469ac_save_FFLAGS=$FFLAGS
    2547025470FFLAGS="$FFLAGS $ac_verb"
    25471 (eval echo $as_me:25463: \"$ac_link\") >&5
     25471(eval echo $as_me:25471: \"$ac_link\") >&5
    2547225472ac_f77_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
    2547325473echo "$ac_f77_v_output" >&5
     
    2554725547ac_save_FFLAGS=$FFLAGS
    2554825548FFLAGS="$FFLAGS $ac_cv_prog_f77_v"
    25549 (eval echo $as_me:25541: \"$ac_link\") >&5
     25549(eval echo $as_me:25549: \"$ac_link\") >&5
    2555025550ac_f77_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
    2555125551echo "$ac_f77_v_output" >&5
  • stable/1.15/Clp/src

  • stable/1.15/Clp/src/Makefile.am

    r2009 r2010  
    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)
  • stable/1.15/Clp/src/Makefile.in

    r2009 r2010  
    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        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@
     
    566560target_alias = @target_alias@
    567561AUTOMAKE_OPTIONS = foreign
    568 @COIN_HAS_OSI_TRUE@SUBDIRS = OsiClp
    569562
    570563########################################################################
     
    614607        $(am__append_4) $(am__append_5) $(am__append_6)
    615608
     609# List all additionally required libraries
     610@DEPENDENCY_LINKING_TRUE@libClp_la_LIBADD = $(CLPLIB_LIBS)
     611
    616612# This is for libtool
    617613libClp_la_LDFLAGS = $(LT_LDFLAGS)
     
    672668        CbcOrClpParam.cpp
    673669all: config.h config_clp.h
    674         $(MAKE) $(AM_MAKEFLAGS) all-recursive
     670        $(MAKE) $(AM_MAKEFLAGS) all-am
    675671
    676672.SUFFIXES:
     
    939935        done
    940936
    941 # This directory's subdirectories are mostly independent; you can cd
    942 # into them and run `make' without going through this Makefile.
    943 # To change the values of `make' variables: instead of editing Makefiles,
    944 # (1) if the variable is set in `config.status', edit `config.status'
    945 #     (which will cause the Makefiles to be regenerated when you run `make');
    946 # (2) otherwise, pass the desired values on the `make' command line.
    947 $(RECURSIVE_TARGETS):
    948         @failcom='exit 1'; \
    949         for f in x $$MAKEFLAGS; do \
    950           case $$f in \
    951             *=* | --[!k]*);; \
    952             *k*) failcom='fail=yes';; \
    953           esac; \
    954         done; \
    955         dot_seen=no; \
    956         target=`echo $@ | sed s/-recursive//`; \
    957         list='$(SUBDIRS)'; for subdir in $$list; do \
    958           echo "Making $$target in $$subdir"; \
    959           if test "$$subdir" = "."; then \
    960             dot_seen=yes; \
    961             local_target="$$target-am"; \
    962           else \
    963             local_target="$$target"; \
    964           fi; \
    965           (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
    966           || eval $$failcom; \
    967         done; \
    968         if test "$$dot_seen" = "no"; then \
    969           $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
    970         fi; test -z "$$fail"
    971 
    972 mostlyclean-recursive clean-recursive distclean-recursive \
    973 maintainer-clean-recursive:
    974         @failcom='exit 1'; \
    975         for f in x $$MAKEFLAGS; do \
    976           case $$f in \
    977             *=* | --[!k]*);; \
    978             *k*) failcom='fail=yes';; \
    979           esac; \
    980         done; \
    981         dot_seen=no; \
    982         case "$@" in \
    983           distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
    984           *) list='$(SUBDIRS)' ;; \
    985         esac; \
    986         rev=''; for subdir in $$list; do \
    987           if test "$$subdir" = "."; then :; else \
    988             rev="$$subdir $$rev"; \
    989           fi; \
    990         done; \
    991         rev="$$rev ."; \
    992         target=`echo $@ | sed s/-recursive//`; \
    993         for subdir in $$rev; do \
    994           echo "Making $$target in $$subdir"; \
    995           if test "$$subdir" = "."; then \
    996             local_target="$$target-am"; \
    997           else \
    998             local_target="$$target"; \
    999           fi; \
    1000           (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
    1001           || eval $$failcom; \
    1002         done && test -z "$$fail"
    1003 tags-recursive:
    1004         list='$(SUBDIRS)'; for subdir in $$list; do \
    1005           test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
    1006         done
    1007 ctags-recursive:
    1008         list='$(SUBDIRS)'; for subdir in $$list; do \
    1009           test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
    1010         done
    1011 
    1012937ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
    1013938        list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
     
    1020945tags: TAGS
    1021946
    1022 TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in config_clp.h.in $(TAGS_DEPENDENCIES) \
     947TAGS: $(HEADERS) $(SOURCES) config.h.in config_clp.h.in $(TAGS_DEPENDENCIES) \
    1023948                $(TAGS_FILES) $(LISP)
    1024949        tags=; \
    1025950        here=`pwd`; \
    1026         if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
    1027           include_option=--etags-include; \
    1028           empty_fix=.; \
    1029         else \
    1030           include_option=--include; \
    1031           empty_fix=; \
    1032         fi; \
    1033         list='$(SUBDIRS)'; for subdir in $$list; do \
    1034           if test "$$subdir" = .; then :; else \
    1035             test ! -f $$subdir/TAGS || \
    1036               tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
    1037           fi; \
    1038         done; \
    1039951        list='$(SOURCES) $(HEADERS) config.h.in config_clp.h.in $(LISP) $(TAGS_FILES)'; \
    1040952        unique=`for i in $$list; do \
     
    1049961        fi
    1050962ctags: CTAGS
    1051 CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in config_clp.h.in $(TAGS_DEPENDENCIES) \
     963CTAGS: $(HEADERS) $(SOURCES) config.h.in config_clp.h.in $(TAGS_DEPENDENCIES) \
    1052964                $(TAGS_FILES) $(LISP)
    1053965        tags=; \
     
    10981010          fi; \
    10991011        done
    1100         list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
    1101           if test "$$subdir" = .; then :; else \
    1102             test -d "$(distdir)/$$subdir" \
    1103             || $(mkdir_p) "$(distdir)/$$subdir" \
    1104             || exit 1; \
    1105             distdir=`$(am__cd) $(distdir) && pwd`; \
    1106             top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
    1107             (cd $$subdir && \
    1108               $(MAKE) $(AM_MAKEFLAGS) \
    1109                 top_distdir="$$top_distdir" \
    1110                 distdir="$$distdir/$$subdir" \
    1111                 distdir) \
    1112               || exit 1; \
    1113           fi; \
    1114         done
    11151012check-am: all-am
    1116 check: check-recursive
     1013check: check-am
    11171014all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS) config.h \
    11181015                config_clp.h
    11191016install-binPROGRAMS: install-libLTLIBRARIES
    11201017
    1121 installdirs: installdirs-recursive
    1122 installdirs-am:
     1018installdirs:
    11231019        for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(includecoindir)"; do \
    11241020          test -z "$$dir" || $(mkdir_p) "$$dir"; \
    11251021        done
    1126 install: install-recursive
    1127 install-exec: install-exec-recursive
    1128 install-data: install-data-recursive
    1129 uninstall: uninstall-recursive
     1022install: install-am
     1023install-exec: install-exec-am
     1024install-data: install-data-am
     1025uninstall: uninstall-am
    11301026
    11311027install-am: all-am
    11321028        @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
    11331029
    1134 installcheck: installcheck-recursive
     1030installcheck: installcheck-am
    11351031install-strip:
    11361032        $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
     
    11491045        @echo "it deletes files that may require special tools to rebuild."
    11501046@COIN_CXX_IS_CL_FALSE@install-exec-hook:
    1151 clean: clean-recursive
     1047clean: clean-am
    11521048
    11531049clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
    11541050        clean-libtool mostlyclean-am
    11551051
    1156 distclean: distclean-recursive
     1052distclean: distclean-am
    11571053        -rm -rf ./$(DEPDIR)
    11581054        -rm -f Makefile
     
    11601056        distclean-hdr distclean-libtool distclean-tags
    11611057
    1162 dvi: dvi-recursive
     1058dvi: dvi-am
    11631059
    11641060dvi-am:
    11651061
    1166 html: html-recursive
    1167 
    1168 info: info-recursive
     1062html: html-am
     1063
     1064info: info-am
    11691065
    11701066info-am:
     
    11771073        $(MAKE) $(AM_MAKEFLAGS) install-exec-hook
    11781074
    1179 install-info: install-info-recursive
     1075install-info: install-info-am
    11801076
    11811077install-man:
     
    11831079installcheck-am:
    11841080
    1185 maintainer-clean: maintainer-clean-recursive
     1081maintainer-clean: maintainer-clean-am
    11861082        -rm -rf ./$(DEPDIR)
    11871083        -rm -f Makefile
    11881084maintainer-clean-am: distclean-am maintainer-clean-generic
    11891085
    1190 mostlyclean: mostlyclean-recursive
     1086mostlyclean: mostlyclean-am
    11911087
    11921088mostlyclean-am: mostlyclean-compile mostlyclean-generic \
    11931089        mostlyclean-libtool
    11941090
    1195 pdf: pdf-recursive
     1091pdf: pdf-am
    11961092
    11971093pdf-am:
    11981094
    1199 ps: ps-recursive
     1095ps: ps-am
    12001096
    12011097ps-am:
     
    12041100        uninstall-info-am uninstall-libLTLIBRARIES uninstall-local
    12051101
    1206 uninstall-info: uninstall-info-recursive
    1207 
    1208 .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
    1209         clean clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
    1210         clean-libtool clean-recursive ctags ctags-recursive distclean \
    1211         distclean-compile distclean-generic distclean-hdr \
    1212         distclean-libtool distclean-recursive distclean-tags distdir \
    1213         dvi dvi-am html html-am info info-am install install-am \
    1214         install-binPROGRAMS install-data install-data-am install-exec \
    1215         install-exec-am install-exec-hook install-exec-local \
     1102.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
     1103        clean-generic clean-libLTLIBRARIES clean-libtool ctags \
     1104        distclean distclean-compile distclean-generic distclean-hdr \
     1105        distclean-libtool distclean-tags distdir dvi dvi-am html \
     1106        html-am info info-am install install-am install-binPROGRAMS \
     1107        install-data install-data-am install-exec install-exec-am \
     1108        install-exec-hook install-exec-local \
    12161109        install-includecoinHEADERS install-info install-info-am \
    12171110        install-libLTLIBRARIES install-man install-strip installcheck \
    1218         installcheck-am installdirs installdirs-am maintainer-clean \
    1219         maintainer-clean-generic maintainer-clean-recursive \
    1220         mostlyclean mostlyclean-compile mostlyclean-generic \
    1221         mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
    1222         tags tags-recursive uninstall uninstall-am \
    1223         uninstall-binPROGRAMS uninstall-includecoinHEADERS \
    1224         uninstall-info-am uninstall-libLTLIBRARIES uninstall-local
     1111        installcheck-am installdirs maintainer-clean \
     1112        maintainer-clean-generic mostlyclean mostlyclean-compile \
     1113        mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
     1114        tags uninstall uninstall-am uninstall-binPROGRAMS \
     1115        uninstall-includecoinHEADERS uninstall-info-am \
     1116        uninstall-libLTLIBRARIES uninstall-local
    12251117
    12261118
  • stable/1.15/Clp/src/OsiClp

  • stable/1.15/Clp/src/OsiClp/Makefile.am

    r1781 r2010  
    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)
  • stable/1.15/Clp/src/OsiClp/Makefile.in

    r2009 r2010  
    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)
     
    359361libOsiClp_la_SOURCES = OsiClpSolverInterface.cpp OsiClpSolverInterface.hpp
    360362
     363# List all additionally required libraries
     364@DEPENDENCY_LINKING_TRUE@libOsiClp_la_LIBADD = $(OSICLPLIB_LIBS) ../libClp.la
     365
    361366# This is for libtool (on Windows)
    362367libOsiClp_la_LDFLAGS = $(LT_LDFLAGS)
Note: See TracChangeset for help on using the changeset viewer.