Changeset 2904


Ignore:
Timestamp:
Mar 19, 2020 3:24:27 PM (23 months ago)
Author:
stefan
Message:

some cleanup; rerun autotools; add ar-lib

Location:
trunk
Files:
1 added
9 edited

Legend:

Unmodified
Added
Removed
  • trunk/Makefile.am

    r2857 r2904  
    66
    77# Author:  Andreas Waechter           IBM    2006-04-13
    8 
    9 AUTOMAKE_OPTIONS = foreign
    10 
    11 include BuildTools/Makemain.inc
    128
    139########################################################################
     
    9894        if test -r test/Makefile; then cd test; $(MAKE) clean; fi
    9995
    100 distclean-local:
    101         if test -r test/Makefile; then cd test; $(MAKE) distclean; fi
    102 
    10396install-exec-local: install-doc
    10497
     
    107100.PHONY: test unitTest doxydoc
    108101
    109 ########################################################################
    110 #                         Maintainer Stuff                             #
    111 ########################################################################
    112 
    113 CLEANFILES =
    114 
    115 # Files that are generated and should be cleaned with make distclean
    116 
    117 DISTCLEANFILES =
    118 
     102include BuildTools/Makemain.inc
  • trunk/Makefile.in

    r2857 r2904  
    2020
    2121# Author:  Andreas Waechter           IBM    2006-04-13
     22
     23########################################################################
     24#                          Subdirectories                              #
     25########################################################################
    2226
    2327# Copyright (C) 2006, 2007 International Business Machines and others.
     
    379383top_builddir = @top_builddir@
    380384top_srcdir = @top_srcdir@
    381 AUTOMAKE_OPTIONS = foreign
    382 pkgdocdir = $(docdir)
    383 
    384 # doxydocdir is the top-level directory for doxygen documentation. It holds
    385 # the tag file and possibly the PDF or Postscript version. doxyhtmldir is
    386 # typically a subdirectory containing all the files doxygen creates for
    387 # html documentation.
    388 doxydocdir = $(pkgdocdir)/doxydoc
    389 doxyhtmldir = $(doxydocdir)/html
    390 
    391 ########################################################################
    392 #                    Documentation installation                        #
    393 ########################################################################
    394 DocFiles = README AUTHORS LICENSE
    395 COIN_HAS_DOXYGEN = @COIN_HAS_DOXYGEN_TRUE@TRUE
    396 COIN_HAS_LATEX = @COIN_HAS_LATEX_TRUE@TRUE
    397 
    398 # Needless to say, it's important that baredocdir_nosub not be a target for
    399 # autoconf substitution.
    400 DOXYTAG_EDIT = sed -e 's|@baredocdir_nosub@|$(datarootdir)/doc|g'
    401 
    402 ########################################################################
    403 #                          Subdirectories                              #
    404 ########################################################################
    405385SUBDIRS = src src/OsiCbc $(am__append_1)
    406386pkgconfiglibdir = $(libdir)/pkgconfig
     
    461441        examples/sudoku_sample.csv
    462442
    463 
    464 ########################################################################
    465 #                         Maintainer Stuff                             #
    466 ########################################################################
    467 CLEANFILES =
    468 
    469 # Files that are generated and should be cleaned with make distclean
    470 DISTCLEANFILES =
     443pkgdocdir = $(docdir)
     444
     445# doxydocdir is the top-level directory for doxygen documentation. It holds
     446# the tag file and possibly the PDF or Postscript version. doxyhtmldir is
     447# typically a subdirectory containing all the files doxygen creates for
     448# html documentation.
     449doxydocdir = $(pkgdocdir)/doxydoc
     450doxyhtmldir = $(doxydocdir)/html
     451
     452########################################################################
     453#                    Documentation installation                        #
     454########################################################################
     455DocFiles = README AUTHORS LICENSE
     456COIN_HAS_DOXYGEN = @COIN_HAS_DOXYGEN_TRUE@TRUE
     457COIN_HAS_LATEX = @COIN_HAS_LATEX_TRUE@TRUE
     458
     459# Needless to say, it's important that baredocdir_nosub not be a target for
     460# autoconf substitution.
     461DOXYTAG_EDIT = sed -e 's|@baredocdir_nosub@|$(datarootdir)/doc|g'
    471462all: all-recursive
    472463
     
    680671
    681672clean-generic:
    682         -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
    683673
    684674distclean-generic:
    685675        -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
    686676        -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
    687         -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
    688677
    689678maintainer-clean-generic:
     
    698687        -rm -f Makefile
    699688distclean-am: clean-am distclean-generic distclean-libtool \
    700         distclean-local distclean-tags
     689        distclean-tags
    701690
    702691dvi: dvi-recursive
     
    765754        am--refresh check check-am clean clean-cscope clean-generic \
    766755        clean-libtool clean-local cscope cscopelist-am ctags ctags-am \
    767         distclean distclean-generic distclean-libtool distclean-local \
    768         distclean-tags dvi dvi-am html html-am info info-am install \
    769         install-am install-data install-data-am install-dvi \
    770         install-dvi-am install-exec install-exec-am install-exec-local \
    771         install-html install-html-am install-info install-info-am \
    772         install-man install-pdf install-pdf-am \
    773         install-pkgconfiglibDATA install-ps install-ps-am \
    774         install-strip installcheck installcheck-am installdirs \
    775         installdirs-am maintainer-clean maintainer-clean-generic \
    776         mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
    777         ps ps-am tags tags-am uninstall uninstall-am uninstall-local \
    778         uninstall-pkgconfiglibDATA
     756        distclean distclean-generic distclean-libtool distclean-tags \
     757        dvi dvi-am html html-am info info-am install install-am \
     758        install-data install-data-am install-dvi install-dvi-am \
     759        install-exec install-exec-am install-exec-local install-html \
     760        install-html-am install-info install-info-am install-man \
     761        install-pdf install-pdf-am install-pkgconfiglibDATA install-ps \
     762        install-ps-am install-strip installcheck installcheck-am \
     763        installdirs installdirs-am maintainer-clean \
     764        maintainer-clean-generic mostlyclean mostlyclean-generic \
     765        mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
     766        uninstall-am uninstall-local uninstall-pkgconfiglibDATA
    779767
    780768.PRECIOUS: Makefile
    781769
     770
     771########################################################################
     772#                           Extra Targets                              #
     773########################################################################
     774
     775test: all
     776        cd test; $(MAKE) test
     777
     778unitTest: test
     779
     780clean-local: clean-doxygen-docs
     781        if test -r test/Makefile; then cd test; $(MAKE) clean; fi
     782
     783install-exec-local: install-doc
     784
     785uninstall-local: uninstall-doc uninstall-doxygen-docs
     786
     787.PHONY: test unitTest doxydoc
    782788
    783789doxygen-docs:
     
    888894        install-doxygen-docs uninstall-doxygen-docs
    889895
    890 ########################################################################
    891 #                           Extra Targets                              #
    892 ########################################################################
    893 
    894 test: all
    895         cd test; $(MAKE) test
    896 
    897 unitTest: test
    898 
    899 clean-local: clean-doxygen-docs
    900         if test -r test/Makefile; then cd test; $(MAKE) clean; fi
    901 
    902 distclean-local:
    903         if test -r test/Makefile; then cd test; $(MAKE) distclean; fi
    904 
    905 install-exec-local: install-doc
    906 
    907 uninstall-local: uninstall-doc uninstall-doxygen-docs
    908 
    909 .PHONY: test unitTest doxydoc
    910 
    911896# Tell versions [3.59,3.63) of GNU make to not export all variables.
    912897# Otherwise a system limit (for SysV at least) may be exceeded.
  • trunk/configure

    r2886 r2904  
    756756MANIFEST_TOOL
    757757RANLIB
    758 ac_ct_AR
    759 AR
    760758LN_S
    761759NM
     
    771769DLLTOOL
    772770AS
     771ac_ct_AR
     772AR
    773773ADD_CXXFLAGS
    774774am__fastdepCXX_FALSE
     
    28962896      : ${CFLAGS:="-nologo -Z7 -MDd $ADD_CFLAGS"}
    28972897      : ${CXXFLAGS:="-nologo -EHs -Z7 -MDd $ADD_CXXFLAGS"}
    2898       : ${AR:="lib"}
    2899       : ${AR_FLAGS:="-nologo -out:"}
    29002898    else
    29012899      : ${FFLAGS:="-g $ADD_FFLAGS"}
     
    29102908      : ${CFLAGS:="-nologo -DNDEBUG -O2 -MD $ADD_CFLAGS"}
    29112909      : ${CXXFLAGS:="-nologo -EHs -DNDEBUG -O2 -MD $ADD_CXXFLAGS"}
    2912       : ${AR:="lib"}
    2913       : ${AR_FLAGS:="-nologo -out:"}
    29142910    else
    29152911      : ${FFLAGS:="-O2 $ADD_FFLAGS"}
     
    34973493
    34983494# Initialize automake
     3495# - do not be as strict as for GNU projects
    34993496# - don't AC_DEFINE PACKAGE or VERSION (but there're still defined as shell
    35003497#   variables in configure, and as make variables).
    35013498# - disable dist target
     3499# - place objects from sources in subdirs into corresponding subdirs
    35023500# - enable all automake warnings
    35033501
     
    38063804      ac_cv_prog_CC="$CC"
    38073805      LD="$CC"
     3806      : ${AR:=lib}
    38083807    else
    38093808      as_fn_error $? "Neither MS nor Intel C compiler found in PATH and CC is unset." "$LINENO" 5
     
    46634662      ac_cv_prog_CXX="$CXX"
    46644663      LD="$CXX"
     4664      : ${AR:=lib}
    46654665    else
    46664666      as_fn_error $? "Neither MS nor Intel C++ compiler found in PATH and CXX is unset." "$LINENO" 5
     
    51335133
    51345134# Initialize libtool
     5135
    51355136
    51365137case `pwd` in
     
    66206621sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
    66216622test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
    6622 
    66236623
    66246624
     
    88388838
    88398839
     8840# checkout AR and decide whether to use ar-lib wrapper
     8841  if test -n "$ac_tool_prefix"; then
     8842  for ac_prog in ar lib "link -lib"
     8843  do
     8844    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
     8845set dummy $ac_tool_prefix$ac_prog; ac_word=$2
     8846{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     8847$as_echo_n "checking for $ac_word... " >&6; }
     8848if ${ac_cv_prog_AR+:} false; then :
     8849  $as_echo_n "(cached) " >&6
     8850else
     8851  if test -n "$AR"; then
     8852  ac_cv_prog_AR="$AR" # Let the user override the test.
     8853else
     8854as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     8855for as_dir in $PATH
     8856do
     8857  IFS=$as_save_IFS
     8858  test -z "$as_dir" && as_dir=.
     8859    for ac_exec_ext in '' $ac_executable_extensions; do
     8860  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     8861    ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
     8862    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     8863    break 2
     8864  fi
     8865done
     8866  done
     8867IFS=$as_save_IFS
     8868
     8869fi
     8870fi
     8871AR=$ac_cv_prog_AR
     8872if test -n "$AR"; then
     8873  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
     8874$as_echo "$AR" >&6; }
     8875else
     8876  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     8877$as_echo "no" >&6; }
     8878fi
     8879
     8880
     8881    test -n "$AR" && break
     8882  done
     8883fi
     8884if test -z "$AR"; then
     8885  ac_ct_AR=$AR
     8886  for ac_prog in ar lib "link -lib"
     8887do
     8888  # Extract the first word of "$ac_prog", so it can be a program name with args.
     8889set dummy $ac_prog; ac_word=$2
     8890{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     8891$as_echo_n "checking for $ac_word... " >&6; }
     8892if ${ac_cv_prog_ac_ct_AR+:} false; then :
     8893  $as_echo_n "(cached) " >&6
     8894else
     8895  if test -n "$ac_ct_AR"; then
     8896  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
     8897else
     8898as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     8899for as_dir in $PATH
     8900do
     8901  IFS=$as_save_IFS
     8902  test -z "$as_dir" && as_dir=.
     8903    for ac_exec_ext in '' $ac_executable_extensions; do
     8904  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     8905    ac_cv_prog_ac_ct_AR="$ac_prog"
     8906    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     8907    break 2
     8908  fi
     8909done
     8910  done
     8911IFS=$as_save_IFS
     8912
     8913fi
     8914fi
     8915ac_ct_AR=$ac_cv_prog_ac_ct_AR
     8916if test -n "$ac_ct_AR"; then
     8917  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
     8918$as_echo "$ac_ct_AR" >&6; }
     8919else
     8920  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     8921$as_echo "no" >&6; }
     8922fi
     8923
     8924
     8925  test -n "$ac_ct_AR" && break
     8926done
     8927
     8928  if test "x$ac_ct_AR" = x; then
     8929    AR="false"
     8930  else
     8931    case $cross_compiling:$ac_tool_warned in
     8932yes:)
     8933{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
     8934$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
     8935ac_tool_warned=yes ;;
     8936esac
     8937    AR=$ac_ct_AR
     8938  fi
     8939fi
     8940
     8941: ${AR=ar}
     8942
     8943{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the archiver ($AR) interface" >&5
     8944$as_echo_n "checking the archiver ($AR) interface... " >&6; }
     8945if ${am_cv_ar_interface+:} false; then :
     8946  $as_echo_n "(cached) " >&6
     8947else
     8948  ac_ext=c
     8949ac_cpp='$CPP $CPPFLAGS'
     8950ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
     8951ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
     8952ac_compiler_gnu=$ac_cv_c_compiler_gnu
     8953
     8954   am_cv_ar_interface=ar
     8955   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     8956/* end confdefs.h.  */
     8957int some_variable = 0;
     8958_ACEOF
     8959if ac_fn_c_try_compile "$LINENO"; then :
     8960  am_ar_try='$AR cru libconftest.a conftest.$ac_objext >&5'
     8961      { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$am_ar_try\""; } >&5
     8962  (eval $am_ar_try) 2>&5
     8963  ac_status=$?
     8964  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
     8965  test $ac_status = 0; }
     8966      if test "$ac_status" -eq 0; then
     8967        am_cv_ar_interface=ar
     8968      else
     8969        am_ar_try='$AR -NOLOGO -OUT:conftest.lib conftest.$ac_objext >&5'
     8970        { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$am_ar_try\""; } >&5
     8971  (eval $am_ar_try) 2>&5
     8972  ac_status=$?
     8973  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
     8974  test $ac_status = 0; }
     8975        if test "$ac_status" -eq 0; then
     8976          am_cv_ar_interface=lib
     8977        else
     8978          am_cv_ar_interface=unknown
     8979        fi
     8980      fi
     8981      rm -f conftest.lib libconftest.a
     8982
     8983fi
     8984rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     8985   ac_ext=c
     8986ac_cpp='$CPP $CPPFLAGS'
     8987ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
     8988ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
     8989ac_compiler_gnu=$ac_cv_c_compiler_gnu
     8990
     8991fi
     8992{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_ar_interface" >&5
     8993$as_echo "$am_cv_ar_interface" >&6; }
     8994
     8995case $am_cv_ar_interface in
     8996ar)
     8997  ;;
     8998lib)
     8999  # Microsoft lib, so override with the ar-lib wrapper script.
     9000  # FIXME: It is wrong to rewrite AR.
     9001  # But if we don't then we get into trouble of one sort or another.
     9002  # A longer-term fix would be to have automake use am__AR in this case,
     9003  # and then we could set am__AR="$am_aux_dir/ar-lib \$(AR)" or something
     9004  # similar.
     9005  AR="$am_aux_dir/ar-lib $AR"
     9006  ;;
     9007unknown)
     9008  as_fn_error $? "could not determine $AR interface" "$LINENO" 5
     9009  ;;
     9010esac
     9011
     9012
    88409013# Create libtool.
    8841 
    88429014
    88439015
     
    1673916911# Patch libtool to circumvent some issues when using MSVC and MS lib.
    1674016912# This needs to be run after config.status has created libtool.
    16741 # 1. Eliminate a trailing space after AR_FLAGS. Apparently necessary on
    16742 #    Windows when AR=lib.exe.
    16743 # 2. Patch libtool's func_extract_an_archive in case of $AR=lib. The current
    16744 #    libtool implementation assumes that it can do $AR x to extract an archive.
    16745 #    We replace this two-liner in func_extract_an_archive by replacing the first
    16746 #    line by something clunky that works with lib and making sure that the following
    16747 #    line is ignored (by finishing with ": \"). We completely disregard running the
    16748 #    command through func_show_eval and do not stop if it fails.
    16749 # 3. Relax check which libraries can be used when linking a DLL.
     16913# 1. Relax check which libraries can be used when linking a DLL.
    1675016914#    libtool's func_mode_link() would reject linking a .lib file when building a DLL,
    1675116915#    even though this .lib file may just be the one that eventually loads a depending DLL,
    1675216916#    e.g., mkl_core_dll.lib. Setting deplibs_check_method=pass_all will still print a
    1675316917#    warning, but the .lib is still passed to the linker.
    16754 # 4. Ensure always_export_symbols=no if win32-dll. Even when we pass win32-dll,
     16918# 2. Ensure always_export_symbols=no if win32-dll. Even when we pass win32-dll,
    1675516919#    libtool forces always_export_symbols=yes for --tag=CXX if using MS compiler.
    1675616920#    This leads to a nm call that collects ALL C-functions from a library
    1675716921#    and explicitly dll-exporting them, leading to warnings about duplicates
    1675816922#    regarding those that are properly marked for dll-export in the source.
    16759 # 5. Do not add mkl_*.lib to old_deplibs, which can result in trying to unpack and repack
     16923# 3. Do not add mkl_*.lib to old_deplibs, which can result in trying to unpack and repack
    1676016924#    the MKL libraries (which are pretty big). Instead, treat them like other -l<...> libs.
    16761 # 6. Add MKL libraries to dependency_libs in .la file, which I guess should be
     16925# 4. Add MKL libraries to dependency_libs in .la file, which I guess should be
    1676216926#    the case due to point 5.
    1676316927#
     
    1677016934#    this faulty check.
    1677116935
    16772   case "$AR" in
    16773     *lib* | *LIB* )
     16936  case "$am_cv_ar_interface" in
     16937    lib )
    1677416938      ac_config_commands="$ac_config_commands libtoolclpatch"
    1677516939
     
    2573225896
    2573325897 ;;
    25734     "libtoolclpatch":C) sed -e 's|AR_FLAGS |AR_FLAGS|g' \
    25735              -e '/$AR x/s/.*/( cd $f_ex_an_ar_dir ; for f in `$AR -nologo -list "$f_ex_an_ar_oldlib" | tr "\\r" " "` ; do lib -nologo -extract:$f "$f_ex_an_ar_oldlib"; done ); : \\/g' \
    25736              -e '/^deplibs_check_method/s/.*/deplibs_check_method="pass_all"/g' \
     25898    "libtoolclpatch":C) sed -e '/^deplibs_check_method/s/.*/deplibs_check_method="pass_all"/g' \
    2573725899             -e 's|always_export_symbols=yes|always_export_symbols=no|g' \
    2573825900             -e '/func_append old_deplibs/s/\(.*\)/case $arg in *mkl_*.lib) ;; *) \1 ;; esac/g' \
  • trunk/src/Makefile.am

    r2849 r2904  
    66
    77# Author:  Andreas Waechter           IBM    2006-04-13
    8 
    9 AUTOMAKE_OPTIONS = foreign
    10 
    11 include $(top_srcdir)/BuildTools/Makemain.inc
    128
    139########################################################################
     
    186182
    187183# Additional options for libtool
    188 LDFLAGS += $(LT_LDFLAGS)
     184AM_LDFLAGS = $(LT_LDFLAGS)
    189185
    190186########################################################################
  • trunk/src/Makefile.in

    r2849 r2904  
    2121# Author:  Andreas Waechter           IBM    2006-04-13
    2222
    23 # Copyright (C) 2006, 2007 International Business Machines and others.
    24 # All Rights Reserved.
    25 # This file is distributed under the Eclipse Public License.
    26 
    27 # Author:  Andreas Waechter           IBM    2006-04-13
    28 
    2923########################################################################
    30 #        Variables for documentation and data directories              #
     24#                               libCbc                                 #
    3125########################################################################
    32 
    33 # Set these up to provide some uniformity in naming while also conforming
    34 # to Gnu directory standards. For reasons known only to the autoconf
    35 # developers, autoconf leaves datadir = $(datarootdir) but forces docdir
    36 # to $(datarootdir)/doc/$(PACKAGE_TARNAME).
    3726
    3827
     
    9483am__make_dryrun = (target_option=n; $(am__make_running_with_option))
    9584am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
     85pkgdatadir = $(datadir)/@PACKAGE@
     86pkgincludedir = $(includedir)/@PACKAGE@
    9687pkglibdir = $(libdir)/@PACKAGE@
    9788pkglibexecdir = $(libexecdir)/@PACKAGE@
     
    413404ETAGS = etags
    414405CTAGS = ctags
    415 pkgdatadir = $(datadir)/$(PACKAGE_TARNAME)
    416 pkgincludedir = $(includedir)/coin-or
    417406ACLOCAL = @ACLOCAL@
    418407ADD_CFLAGS = @ADD_CFLAGS@
     
    475464INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
    476465LD = @LD@
    477 
    478 # Additional options for libtool
    479 LDFLAGS = @LDFLAGS@ $(LT_LDFLAGS)
     466LDFLAGS = @LDFLAGS@
    480467LIBOBJS = @LIBOBJS@
    481468LIBS = @LIBS@
     
    580567top_builddir = @top_builddir@
    581568top_srcdir = @top_srcdir@
    582 AUTOMAKE_OPTIONS = foreign
    583 pkgdocdir = $(docdir)
    584 
    585 # doxydocdir is the top-level directory for doxygen documentation. It holds
    586 # the tag file and possibly the PDF or Postscript version. doxyhtmldir is
    587 # typically a subdirectory containing all the files doxygen creates for
    588 # html documentation.
    589 doxydocdir = $(pkgdocdir)/doxydoc
    590 doxyhtmldir = $(doxydocdir)/html
    591 
    592 ########################################################################
    593 #                    Documentation installation                        #
    594 ########################################################################
    595 DocFiles = README AUTHORS LICENSE
    596 COIN_HAS_DOXYGEN = @COIN_HAS_DOXYGEN_TRUE@TRUE
    597 COIN_HAS_LATEX = @COIN_HAS_LATEX_TRUE@TRUE
    598 
    599 # Needless to say, it's important that baredocdir_nosub not be a target for
    600 # autoconf substitution.
    601 DOXYTAG_EDIT = sed -e 's|@baredocdir_nosub@|$(datarootdir)/doc|g'
    602 
    603 ########################################################################
    604 #                               libCbc                                 #
    605 ########################################################################
    606569
    607570# Name of the library compiled in this directory.  We want it to be installed
     
    734697
    735698@CBC_BUILD_CBC_GENERIC_TRUE@cbc_generic_LDADD = libCbcSolver.la libCbc.la $(CBCGENERIC_LFLAGS)
     699
     700# Additional options for libtool
     701AM_LDFLAGS = $(LT_LDFLAGS)
    736702
    737703########################################################################
     
    823789.SUFFIXES:
    824790.SUFFIXES: .cpp .lo .o .obj
    825 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/BuildTools/Makemain.inc $(am__configure_deps)
     791$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
    826792        @for dep in $?; do \
    827793          case '$(am__configure_deps)' in \
     
    843809            cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
    844810        esac;
    845 $(top_srcdir)/BuildTools/Makemain.inc $(am__empty):
    846811
    847812$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
     
    10841049
    10851050.cpp.o:
    1086 @am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
    1087 @am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
     1051@am__fastdepCXX_TRUE@   $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
     1052@am__fastdepCXX_TRUE@   $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
     1053@am__fastdepCXX_TRUE@   $(am__mv) $$depbase.Tpo $$depbase.Po
    10881054@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
    10891055@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     
    10911057
    10921058.cpp.obj:
    1093 @am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
    1094 @am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
     1059@am__fastdepCXX_TRUE@   $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
     1060@am__fastdepCXX_TRUE@   $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
     1061@am__fastdepCXX_TRUE@   $(am__mv) $$depbase.Tpo $$depbase.Po
    10951062@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
    10961063@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     
    10981065
    10991066.cpp.lo:
    1100 @am__fastdepCXX_TRUE@   $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
    1101 @am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
     1067@am__fastdepCXX_TRUE@   $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
     1068@am__fastdepCXX_TRUE@   $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
     1069@am__fastdepCXX_TRUE@   $(am__mv) $$depbase.Tpo $$depbase.Plo
    11021070@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
    11031071@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     
    20221990
    20231991
    2024 doxygen-docs:
    2025         if test "$(COIN_HAS_DOXYGEN)" = TRUE; then \
    2026           if test -d "doxydoc/"; then \
    2027             if test -f doxydoc/doxygen.conf ; then \
    2028               $(DOXYTAG_EDIT) \
    2029                 doxydoc/doxygen.conf > doxydoc/doxygen.conf.tmp ; \
    2030               mv doxydoc/doxygen.conf.tmp doxydoc/doxygen.conf ; \
    2031             fi ; \
    2032             doxygen doxydoc/doxygen.conf;\
    2033           fi;\
    2034         fi
    2035 
    2036 pdf-doxygen-docs: doxygen-docs
    2037         if test "$(COIN_HAS_DOXYGEN)" = TRUE; then \
    2038           if test -d "doxydoc/latex"; then \
    2039             if test "$(COIN_HAS_LATEX)" = TRUE; then \
    2040               cd doxydoc/latex;\
    2041               $(MAKE) pdf;\
    2042               cd -;\
    2043             fi;\
    2044           fi;\
    2045         fi
    2046 
    2047 clean-doxygen-docs:
    2048         if test -d "doxydoc"; then \
    2049           cd doxydoc ;\
    2050           rm -rf html latex *.log *.tag;\
    2051         fi
    2052 
    2053 install-doxygen-docs: doxygen-docs
    2054         if test "$(COIN_HAS_DOXYGEN)" = TRUE; then \
    2055           if test -d "doxydoc"; then \
    2056             test -d "$(DESTDIR)$(doxydocdir)" || \
    2057                  $(mkdir_p) "$(DESTDIR)$(doxydocdir)"; \
    2058             $(INSTALL_DATA) doxydoc/@coin_doxy_tagname@ \
    2059                 "$(DESTDIR)$(doxydocdir)"; \
    2060             if test -f "doxydoc/latex/refman.pdf"; then \
    2061               $(INSTALL_DATA) doxydoc/latex/refman.pdf \
    2062                   "$(DESTDIR)$(doxydocdir)";\
    2063             fi;\
    2064             if test -d "doxydoc/html"; then \
    2065               test -d "$(DESTDIR)$(doxyhtmldir)/search/" || \
    2066                    $(mkdir_p) "$(DESTDIR)$(doxyhtmldir)/search/"; \
    2067               $(INSTALL_DATA) doxydoc/html/*.* \
    2068                   "$(DESTDIR)$(doxyhtmldir)";\
    2069               $(INSTALL_DATA) doxydoc/html/search/*.* \
    2070                   "$(DESTDIR)$(doxyhtmldir)/search";\
    2071             fi;\
    2072           fi;\
    2073         fi
    2074 
    2075 # It's not clear that uninstall-doc should also remove doxygen doc'n. Write
    2076 # the rules so that the last one will remove pkgdocdir (which should be empty
    2077 # by then).
    2078 
    2079 uninstall-doxygen-docs:
    2080         if test -d "$(DESTDIR)$(doxydocdir)"; then \
    2081           rm -rf "$(DESTDIR)$(doxydocdir)"; \
    2082         fi
    2083         rmdir $(DESTDIR)$(pkgdocdir) || true
    2084 
    2085 install-doc:
    2086         $(mkdir_p) "$(DESTDIR)$(pkgdocdir)"
    2087         for file in $(DocFiles); do \
    2088           if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \
    2089           if test -f "$$dir$$file"; then \
    2090             $(INSTALL_DATA) "$$dir$$file" "$(DESTDIR)$(pkgdocdir)/$$file"; \
    2091           fi; \
    2092         done
    2093 
    2094 uninstall-doc:
    2095         for file in $(DocFiles); do \
    2096           rm -f "$(DESTDIR)$(pkgdocdir)/$$file"; \
    2097         done
    2098         rmdir $(DESTDIR)$(pkgdocdir) || true
    2099 
    2100 ########################################################################
    2101 #                         Maintainer Stuff                             #
    2102 ########################################################################
    2103 
    2104 # Make sure acinclude is using most recent coin.m4
    2105 @MAINTAINER_MODE_TRUE@$(srcdir)/acinclude.m4: $(BUILDTOOLSDIR)/coin.m4
    2106 @MAINTAINER_MODE_TRUE@  cat $(LIBTOOLM4) $< > $@
    2107 
    2108 # Make sure the autotools scripts are up to date
    2109 @MAINTAINER_MODE_TRUE@$(AUX_DIR)/install-sh: $(BUILDTOOLSDIR)/install-sh
    2110 @MAINTAINER_MODE_TRUE@  cp $< $@
    2111 
    2112 @MAINTAINER_MODE_TRUE@$(AUX_DIR)/missing: $(BUILDTOOLSDIR)/missing
    2113 @MAINTAINER_MODE_TRUE@  cp $< $@
    2114 
    2115 @MAINTAINER_MODE_TRUE@$(AUX_DIR)/config.guess: $(BUILDTOOLSDIR)/config.guess
    2116 @MAINTAINER_MODE_TRUE@  cp $< $@
    2117 
    2118 @MAINTAINER_MODE_TRUE@$(AUX_DIR)/config.sub: $(BUILDTOOLSDIR)/config.sub
    2119 @MAINTAINER_MODE_TRUE@  cp $< $@
    2120 
    2121 @MAINTAINER_MODE_TRUE@$(AUX_DIR)/depcomp: $(BUILDTOOLSDIR)/depcomp
    2122 @MAINTAINER_MODE_TRUE@  cp $< $@
    2123 
    2124 @MAINTAINER_MODE_TRUE@$(AUX_DIR)/ltmain.sh: $(BUILDTOOLSDIR)/ltmain.sh
    2125 @MAINTAINER_MODE_TRUE@  cp $< $@
    2126 
    2127 .PHONY: install-doc uninstall-doc \
    2128         doxygen-docs pdf-doxygen-docs clean-doxygen-docs \
    2129         install-doxygen-docs uninstall-doxygen-docs
    2130 
    21311992#######################################################################
    21321993# Create the Config.h file that has all public defines and install it #
  • trunk/src/OsiCbc/Makefile.am

    r2833 r2904  
    77# Author:  Andreas Waechter           IBM    2006-04-13
    88
    9 AUTOMAKE_OPTIONS = foreign
    10 
    11 include $(top_srcdir)/BuildTools/Makemain.inc
    12 
    139########################################################################
    1410#                             libOsiCbc                                #
     
    1612
    1713# Name of the library compiled in this directory.
    18 
    1914lib_LTLIBRARIES = libOsiCbc.la
    2015
  • trunk/src/OsiCbc/Makefile.in

    r2841 r2904  
    2121# Author:  Andreas Waechter           IBM    2006-04-13
    2222
    23 # Copyright (C) 2006, 2007 International Business Machines and others.
    24 # All Rights Reserved.
    25 # This file is distributed under the Eclipse Public License.
    26 
    27 # Author:  Andreas Waechter           IBM    2006-04-13
    28 
    2923########################################################################
    30 #        Variables for documentation and data directories              #
     24#                             libOsiCbc                                #
    3125########################################################################
    32 
    33 # Set these up to provide some uniformity in naming while also conforming
    34 # to Gnu directory standards. For reasons known only to the autoconf
    35 # developers, autoconf leaves datadir = $(datarootdir) but forces docdir
    36 # to $(datarootdir)/doc/$(PACKAGE_TARNAME).
    3726
    3827
     
    9382am__make_dryrun = (target_option=n; $(am__make_running_with_option))
    9483am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
     84pkgdatadir = $(datadir)/@PACKAGE@
     85pkgincludedir = $(includedir)/@PACKAGE@
    9586pkglibdir = $(libdir)/@PACKAGE@
    9687pkglibexecdir = $(libexecdir)/@PACKAGE@
     
    264255ETAGS = etags
    265256CTAGS = ctags
    266 pkgdatadir = $(datadir)/$(PACKAGE_TARNAME)
    267 pkgincludedir = $(includedir)/coin-or
    268257ACLOCAL = @ACLOCAL@
    269258ADD_CFLAGS = @ADD_CFLAGS@
     
    429418top_builddir = @top_builddir@
    430419top_srcdir = @top_srcdir@
    431 AUTOMAKE_OPTIONS = foreign
    432 pkgdocdir = $(docdir)
    433 
    434 # doxydocdir is the top-level directory for doxygen documentation. It holds
    435 # the tag file and possibly the PDF or Postscript version. doxyhtmldir is
    436 # typically a subdirectory containing all the files doxygen creates for
    437 # html documentation.
    438 doxydocdir = $(pkgdocdir)/doxydoc
    439 doxyhtmldir = $(doxydocdir)/html
    440 
    441 ########################################################################
    442 #                    Documentation installation                        #
    443 ########################################################################
    444 DocFiles = README AUTHORS LICENSE
    445 COIN_HAS_DOXYGEN = @COIN_HAS_DOXYGEN_TRUE@TRUE
    446 COIN_HAS_LATEX = @COIN_HAS_LATEX_TRUE@TRUE
    447 
    448 # Needless to say, it's important that baredocdir_nosub not be a target for
    449 # autoconf substitution.
    450 DOXYTAG_EDIT = sed -e 's|@baredocdir_nosub@|$(datarootdir)/doc|g'
    451 
    452 ########################################################################
    453 #                             libOsiCbc                                #
    454 ########################################################################
    455420
    456421# Name of the library compiled in this directory.
     
    491456.SUFFIXES:
    492457.SUFFIXES: .cpp .lo .o .obj
    493 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/BuildTools/Makemain.inc $(am__configure_deps)
     458$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
    494459        @for dep in $?; do \
    495460          case '$(am__configure_deps)' in \
     
    511476            cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
    512477        esac;
    513 $(top_srcdir)/BuildTools/Makemain.inc $(am__empty):
    514478
    515479$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
     
    586550
    587551.cpp.o:
    588 @am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
    589 @am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
     552@am__fastdepCXX_TRUE@   $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
     553@am__fastdepCXX_TRUE@   $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
     554@am__fastdepCXX_TRUE@   $(am__mv) $$depbase.Tpo $$depbase.Po
    590555@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
    591556@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     
    593558
    594559.cpp.obj:
    595 @am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
    596 @am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
     560@am__fastdepCXX_TRUE@   $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
     561@am__fastdepCXX_TRUE@   $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
     562@am__fastdepCXX_TRUE@   $(am__mv) $$depbase.Tpo $$depbase.Po
    597563@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
    598564@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     
    600566
    601567.cpp.lo:
    602 @am__fastdepCXX_TRUE@   $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
    603 @am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
     568@am__fastdepCXX_TRUE@   $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
     569@am__fastdepCXX_TRUE@   $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
     570@am__fastdepCXX_TRUE@   $(am__mv) $$depbase.Tpo $$depbase.Plo
    604571@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
    605572@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     
    815782
    816783
    817 doxygen-docs:
    818         if test "$(COIN_HAS_DOXYGEN)" = TRUE; then \
    819           if test -d "doxydoc/"; then \
    820             if test -f doxydoc/doxygen.conf ; then \
    821               $(DOXYTAG_EDIT) \
    822                 doxydoc/doxygen.conf > doxydoc/doxygen.conf.tmp ; \
    823               mv doxydoc/doxygen.conf.tmp doxydoc/doxygen.conf ; \
    824             fi ; \
    825             doxygen doxydoc/doxygen.conf;\
    826           fi;\
    827         fi
    828 
    829 pdf-doxygen-docs: doxygen-docs
    830         if test "$(COIN_HAS_DOXYGEN)" = TRUE; then \
    831           if test -d "doxydoc/latex"; then \
    832             if test "$(COIN_HAS_LATEX)" = TRUE; then \
    833               cd doxydoc/latex;\
    834               $(MAKE) pdf;\
    835               cd -;\
    836             fi;\
    837           fi;\
    838         fi
    839 
    840 clean-doxygen-docs:
    841         if test -d "doxydoc"; then \
    842           cd doxydoc ;\
    843           rm -rf html latex *.log *.tag;\
    844         fi
    845 
    846 install-doxygen-docs: doxygen-docs
    847         if test "$(COIN_HAS_DOXYGEN)" = TRUE; then \
    848           if test -d "doxydoc"; then \
    849             test -d "$(DESTDIR)$(doxydocdir)" || \
    850                  $(mkdir_p) "$(DESTDIR)$(doxydocdir)"; \
    851             $(INSTALL_DATA) doxydoc/@coin_doxy_tagname@ \
    852                 "$(DESTDIR)$(doxydocdir)"; \
    853             if test -f "doxydoc/latex/refman.pdf"; then \
    854               $(INSTALL_DATA) doxydoc/latex/refman.pdf \
    855                   "$(DESTDIR)$(doxydocdir)";\
    856             fi;\
    857             if test -d "doxydoc/html"; then \
    858               test -d "$(DESTDIR)$(doxyhtmldir)/search/" || \
    859                    $(mkdir_p) "$(DESTDIR)$(doxyhtmldir)/search/"; \
    860               $(INSTALL_DATA) doxydoc/html/*.* \
    861                   "$(DESTDIR)$(doxyhtmldir)";\
    862               $(INSTALL_DATA) doxydoc/html/search/*.* \
    863                   "$(DESTDIR)$(doxyhtmldir)/search";\
    864             fi;\
    865           fi;\
    866         fi
    867 
    868 # It's not clear that uninstall-doc should also remove doxygen doc'n. Write
    869 # the rules so that the last one will remove pkgdocdir (which should be empty
    870 # by then).
    871 
    872 uninstall-doxygen-docs:
    873         if test -d "$(DESTDIR)$(doxydocdir)"; then \
    874           rm -rf "$(DESTDIR)$(doxydocdir)"; \
    875         fi
    876         rmdir $(DESTDIR)$(pkgdocdir) || true
    877 
    878 install-doc:
    879         $(mkdir_p) "$(DESTDIR)$(pkgdocdir)"
    880         for file in $(DocFiles); do \
    881           if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \
    882           if test -f "$$dir$$file"; then \
    883             $(INSTALL_DATA) "$$dir$$file" "$(DESTDIR)$(pkgdocdir)/$$file"; \
    884           fi; \
    885         done
    886 
    887 uninstall-doc:
    888         for file in $(DocFiles); do \
    889           rm -f "$(DESTDIR)$(pkgdocdir)/$$file"; \
    890         done
    891         rmdir $(DESTDIR)$(pkgdocdir) || true
    892 
    893 ########################################################################
    894 #                         Maintainer Stuff                             #
    895 ########################################################################
    896 
    897 # Make sure acinclude is using most recent coin.m4
    898 @MAINTAINER_MODE_TRUE@$(srcdir)/acinclude.m4: $(BUILDTOOLSDIR)/coin.m4
    899 @MAINTAINER_MODE_TRUE@  cat $(LIBTOOLM4) $< > $@
    900 
    901 # Make sure the autotools scripts are up to date
    902 @MAINTAINER_MODE_TRUE@$(AUX_DIR)/install-sh: $(BUILDTOOLSDIR)/install-sh
    903 @MAINTAINER_MODE_TRUE@  cp $< $@
    904 
    905 @MAINTAINER_MODE_TRUE@$(AUX_DIR)/missing: $(BUILDTOOLSDIR)/missing
    906 @MAINTAINER_MODE_TRUE@  cp $< $@
    907 
    908 @MAINTAINER_MODE_TRUE@$(AUX_DIR)/config.guess: $(BUILDTOOLSDIR)/config.guess
    909 @MAINTAINER_MODE_TRUE@  cp $< $@
    910 
    911 @MAINTAINER_MODE_TRUE@$(AUX_DIR)/config.sub: $(BUILDTOOLSDIR)/config.sub
    912 @MAINTAINER_MODE_TRUE@  cp $< $@
    913 
    914 @MAINTAINER_MODE_TRUE@$(AUX_DIR)/depcomp: $(BUILDTOOLSDIR)/depcomp
    915 @MAINTAINER_MODE_TRUE@  cp $< $@
    916 
    917 @MAINTAINER_MODE_TRUE@$(AUX_DIR)/ltmain.sh: $(BUILDTOOLSDIR)/ltmain.sh
    918 @MAINTAINER_MODE_TRUE@  cp $< $@
    919 
    920 .PHONY: install-doc uninstall-doc \
    921         doxygen-docs pdf-doxygen-docs clean-doxygen-docs \
    922         install-doxygen-docs uninstall-doxygen-docs
    923 
    924784install-exec-local:
    925785        $(install_sh_DATA) config_osicbc.h $(DESTDIR)$(includecoindir)/OsiCbcConfig.h
  • trunk/test/Makefile.am

    r2835 r2904  
    66
    77# Author:  Andreas Waechter           IBM    2006-04-13
    8 
    9 AUTOMAKE_OPTIONS = foreign
    108
    119########################################################################
     
    9088ctests: CInterfaceTest$(EXEEXT)
    9189        ./CInterfaceTest$(EXEEXT) $(MIPLIB3_DATA) $(SAMPLE_DATA)
    92 
    93 ########################################################################
    94 #                          Cleaning stuff                              #
    95 ########################################################################
    96 
    97 # Here we list everything that is not generated by the compiler, e.g.,
    98 # output files of a program
    99 
    100 DISTCLEANFILES = yy.mps xx.mps continuous.mps integer.mps test2.lp test2.out test.lp test.mps test.out x1.mps.mps x2.mps.mps x3.mps.mps
  • trunk/test/Makefile.in

    r2841 r2904  
    2020
    2121# Author:  Andreas Waechter           IBM    2006-04-13
     22
     23########################################################################
     24#                         unitTest for Cbc                             #
     25########################################################################
    2226
    2327VPATH = @srcdir@
     
    379383top_builddir = @top_builddir@
    380384top_srcdir = @top_srcdir@
    381 AUTOMAKE_OPTIONS = foreign
    382 
    383 ########################################################################
    384 #                         unitTest for Cbc                             #
    385 ########################################################################
    386385CBC_TEST_TGTS = gamstests ositests $(am__append_1) $(am__append_2)
    387386cbcflags = $(am__append_3) -unitTest $(am__append_5)
     
    406405nodist_EXTRA_CInterfaceTest_SOURCES = dummy.cpp # force using C++ linker
    407406CInterfaceTest_LDADD = ../src/libCbcSolver.la ../src/libCbc.la
    408 
    409 ########################################################################
    410 #                          Cleaning stuff                              #
    411 ########################################################################
    412 
    413 # Here we list everything that is not generated by the compiler, e.g.,
    414 # output files of a program
    415 DISTCLEANFILES = yy.mps xx.mps continuous.mps integer.mps test2.lp test2.out test.lp test.mps test.out x1.mps.mps x2.mps.mps x3.mps.mps
    416407all: all-am
    417408
     
    528519
    529520.c.o:
    530 @am__fastdepCC_TRUE@    $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
    531 @am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
     521@am__fastdepCC_TRUE@    $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
     522@am__fastdepCC_TRUE@    $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
     523@am__fastdepCC_TRUE@    $(am__mv) $$depbase.Tpo $$depbase.Po
    532524@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
    533525@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     
    535527
    536528.c.obj:
    537 @am__fastdepCC_TRUE@    $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
    538 @am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
     529@am__fastdepCC_TRUE@    $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
     530@am__fastdepCC_TRUE@    $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
     531@am__fastdepCC_TRUE@    $(am__mv) $$depbase.Tpo $$depbase.Po
    539532@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
    540533@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     
    542535
    543536.c.lo:
    544 @am__fastdepCC_TRUE@    $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
    545 @am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
     537@am__fastdepCC_TRUE@    $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
     538@am__fastdepCC_TRUE@    $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
     539@am__fastdepCC_TRUE@    $(am__mv) $$depbase.Tpo $$depbase.Plo
    546540@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
    547541@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     
    549543
    550544.cpp.o:
    551 @am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
    552 @am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
     545@am__fastdepCXX_TRUE@   $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
     546@am__fastdepCXX_TRUE@   $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
     547@am__fastdepCXX_TRUE@   $(am__mv) $$depbase.Tpo $$depbase.Po
    553548@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
    554549@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     
    556551
    557552.cpp.obj:
    558 @am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
    559 @am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
     553@am__fastdepCXX_TRUE@   $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
     554@am__fastdepCXX_TRUE@   $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
     555@am__fastdepCXX_TRUE@   $(am__mv) $$depbase.Tpo $$depbase.Po
    560556@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
    561557@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     
    563559
    564560.cpp.lo:
    565 @am__fastdepCXX_TRUE@   $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
    566 @am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
     561@am__fastdepCXX_TRUE@   $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
     562@am__fastdepCXX_TRUE@   $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
     563@am__fastdepCXX_TRUE@   $(am__mv) $$depbase.Tpo $$depbase.Plo
    567564@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
    568565@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     
    659656        -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
    660657        -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
    661         -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
    662658
    663659maintainer-clean-generic:
Note: See TracChangeset for help on using the changeset viewer.