Changeset 1014


Ignore:
Timestamp:
Jan 14, 2008 10:48:45 PM (12 years ago)
Author:
andreasw
Message:

reran autotools

Location:
trunk/Bonmin
Files:
23 edited

Legend:

Unmodified
Added
Removed
  • trunk/Bonmin/Makefile.am

    r916 r1014  
    7676        cd $(top_srcdir)/doc && pdflatex BONMIN_UsersManual.tex
    7777
     78install-exec-local: install-doc
     79
     80uninstall-local: uninstall-doc
     81
    7882astyle:
    7983        cd src/Algorithms; $(MAKE) astyle
  • trunk/Bonmin/Makefile.in

    r977 r1014  
    2121# Author:  Andreas Waechter           IBM    2006-04-13
    2222
    23 # Copyright (C) 2006 International Business Machines and others.
     23# Copyright (C) 2006, 2007 International Business Machines and others.
    2424# All Rights Reserved.
    2525# This file is distributed under the Common Public License.
     
    361361        $(am__append_6) $(VPATH_DISTCLEANFILES)
    362362DocFiles = README AUTHORS LICENSE
    363 DocInstallDir = $(prefix)/share/doc/$(PACKAGE)
     363DocInstallDir = $(prefix)/share/doc/coin/$(PACKAGE_NAME)
    364364all: all-recursive
    365365
     
    756756install-data-am:
    757757
     758install-exec-am: install-exec-local
     759
    758760install-info: install-info-recursive
    759761
     
    779781
    780782ps-am:
     783
     784uninstall-am: uninstall-info-am uninstall-local
    781785
    782786uninstall-info: uninstall-info-recursive
     
    790794        distuninstallcheck dvi dvi-am html html-am info info-am \
    791795        install install-am install-data install-data-am install-exec \
    792         install-exec-am install-info install-info-am install-man \
    793         install-strip installcheck installcheck-am installdirs \
    794         installdirs-am maintainer-clean maintainer-clean-generic \
    795         maintainer-clean-recursive mostlyclean mostlyclean-generic \
    796         mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
    797         tags tags-recursive uninstall uninstall-am uninstall-info-am
     796        install-exec-am install-exec-local install-info \
     797        install-info-am install-man install-strip installcheck \
     798        installcheck-am installdirs installdirs-am maintainer-clean \
     799        maintainer-clean-generic maintainer-clean-recursive \
     800        mostlyclean mostlyclean-generic mostlyclean-libtool \
     801        mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
     802        uninstall uninstall-am uninstall-info-am uninstall-local
    798803
    799804
     
    816821userman: $(top_srcdir)/doc/BONMIN_UsersManual.tex
    817822        cd $(top_srcdir)/doc && pdflatex BONMIN_UsersManual.tex
     823
     824install-exec-local: install-doc
     825
     826uninstall-local: uninstall-doc
    818827
    819828astyle:
     
    829838        cd src/Interfaces/Ipopt; $(MAKE) astyle
    830839
    831 install-exec-am:
     840install-doc: $(DocFiles)
    832841        test -z "$(DocInstallDir)" || $(mkdir_p) "$(DESTDIR)$(DocInstallDir)"
    833842        for file in $(DocFiles); do \
     
    836845        done
    837846
    838 uninstall-am:
     847uninstall-doc:
    839848        for file in $(DocFiles); do \
    840849          rm -f "$(DESTDIR)$(DocInstallDir)/$$file"; \
     
    877886@HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@update-externals: .Externals-stamp
    878887@HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@     cd $(srcdir); svn update
     888
     889.PHONY: install-doc uninstall-doc update-externals
    879890# Tell versions [3.59,3.63) of GNU make to not export all variables.
    880891# Otherwise a system limit (for SysV at least) may be exceeded.
  • trunk/Bonmin/configure

    r916 r1014  
    10941094  --enable-doscompile     Under Cygwin, compile so that executables run under
    10951095                          DOS. Set to mingw to use gcc/g++/ld with
    1096                           -mno-cygwin. Set to msvc to use cl/link. Default
    1097                           when mentioned: mingw. Default when not mentioned:
    1098                           disabled.
     1096                          -mno-cygwin. Set to msvc to use cl/link (or
     1097                          icl/link). Default when mentioned: mingw. Default
     1098                          when not mentioned: disabled.
    10991099  --enable-static[=PKGS]
    11001100                          build static libraries [default=no]
     
    18491849if test x"$CXX" != x; then
    18501850  case "$CXX" in
    1851     cl* | */cl* | CL* | */CL*)
     1851    cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    18521852      if test x"$CC" = x; then
    18531853        CC="$CXX"
     
    18761876  *-cygwin* | *-mingw*)
    18771877             if test "$enable_doscompile" = msvc ; then
    1878                comps="cl"
     1878               comps="icl cl"
    18791879             else
    18801880               comps="gcc cl"
     
    27622762            coin_dbg_cflags='-MTd'
    27632763            ;;
     2764          icl* | */icl* | ICL* | */ICL*)
     2765            coin_opt_cflags='-MT -Ox'
     2766            coin_add_cflags='-nologo -D_CRT_SECURE_NO_DEPRECATE'
     2767            coin_dbg_cflags='-MTd -debug'
     2768            ;;
    27642769        esac
    27652770        ;;
     
    30683073# Correct ADDLIBS initialization if we are using the MS compiler
    30693074case "$CC" in
    3070   cl* | */cl* | CL* | */CL*)
     3075  cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    30713076    ADDLIBS=
    30723077    case $build in
     
    31173122  *-cygwin* | *-mingw*)
    31183123             if test "$enable_doscompile" = msvc ; then
    3119                comps="cl"
     3124               comps="icl cl"
    31203125             else
    31213126               comps="g++ cl"
     
    34943499# It seems that we need to cleanup something here for the Windows
    34953500case "$CXX" in
    3496   cl* | */cl* | CL* | */CL* )
     3501  cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    34973502    sed -e 's/^void exit (int);//' confdefs.h >> confdefs.hh
    34983503    mv confdefs.hh confdefs.h
     
    36023607            coin_add_cxxflags='-nologo -EHsc -GR -wd4996 -D_CRT_SECURE_NO_DEPRECATE'
    36033608            coin_dbg_cxxflags='-MTd'
     3609            ;;
     3610          icl* | */icl* | ICL* | */ICL*)
     3611            # The MT and MTd options are mutually exclusive
     3612            coin_opt_cxxflags='-MT -Ox'
     3613            coin_add_cxxflags='-nologo -EHsc -GR -D_CRT_SECURE_NO_DEPRECATE'
     3614            coin_dbg_cxxflags='-MTd -debug'
    36043615            ;;
    36053616        esac
     
    41254136
    41264137# Provide some information about the compiler.
    4127 echo "$as_me:4127:" \
     4138echo "$as_me:4138:" \
    41284139     "checking for Fortran 77 compiler version" >&5
    41294140ac_compiler=`set X $ac_compile; echo $2`
     
    46934704ac_save_FFLAGS=$FFLAGS
    46944705FFLAGS="$FFLAGS $ac_verb"
    4695 (eval echo $as_me:4695: \"$ac_link\") >&5
     4706(eval echo $as_me:4706: \"$ac_link\") >&5
    46964707ac_f77_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
    46974708echo "$ac_f77_v_output" >&5
     
    47714782ac_save_FFLAGS=$FFLAGS
    47724783FFLAGS="$FFLAGS $ac_cv_prog_f77_v"
    4773 (eval echo $as_me:4773: \"$ac_link\") >&5
     4784(eval echo $as_me:4784: \"$ac_link\") >&5
    47744785ac_f77_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
    47754786echo "$ac_f77_v_output" >&5
     
    72437254*-*-irix6*)
    72447255  # Find out which ABI we are using.
    7245   echo '#line 7245 "configure"' > conftest.$ac_ext
     7256  echo '#line 7256 "configure"' > conftest.$ac_ext
    72467257  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    72477258  (eval $ac_compile) 2>&5
     
    92239234   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    92249235   -e 's:$: $lt_compiler_flag:'`
    9225    (eval echo "\"\$as_me:9225: $lt_compile\"" >&5)
     9236   (eval echo "\"\$as_me:9236: $lt_compile\"" >&5)
    92269237   (eval "$lt_compile" 2>conftest.err)
    92279238   ac_status=$?
    92289239   cat conftest.err >&5
    9229    echo "$as_me:9229: \$? = $ac_status" >&5
     9240   echo "$as_me:9240: \$? = $ac_status" >&5
    92309241   if (exit $ac_status) && test -s "$ac_outfile"; then
    92319242     # The compiler can only warn and ignore the option if not recognized
     
    94919502   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    94929503   -e 's:$: $lt_compiler_flag:'`
    9493    (eval echo "\"\$as_me:9493: $lt_compile\"" >&5)
     9504   (eval echo "\"\$as_me:9504: $lt_compile\"" >&5)
    94949505   (eval "$lt_compile" 2>conftest.err)
    94959506   ac_status=$?
    94969507   cat conftest.err >&5
    9497    echo "$as_me:9497: \$? = $ac_status" >&5
     9508   echo "$as_me:9508: \$? = $ac_status" >&5
    94989509   if (exit $ac_status) && test -s "$ac_outfile"; then
    94999510     # The compiler can only warn and ignore the option if not recognized
     
    95959606   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    95969607   -e 's:$: $lt_compiler_flag:'`
    9597    (eval echo "\"\$as_me:9597: $lt_compile\"" >&5)
     9608   (eval echo "\"\$as_me:9608: $lt_compile\"" >&5)
    95989609   (eval "$lt_compile" 2>out/conftest.err)
    95999610   ac_status=$?
    96009611   cat out/conftest.err >&5
    9601    echo "$as_me:9601: \$? = $ac_status" >&5
     9612   echo "$as_me:9612: \$? = $ac_status" >&5
    96029613   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    96039614   then
     
    1201212023  lt_status=$lt_dlunknown
    1201312024  cat > conftest.$ac_ext <<EOF
    12014 #line 12014 "configure"
     12025#line 12025 "configure"
    1201512026#include "confdefs.h"
    1201612027
     
    1211212123  lt_status=$lt_dlunknown
    1211312124  cat > conftest.$ac_ext <<EOF
    12114 #line 12114 "configure"
     12125#line 12125 "configure"
    1211512126#include "confdefs.h"
    1211612127
     
    1447214483   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1447314484   -e 's:$: $lt_compiler_flag:'`
    14474    (eval echo "\"\$as_me:14474: $lt_compile\"" >&5)
     14485   (eval echo "\"\$as_me:14485: $lt_compile\"" >&5)
    1447514486   (eval "$lt_compile" 2>conftest.err)
    1447614487   ac_status=$?
    1447714488   cat conftest.err >&5
    14478    echo "$as_me:14478: \$? = $ac_status" >&5
     14489   echo "$as_me:14489: \$? = $ac_status" >&5
    1447914490   if (exit $ac_status) && test -s "$ac_outfile"; then
    1448014491     # The compiler can only warn and ignore the option if not recognized
     
    1457614587   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1457714588   -e 's:$: $lt_compiler_flag:'`
    14578    (eval echo "\"\$as_me:14578: $lt_compile\"" >&5)
     14589   (eval echo "\"\$as_me:14589: $lt_compile\"" >&5)
    1457914590   (eval "$lt_compile" 2>out/conftest.err)
    1458014591   ac_status=$?
    1458114592   cat out/conftest.err >&5
    14582    echo "$as_me:14582: \$? = $ac_status" >&5
     14593   echo "$as_me:14593: \$? = $ac_status" >&5
    1458314594   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1458414595   then
     
    1614616157   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1614716158   -e 's:$: $lt_compiler_flag:'`
    16148    (eval echo "\"\$as_me:16148: $lt_compile\"" >&5)
     16159   (eval echo "\"\$as_me:16159: $lt_compile\"" >&5)
    1614916160   (eval "$lt_compile" 2>conftest.err)
    1615016161   ac_status=$?
    1615116162   cat conftest.err >&5
    16152    echo "$as_me:16152: \$? = $ac_status" >&5
     16163   echo "$as_me:16163: \$? = $ac_status" >&5
    1615316164   if (exit $ac_status) && test -s "$ac_outfile"; then
    1615416165     # The compiler can only warn and ignore the option if not recognized
     
    1625016261   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1625116262   -e 's:$: $lt_compiler_flag:'`
    16252    (eval echo "\"\$as_me:16252: $lt_compile\"" >&5)
     16263   (eval echo "\"\$as_me:16263: $lt_compile\"" >&5)
    1625316264   (eval "$lt_compile" 2>out/conftest.err)
    1625416265   ac_status=$?
    1625516266   cat out/conftest.err >&5
    16256    echo "$as_me:16256: \$? = $ac_status" >&5
     16267   echo "$as_me:16267: \$? = $ac_status" >&5
    1625716268   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1625816269   then
     
    1845718468   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1845818469   -e 's:$: $lt_compiler_flag:'`
    18459    (eval echo "\"\$as_me:18459: $lt_compile\"" >&5)
     18470   (eval echo "\"\$as_me:18470: $lt_compile\"" >&5)
    1846018471   (eval "$lt_compile" 2>conftest.err)
    1846118472   ac_status=$?
    1846218473   cat conftest.err >&5
    18463    echo "$as_me:18463: \$? = $ac_status" >&5
     18474   echo "$as_me:18474: \$? = $ac_status" >&5
    1846418475   if (exit $ac_status) && test -s "$ac_outfile"; then
    1846518476     # The compiler can only warn and ignore the option if not recognized
     
    1872518736   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1872618737   -e 's:$: $lt_compiler_flag:'`
    18727    (eval echo "\"\$as_me:18727: $lt_compile\"" >&5)
     18738   (eval echo "\"\$as_me:18738: $lt_compile\"" >&5)
    1872818739   (eval "$lt_compile" 2>conftest.err)
    1872918740   ac_status=$?
    1873018741   cat conftest.err >&5
    18731    echo "$as_me:18731: \$? = $ac_status" >&5
     18742   echo "$as_me:18742: \$? = $ac_status" >&5
    1873218743   if (exit $ac_status) && test -s "$ac_outfile"; then
    1873318744     # The compiler can only warn and ignore the option if not recognized
     
    1882918840   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1883018841   -e 's:$: $lt_compiler_flag:'`
    18831    (eval echo "\"\$as_me:18831: $lt_compile\"" >&5)
     18842   (eval echo "\"\$as_me:18842: $lt_compile\"" >&5)
    1883218843   (eval "$lt_compile" 2>out/conftest.err)
    1883318844   ac_status=$?
    1883418845   cat out/conftest.err >&5
    18835    echo "$as_me:18835: \$? = $ac_status" >&5
     18846   echo "$as_me:18846: \$? = $ac_status" >&5
    1883618847   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1883718848   then
     
    2158521596    *-cygwin* | *-mingw*)
    2158621597       case "$CXX" in
    21587     cl* | */cl* | CL* | */CL*)
     21598    cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    2158821599      { echo "$as_me:$LINENO: Applying patches to libtool for cl compiler" >&5
    2158921600echo "$as_me: Applying patches to libtool for cl compiler" >&6;}
     
    2352623537# Determine the name of the ASL library
    2352723538case "$CC" in
    23528   cl* | */cl* | CL* | */CL*)
     23539  cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    2352923540    ampllib=amplsolv.lib ;;
    2353023541  *)
     
    2391223923fi
    2391323924case "$CC" in
    23914   cl* | */cl* | CL* | */CL*)
     23925  cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    2391523926    coin_link_input_cmd=cp ;;
    2391623927esac
     
    2393023941
    2393123942  case "$CC" in
    23932     cl* | */cl* | CL* | */CL*)
     23943    cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    2393323944         LIBEXT=lib ;;
    2393423945      *) LIBEXT=a ;;
  • trunk/Bonmin/examples/CppExample/Makefile.in

    r536 r1014  
    4545
    4646# Directory with COIN header files
    47 COININCDIR = @abs_include_dir@
     47COININCDIR = @abs_include_dir@/coin
    4848
    4949# Directory with COIN libraries
  • trunk/Bonmin/examples/OptionDocGen/Makefile.in

    r790 r1014  
    4545
    4646# Directory with COIN header files
    47 COININCDIR = @abs_include_dir@
     47COININCDIR = @abs_include_dir@/coin
    4848
    4949# Directory with COIN libraries
  • trunk/Bonmin/src/Algorithms/Ampl/Makefile.am

    r563 r1014  
    7777########################################################################
    7878
    79 include_HEADERS = \
     79# Here list all the header files that are required by a user of the library,
     80# and that therefore should be installed in 'install/coin'
     81includecoindir = $(includedir)/coin
     82includecoin_HEADERS = \
    8083        BonAmplSetup.hpp
    8184
  • trunk/Bonmin/src/Algorithms/Ampl/Makefile.in

    r909 r1014  
    4949
    5050subdir = src/Algorithms/Ampl
    51 DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \
     51DIST_COMMON = $(includecoin_HEADERS) $(srcdir)/Makefile.am \
    5252        $(srcdir)/Makefile.in
    5353ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
     
    9090  esac;
    9191am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
    92 am__installdirs = "$(DESTDIR)$(includedir)"
    93 includeHEADERS_INSTALL = $(INSTALL_HEADER)
    94 HEADERS = $(include_HEADERS)
     92am__installdirs = "$(DESTDIR)$(includecoindir)"
     93includecoinHEADERS_INSTALL = $(INSTALL_HEADER)
     94HEADERS = $(includecoin_HEADERS)
    9595ETAGS = etags
    9696CTAGS = ctags
     
    372372#                Headers that need to be installed                     #
    373373########################################################################
    374 include_HEADERS = \
     374
     375# Here list all the header files that are required by a user of the library,
     376# and that therefore should be installed in 'install/coin'
     377includecoindir = $(includedir)/coin
     378includecoin_HEADERS = \
    375379        BonAmplSetup.hpp
    376380
     
    469473        -rm -f libtool
    470474uninstall-info-am:
    471 install-includeHEADERS: $(include_HEADERS)
     475install-includecoinHEADERS: $(includecoin_HEADERS)
    472476        @$(NORMAL_INSTALL)
    473         test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
    474         @list='$(include_HEADERS)'; for p in $$list; do \
     477        test -z "$(includecoindir)" || $(mkdir_p) "$(DESTDIR)$(includecoindir)"
     478        @list='$(includecoin_HEADERS)'; for p in $$list; do \
    475479          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
    476480          f=$(am__strip_dir) \
    477           echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
    478           $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
     481          echo " $(includecoinHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includecoindir)/$$f'"; \
     482          $(includecoinHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includecoindir)/$$f"; \
    479483        done
    480484
    481 uninstall-includeHEADERS:
     485uninstall-includecoinHEADERS:
    482486        @$(NORMAL_UNINSTALL)
    483         @list='$(include_HEADERS)'; for p in $$list; do \
     487        @list='$(includecoin_HEADERS)'; for p in $$list; do \
    484488          f=$(am__strip_dir) \
    485           echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
    486           rm -f "$(DESTDIR)$(includedir)/$$f"; \
     489          echo " rm -f '$(DESTDIR)$(includecoindir)/$$f'"; \
     490          rm -f "$(DESTDIR)$(includecoindir)/$$f"; \
    487491        done
    488492
     
    566570all-am: Makefile $(LTLIBRARIES) $(HEADERS)
    567571installdirs:
    568         for dir in "$(DESTDIR)$(includedir)"; do \
     572        for dir in "$(DESTDIR)$(includecoindir)"; do \
    569573          test -z "$$dir" || $(mkdir_p) "$$dir"; \
    570574        done
     
    615619info-am:
    616620
    617 install-data-am: install-includeHEADERS
     621install-data-am: install-includecoinHEADERS
    618622
    619623install-exec-am:
     
    643647ps-am:
    644648
    645 uninstall-am: uninstall-includeHEADERS uninstall-info-am
     649uninstall-am: uninstall-includecoinHEADERS uninstall-info-am
    646650
    647651.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
     
    650654        distclean-tags distdir dvi dvi-am html html-am info info-am \
    651655        install install-am install-data install-data-am install-exec \
    652         install-exec-am install-includeHEADERS install-info \
     656        install-exec-am install-includecoinHEADERS install-info \
    653657        install-info-am install-man install-strip installcheck \
    654658        installcheck-am installdirs maintainer-clean \
    655659        maintainer-clean-generic mostlyclean mostlyclean-compile \
    656660        mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
    657         tags uninstall uninstall-am uninstall-includeHEADERS \
     661        tags uninstall uninstall-am uninstall-includecoinHEADERS \
    658662        uninstall-info-am
    659663
  • trunk/Bonmin/src/Algorithms/Branching/Makefile.am

    r783 r1014  
    8383########################################################################
    8484
    85 include_HEADERS = \
     85# Here list all the header files that are required by a user of the library,
     86# and that therefore should be installed in 'install/coin'
     87includecoindir = $(includedir)/coin
     88includecoin_HEADERS = \
    8689        BonChooseVariable.hpp \
    8790        BonPseudoCosts.hpp \
  • trunk/Bonmin/src/Algorithms/Branching/Makefile.in

    r909 r1014  
    4949
    5050subdir = src/Algorithms/Branching
    51 DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \
     51DIST_COMMON = $(includecoin_HEADERS) $(srcdir)/Makefile.am \
    5252        $(srcdir)/Makefile.in
    5353ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
     
    9191  esac;
    9292am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
    93 am__installdirs = "$(DESTDIR)$(includedir)"
    94 includeHEADERS_INSTALL = $(INSTALL_HEADER)
    95 HEADERS = $(include_HEADERS)
     93am__installdirs = "$(DESTDIR)$(includecoindir)"
     94includecoinHEADERS_INSTALL = $(INSTALL_HEADER)
     95HEADERS = $(includecoin_HEADERS)
    9696ETAGS = etags
    9797CTAGS = ctags
     
    380380#                Headers that need to be installed                     #
    381381########################################################################
    382 include_HEADERS = \
     382
     383# Here list all the header files that are required by a user of the library,
     384# and that therefore should be installed in 'install/coin'
     385includecoindir = $(includedir)/coin
     386includecoin_HEADERS = \
    383387        BonChooseVariable.hpp \
    384388        BonPseudoCosts.hpp \
     
    489493        -rm -f libtool
    490494uninstall-info-am:
    491 install-includeHEADERS: $(include_HEADERS)
     495install-includecoinHEADERS: $(includecoin_HEADERS)
    492496        @$(NORMAL_INSTALL)
    493         test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
    494         @list='$(include_HEADERS)'; for p in $$list; do \
     497        test -z "$(includecoindir)" || $(mkdir_p) "$(DESTDIR)$(includecoindir)"
     498        @list='$(includecoin_HEADERS)'; for p in $$list; do \
    495499          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
    496500          f=$(am__strip_dir) \
    497           echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
    498           $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
     501          echo " $(includecoinHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includecoindir)/$$f'"; \
     502          $(includecoinHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includecoindir)/$$f"; \
    499503        done
    500504
    501 uninstall-includeHEADERS:
     505uninstall-includecoinHEADERS:
    502506        @$(NORMAL_UNINSTALL)
    503         @list='$(include_HEADERS)'; for p in $$list; do \
     507        @list='$(includecoin_HEADERS)'; for p in $$list; do \
    504508          f=$(am__strip_dir) \
    505           echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
    506           rm -f "$(DESTDIR)$(includedir)/$$f"; \
     509          echo " rm -f '$(DESTDIR)$(includecoindir)/$$f'"; \
     510          rm -f "$(DESTDIR)$(includecoindir)/$$f"; \
    507511        done
    508512
     
    586590all-am: Makefile $(LTLIBRARIES) $(HEADERS)
    587591installdirs:
    588         for dir in "$(DESTDIR)$(includedir)"; do \
     592        for dir in "$(DESTDIR)$(includecoindir)"; do \
    589593          test -z "$$dir" || $(mkdir_p) "$$dir"; \
    590594        done
     
    635639info-am:
    636640
    637 install-data-am: install-includeHEADERS
     641install-data-am: install-includecoinHEADERS
    638642
    639643install-exec-am:
     
    663667ps-am:
    664668
    665 uninstall-am: uninstall-includeHEADERS uninstall-info-am
     669uninstall-am: uninstall-includecoinHEADERS uninstall-info-am
    666670
    667671.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
     
    670674        distclean-tags distdir dvi dvi-am html html-am info info-am \
    671675        install install-am install-data install-data-am install-exec \
    672         install-exec-am install-includeHEADERS install-info \
     676        install-exec-am install-includecoinHEADERS install-info \
    673677        install-info-am install-man install-strip installcheck \
    674678        installcheck-am installdirs maintainer-clean \
    675679        maintainer-clean-generic mostlyclean mostlyclean-compile \
    676680        mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
    677         tags uninstall uninstall-am uninstall-includeHEADERS \
     681        tags uninstall uninstall-am uninstall-includecoinHEADERS \
    678682        uninstall-info-am
    679683
  • trunk/Bonmin/src/Algorithms/Makefile.am

    r916 r1014  
    9292########################################################################
    9393
    94 include_HEADERS = \
     94# Here list all the header files that are required by a user of the library,
     95# and that therefore should be installed in 'install/coin'
     96includecoindir = $(includedir)/coin
     97includecoin_HEADERS = \
    9598          BonBabSetupBase.hpp \
    9699          BonBonminSetup.hpp
  • trunk/Bonmin/src/Algorithms/Makefile.in

    r916 r1014  
    5050
    5151subdir = src/Algorithms
    52 DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \
     52DIST_COMMON = $(includecoin_HEADERS) $(srcdir)/Makefile.am \
    5353        $(srcdir)/Makefile.in
    5454ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
     
    9595  esac;
    9696am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
    97 am__installdirs = "$(DESTDIR)$(includedir)"
    98 includeHEADERS_INSTALL = $(INSTALL_HEADER)
    99 HEADERS = $(include_HEADERS)
     97am__installdirs = "$(DESTDIR)$(includecoindir)"
     98includecoinHEADERS_INSTALL = $(INSTALL_HEADER)
     99HEADERS = $(includecoin_HEADERS)
    100100ETAGS = etags
    101101CTAGS = ctags
     
    387387#                Headers that need to be installed                     #
    388388########################################################################
    389 include_HEADERS = \
     389
     390# Here list all the header files that are required by a user of the library,
     391# and that therefore should be installed in 'install/coin'
     392includecoindir = $(includedir)/coin
     393includecoin_HEADERS = \
    390394          BonBabSetupBase.hpp \
    391395          BonBonminSetup.hpp
     
    489493        -rm -f libtool
    490494uninstall-info-am:
    491 install-includeHEADERS: $(include_HEADERS)
     495install-includecoinHEADERS: $(includecoin_HEADERS)
    492496        @$(NORMAL_INSTALL)
    493         test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
    494         @list='$(include_HEADERS)'; for p in $$list; do \
     497        test -z "$(includecoindir)" || $(mkdir_p) "$(DESTDIR)$(includecoindir)"
     498        @list='$(includecoin_HEADERS)'; for p in $$list; do \
    495499          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
    496500          f=$(am__strip_dir) \
    497           echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
    498           $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
     501          echo " $(includecoinHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includecoindir)/$$f'"; \
     502          $(includecoinHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includecoindir)/$$f"; \
    499503        done
    500504
    501 uninstall-includeHEADERS:
     505uninstall-includecoinHEADERS:
    502506        @$(NORMAL_UNINSTALL)
    503         @list='$(include_HEADERS)'; for p in $$list; do \
     507        @list='$(includecoin_HEADERS)'; for p in $$list; do \
    504508          f=$(am__strip_dir) \
    505           echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
    506           rm -f "$(DESTDIR)$(includedir)/$$f"; \
     509          echo " rm -f '$(DESTDIR)$(includecoindir)/$$f'"; \
     510          rm -f "$(DESTDIR)$(includecoindir)/$$f"; \
    507511        done
    508512
     
    686690installdirs: installdirs-recursive
    687691installdirs-am:
    688         for dir in "$(DESTDIR)$(includedir)"; do \
     692        for dir in "$(DESTDIR)$(includecoindir)"; do \
    689693          test -z "$$dir" || $(mkdir_p) "$$dir"; \
    690694        done
     
    735739info-am:
    736740
    737 install-data-am: install-includeHEADERS
     741install-data-am: install-includecoinHEADERS
    738742
    739743install-exec-am:
     
    763767ps-am:
    764768
    765 uninstall-am: uninstall-includeHEADERS uninstall-info-am
     769uninstall-am: uninstall-includecoinHEADERS uninstall-info-am
    766770
    767771uninstall-info: uninstall-info-recursive
     
    774778        html-am info info-am install install-am install-data \
    775779        install-data-am install-exec install-exec-am \
    776         install-includeHEADERS install-info install-info-am \
     780        install-includecoinHEADERS install-info install-info-am \
    777781        install-man install-strip installcheck installcheck-am \
    778782        installdirs installdirs-am maintainer-clean \
     
    781785        mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
    782786        tags tags-recursive uninstall uninstall-am \
    783         uninstall-includeHEADERS uninstall-info-am
     787        uninstall-includecoinHEADERS uninstall-info-am
    784788
    785789
  • trunk/Bonmin/src/Algorithms/OaGenerators/Makefile.am

    r916 r1014  
    7474
    7575
    76 include_HEADERS = \
     76# Here list all the header files that are required by a user of the library,
     77# and that therefore should be installed in 'install/coin'
     78includecoindir = $(includedir)/coin
     79includecoin_HEADERS = \
    7780        BonDummyHeuristic.hpp \
    7881        BonOaNlpOptim.hpp \
  • trunk/Bonmin/src/Algorithms/OaGenerators/Makefile.in

    r916 r1014  
    4949
    5050subdir = src/Algorithms/OaGenerators
    51 DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \
     51DIST_COMMON = $(includecoin_HEADERS) $(srcdir)/Makefile.am \
    5252        $(srcdir)/Makefile.in
    5353ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
     
    9292  esac;
    9393am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
    94 am__installdirs = "$(DESTDIR)$(includedir)"
    95 includeHEADERS_INSTALL = $(INSTALL_HEADER)
    96 HEADERS = $(include_HEADERS)
     94am__installdirs = "$(DESTDIR)$(includecoindir)"
     95includecoinHEADERS_INSTALL = $(INSTALL_HEADER)
     96HEADERS = $(includecoin_HEADERS)
    9797ETAGS = etags
    9898CTAGS = ctags
     
    375375# on Cygwin
    376376DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)` -I$(top_builddir)/inc
    377 include_HEADERS = \
     377
     378# Here list all the header files that are required by a user of the library,
     379# and that therefore should be installed in 'install/coin'
     380includecoindir = $(includedir)/coin
     381includecoin_HEADERS = \
    378382        BonDummyHeuristic.hpp \
    379383        BonOaNlpOptim.hpp \
     
    493497        -rm -f libtool
    494498uninstall-info-am:
    495 install-includeHEADERS: $(include_HEADERS)
     499install-includecoinHEADERS: $(includecoin_HEADERS)
    496500        @$(NORMAL_INSTALL)
    497         test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
    498         @list='$(include_HEADERS)'; for p in $$list; do \
     501        test -z "$(includecoindir)" || $(mkdir_p) "$(DESTDIR)$(includecoindir)"
     502        @list='$(includecoin_HEADERS)'; for p in $$list; do \
    499503          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
    500504          f=$(am__strip_dir) \
    501           echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
    502           $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
     505          echo " $(includecoinHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includecoindir)/$$f'"; \
     506          $(includecoinHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includecoindir)/$$f"; \
    503507        done
    504508
    505 uninstall-includeHEADERS:
     509uninstall-includecoinHEADERS:
    506510        @$(NORMAL_UNINSTALL)
    507         @list='$(include_HEADERS)'; for p in $$list; do \
     511        @list='$(includecoin_HEADERS)'; for p in $$list; do \
    508512          f=$(am__strip_dir) \
    509           echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
    510           rm -f "$(DESTDIR)$(includedir)/$$f"; \
     513          echo " rm -f '$(DESTDIR)$(includecoindir)/$$f'"; \
     514          rm -f "$(DESTDIR)$(includecoindir)/$$f"; \
    511515        done
    512516
     
    590594all-am: Makefile $(LTLIBRARIES) $(HEADERS)
    591595installdirs:
    592         for dir in "$(DESTDIR)$(includedir)"; do \
     596        for dir in "$(DESTDIR)$(includecoindir)"; do \
    593597          test -z "$$dir" || $(mkdir_p) "$$dir"; \
    594598        done
     
    639643info-am:
    640644
    641 install-data-am: install-includeHEADERS
     645install-data-am: install-includecoinHEADERS
    642646
    643647install-exec-am:
     
    667671ps-am:
    668672
    669 uninstall-am: uninstall-includeHEADERS uninstall-info-am
     673uninstall-am: uninstall-includecoinHEADERS uninstall-info-am
    670674
    671675.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
     
    674678        distclean-tags distdir dvi dvi-am html html-am info info-am \
    675679        install install-am install-data install-data-am install-exec \
    676         install-exec-am install-includeHEADERS install-info \
     680        install-exec-am install-includecoinHEADERS install-info \
    677681        install-info-am install-man install-strip installcheck \
    678682        installcheck-am installdirs maintainer-clean \
    679683        maintainer-clean-generic mostlyclean mostlyclean-compile \
    680684        mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
    681         tags uninstall uninstall-am uninstall-includeHEADERS \
     685        tags uninstall uninstall-am uninstall-includecoinHEADERS \
    682686        uninstall-info-am
    683687
  • trunk/Bonmin/src/CbcBonmin/Makefile.am

    r916 r1014  
    118118########################################################################
    119119
    120 include_HEADERS = \
     120# Here list all the header files that are required by a user of the library,
     121# and that therefore should be installed in 'install/coin'
     122includecoindir = $(includedir)/coin
     123includecoin_HEADERS = \
    121124     BonCbcNlpStrategy.hpp \
    122125     BonCbc.hpp \
  • trunk/Bonmin/src/CbcBonmin/Makefile.in

    r916 r1014  
    5050
    5151subdir = src/CbcBonmin
    52 DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \
     52DIST_COMMON = $(includecoin_HEADERS) $(srcdir)/Makefile.am \
    5353        $(srcdir)/Makefile.in
    5454ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
     
    6666  esac;
    6767am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
    68 am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"
     68am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includecoindir)"
    6969libLTLIBRARIES_INSTALL = $(INSTALL)
    7070LTLIBRARIES = $(lib_LTLIBRARIES)
     
    9696SOURCES = $(libbonmin_la_SOURCES) $(libbonminampl_la_SOURCES)
    9797DIST_SOURCES = $(libbonmin_la_SOURCES) $(libbonminampl_la_SOURCES)
    98 includeHEADERS_INSTALL = $(INSTALL_HEADER)
    99 HEADERS = $(include_HEADERS)
     98includecoinHEADERS_INSTALL = $(INSTALL_HEADER)
     99HEADERS = $(includecoin_HEADERS)
    100100ETAGS = etags
    101101CTAGS = ctags
     
    416416#                Headers that need to be installed                     #
    417417########################################################################
    418 include_HEADERS = \
     418
     419# Here list all the header files that are required by a user of the library,
     420# and that therefore should be installed in 'install/coin'
     421includecoindir = $(includedir)/coin
     422includecoin_HEADERS = \
    419423     BonCbcNlpStrategy.hpp \
    420424     BonCbc.hpp \
     
    551555        -rm -f libtool
    552556uninstall-info-am:
    553 install-includeHEADERS: $(include_HEADERS)
     557install-includecoinHEADERS: $(includecoin_HEADERS)
    554558        @$(NORMAL_INSTALL)
    555         test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
    556         @list='$(include_HEADERS)'; for p in $$list; do \
     559        test -z "$(includecoindir)" || $(mkdir_p) "$(DESTDIR)$(includecoindir)"
     560        @list='$(includecoin_HEADERS)'; for p in $$list; do \
    557561          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
    558562          f=$(am__strip_dir) \
    559           echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
    560           $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
     563          echo " $(includecoinHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includecoindir)/$$f'"; \
     564          $(includecoinHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includecoindir)/$$f"; \
    561565        done
    562566
    563 uninstall-includeHEADERS:
     567uninstall-includecoinHEADERS:
    564568        @$(NORMAL_UNINSTALL)
    565         @list='$(include_HEADERS)'; for p in $$list; do \
     569        @list='$(includecoin_HEADERS)'; for p in $$list; do \
    566570          f=$(am__strip_dir) \
    567           echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
    568           rm -f "$(DESTDIR)$(includedir)/$$f"; \
     571          echo " rm -f '$(DESTDIR)$(includecoindir)/$$f'"; \
     572          rm -f "$(DESTDIR)$(includecoindir)/$$f"; \
    569573        done
    570574
     
    648652all-am: Makefile $(LTLIBRARIES) $(HEADERS)
    649653installdirs:
    650         for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"; do \
     654        for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includecoindir)"; do \
    651655          test -z "$$dir" || $(mkdir_p) "$$dir"; \
    652656        done
     
    698702info-am:
    699703
    700 install-data-am: install-includeHEADERS
     704install-data-am: install-includecoinHEADERS
    701705
    702706install-exec-am: install-libLTLIBRARIES
     
    726730ps-am:
    727731
    728 uninstall-am: uninstall-includeHEADERS uninstall-info-am \
     732uninstall-am: uninstall-includecoinHEADERS uninstall-info-am \
    729733        uninstall-libLTLIBRARIES
    730734
     
    734738        distclean-tags distdir dvi dvi-am html html-am info info-am \
    735739        install install-am install-data install-data-am install-exec \
    736         install-exec-am install-includeHEADERS install-info \
     740        install-exec-am install-includecoinHEADERS install-info \
    737741        install-info-am install-libLTLIBRARIES install-man \
    738742        install-strip installcheck installcheck-am installdirs \
     
    740744        mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
    741745        pdf pdf-am ps ps-am tags uninstall uninstall-am \
    742         uninstall-includeHEADERS uninstall-info-am \
     746        uninstall-includecoinHEADERS uninstall-info-am \
    743747        uninstall-libLTLIBRARIES
    744748
  • trunk/Bonmin/src/Interfaces/Ampl/Makefile.am

    r659 r1014  
    6060########################################################################
    6161
    62 include_HEADERS = BonAmplInterface.hpp BonAmplTMINLP.hpp
     62# Here list all the header files that are required by a user of the library,
     63# and that therefore should be installed in 'install/coin'
     64includecoindir = $(includedir)/coin
     65includecoin_HEADERS = \
     66        BonAmplInterface.hpp BonAmplTMINLP.hpp
    6367
    6468########################################################################
  • trunk/Bonmin/src/Interfaces/Ampl/Makefile.in

    r904 r1014  
    4646@COIN_HAS_FILTERSQP_TRUE@am__append_1 = -I`$(CYGPATH_W) $(srcdir)/../Filter`
    4747subdir = src/Interfaces/Ampl
    48 DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \
     48DIST_COMMON = $(includecoin_HEADERS) $(srcdir)/Makefile.am \
    4949        $(srcdir)/Makefile.in
    5050ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
     
    8888  esac;
    8989am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
    90 am__installdirs = "$(DESTDIR)$(includedir)"
    91 includeHEADERS_INSTALL = $(INSTALL_HEADER)
    92 HEADERS = $(include_HEADERS)
     90am__installdirs = "$(DESTDIR)$(includecoindir)"
     91includecoinHEADERS_INSTALL = $(INSTALL_HEADER)
     92HEADERS = $(includecoin_HEADERS)
    9393ETAGS = etags
    9494CTAGS = ctags
     
    355355#                Headers that need to be installed                     #
    356356########################################################################
    357 include_HEADERS = BonAmplInterface.hpp BonAmplTMINLP.hpp
     357
     358# Here list all the header files that are required by a user of the library,
     359# and that therefore should be installed in 'install/coin'
     360includecoindir = $(includedir)/coin
     361includecoin_HEADERS = \
     362        BonAmplInterface.hpp BonAmplTMINLP.hpp
     363
    358364
    359365########################################################################
     
    453459        -rm -f libtool
    454460uninstall-info-am:
    455 install-includeHEADERS: $(include_HEADERS)
     461install-includecoinHEADERS: $(includecoin_HEADERS)
    456462        @$(NORMAL_INSTALL)
    457         test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
    458         @list='$(include_HEADERS)'; for p in $$list; do \
     463        test -z "$(includecoindir)" || $(mkdir_p) "$(DESTDIR)$(includecoindir)"
     464        @list='$(includecoin_HEADERS)'; for p in $$list; do \
    459465          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
    460466          f=$(am__strip_dir) \
    461           echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
    462           $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
     467          echo " $(includecoinHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includecoindir)/$$f'"; \
     468          $(includecoinHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includecoindir)/$$f"; \
    463469        done
    464470
    465 uninstall-includeHEADERS:
     471uninstall-includecoinHEADERS:
    466472        @$(NORMAL_UNINSTALL)
    467         @list='$(include_HEADERS)'; for p in $$list; do \
     473        @list='$(includecoin_HEADERS)'; for p in $$list; do \
    468474          f=$(am__strip_dir) \
    469           echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
    470           rm -f "$(DESTDIR)$(includedir)/$$f"; \
     475          echo " rm -f '$(DESTDIR)$(includecoindir)/$$f'"; \
     476          rm -f "$(DESTDIR)$(includecoindir)/$$f"; \
    471477        done
    472478
     
    550556all-am: Makefile $(LTLIBRARIES) $(HEADERS)
    551557installdirs:
    552         for dir in "$(DESTDIR)$(includedir)"; do \
     558        for dir in "$(DESTDIR)$(includecoindir)"; do \
    553559          test -z "$$dir" || $(mkdir_p) "$$dir"; \
    554560        done
     
    599605info-am:
    600606
    601 install-data-am: install-includeHEADERS
     607install-data-am: install-includecoinHEADERS
    602608
    603609install-exec-am:
     
    627633ps-am:
    628634
    629 uninstall-am: uninstall-includeHEADERS uninstall-info-am
     635uninstall-am: uninstall-includecoinHEADERS uninstall-info-am
    630636
    631637.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
     
    634640        distclean-tags distdir dvi dvi-am html html-am info info-am \
    635641        install install-am install-data install-data-am install-exec \
    636         install-exec-am install-includeHEADERS install-info \
     642        install-exec-am install-includecoinHEADERS install-info \
    637643        install-info-am install-man install-strip installcheck \
    638644        installcheck-am installdirs maintainer-clean \
    639645        maintainer-clean-generic mostlyclean mostlyclean-compile \
    640646        mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
    641         tags uninstall uninstall-am uninstall-includeHEADERS \
     647        tags uninstall uninstall-am uninstall-includecoinHEADERS \
    642648        uninstall-info-am
    643649
  • trunk/Bonmin/src/Interfaces/Filter/Makefile.am

    r1010 r1014  
    5959########################################################################
    6060
    61 include_HEADERS =  \
     61# Here list all the header files that are required by a user of the library,
     62# and that therefore should be installed in 'install/coin'
     63includecoindir = $(includedir)/coin
     64includecoin_HEADERS = \
    6265                  BonFilterSolver.hpp \
    6366                  BonBqpdSolver.hpp \
  • trunk/Bonmin/src/Interfaces/Filter/Makefile.in

    r1010 r1014  
    4949host_triplet = @host@
    5050subdir = src/Interfaces/Filter
    51 DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \
     51DIST_COMMON = $(includecoin_HEADERS) $(srcdir)/Makefile.am \
    5252        $(srcdir)/Makefile.in
    5353ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
     
    9090  esac;
    9191am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
    92 am__installdirs = "$(DESTDIR)$(includedir)"
    93 includeHEADERS_INSTALL = $(INSTALL_HEADER)
    94 HEADERS = $(include_HEADERS)
     92am__installdirs = "$(DESTDIR)$(includecoindir)"
     93includecoinHEADERS_INSTALL = $(INSTALL_HEADER)
     94HEADERS = $(includecoin_HEADERS)
    9595ETAGS = etags
    9696CTAGS = ctags
     
    357357#                Headers that need to be installed                     #
    358358########################################################################
    359 include_HEADERS = \
     359
     360# Here list all the header files that are required by a user of the library,
     361# and that therefore should be installed in 'install/coin'
     362includecoindir = $(includedir)/coin
     363includecoin_HEADERS = \
    360364                  BonFilterSolver.hpp \
    361365                  BonBqpdSolver.hpp \
     
    466470        -rm -f libtool
    467471uninstall-info-am:
    468 install-includeHEADERS: $(include_HEADERS)
     472install-includecoinHEADERS: $(includecoin_HEADERS)
    469473        @$(NORMAL_INSTALL)
    470         test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
    471         @list='$(include_HEADERS)'; for p in $$list; do \
     474        test -z "$(includecoindir)" || $(mkdir_p) "$(DESTDIR)$(includecoindir)"
     475        @list='$(includecoin_HEADERS)'; for p in $$list; do \
    472476          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
    473477          f=$(am__strip_dir) \
    474           echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
    475           $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
     478          echo " $(includecoinHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includecoindir)/$$f'"; \
     479          $(includecoinHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includecoindir)/$$f"; \
    476480        done
    477481
    478 uninstall-includeHEADERS:
     482uninstall-includecoinHEADERS:
    479483        @$(NORMAL_UNINSTALL)
    480         @list='$(include_HEADERS)'; for p in $$list; do \
     484        @list='$(includecoin_HEADERS)'; for p in $$list; do \
    481485          f=$(am__strip_dir) \
    482           echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
    483           rm -f "$(DESTDIR)$(includedir)/$$f"; \
     486          echo " rm -f '$(DESTDIR)$(includecoindir)/$$f'"; \
     487          rm -f "$(DESTDIR)$(includecoindir)/$$f"; \
    484488        done
    485489
     
    563567all-am: Makefile $(LTLIBRARIES) $(HEADERS)
    564568installdirs:
    565         for dir in "$(DESTDIR)$(includedir)"; do \
     569        for dir in "$(DESTDIR)$(includecoindir)"; do \
    566570          test -z "$$dir" || $(mkdir_p) "$$dir"; \
    567571        done
     
    612616info-am:
    613617
    614 install-data-am: install-includeHEADERS
     618install-data-am: install-includecoinHEADERS
    615619
    616620install-exec-am:
     
    640644ps-am:
    641645
    642 uninstall-am: uninstall-includeHEADERS uninstall-info-am
     646uninstall-am: uninstall-includecoinHEADERS uninstall-info-am
    643647
    644648.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
     
    647651        distclean-tags distdir dvi dvi-am html html-am info info-am \
    648652        install install-am install-data install-data-am install-exec \
    649         install-exec-am install-includeHEADERS install-info \
     653        install-exec-am install-includecoinHEADERS install-info \
    650654        install-info-am install-man install-strip installcheck \
    651655        installcheck-am installdirs maintainer-clean \
    652656        maintainer-clean-generic mostlyclean mostlyclean-compile \
    653657        mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
    654         tags uninstall uninstall-am uninstall-includeHEADERS \
     658        tags uninstall uninstall-am uninstall-includecoinHEADERS \
    655659        uninstall-info-am
    656660
  • trunk/Bonmin/src/Interfaces/Ipopt/Makefile.am

    r563 r1014  
    5555########################################################################
    5656
    57 include_HEADERS = BonIpoptInteriorWarmStarter.hpp \
    58                   BonIpoptSolver.hpp \
    59                   BonIpoptWarmStart.hpp
     57# Here list all the header files that are required by a user of the library,
     58# and that therefore should be installed in 'install/coin'
     59includecoindir = $(includedir)/coin
     60includecoin_HEADERS = \
     61        BonIpoptInteriorWarmStarter.hpp \
     62        BonIpoptSolver.hpp \
     63        BonIpoptWarmStart.hpp
    6064
    6165########################################################################
  • trunk/Bonmin/src/Interfaces/Ipopt/Makefile.in

    r904 r1014  
    4545host_triplet = @host@
    4646subdir = src/Interfaces/Ipopt
    47 DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \
     47DIST_COMMON = $(includecoin_HEADERS) $(srcdir)/Makefile.am \
    4848        $(srcdir)/Makefile.in
    4949ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
     
    8686  esac;
    8787am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
    88 am__installdirs = "$(DESTDIR)$(includedir)"
    89 includeHEADERS_INSTALL = $(INSTALL_HEADER)
    90 HEADERS = $(include_HEADERS)
     88am__installdirs = "$(DESTDIR)$(includecoindir)"
     89includecoinHEADERS_INSTALL = $(INSTALL_HEADER)
     90HEADERS = $(includecoin_HEADERS)
    9191ETAGS = etags
    9292CTAGS = ctags
     
    354354#                Headers that need to be installed                     #
    355355########################################################################
    356 include_HEADERS = BonIpoptInteriorWarmStarter.hpp \
    357                   BonIpoptSolver.hpp \
    358                   BonIpoptWarmStart.hpp
     356
     357# Here list all the header files that are required by a user of the library,
     358# and that therefore should be installed in 'install/coin'
     359includecoindir = $(includedir)/coin
     360includecoin_HEADERS = \
     361        BonIpoptInteriorWarmStarter.hpp \
     362        BonIpoptSolver.hpp \
     363        BonIpoptWarmStart.hpp
    359364
    360365
     
    459464        -rm -f libtool
    460465uninstall-info-am:
    461 install-includeHEADERS: $(include_HEADERS)
     466install-includecoinHEADERS: $(includecoin_HEADERS)
    462467        @$(NORMAL_INSTALL)
    463         test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
    464         @list='$(include_HEADERS)'; for p in $$list; do \
     468        test -z "$(includecoindir)" || $(mkdir_p) "$(DESTDIR)$(includecoindir)"
     469        @list='$(includecoin_HEADERS)'; for p in $$list; do \
    465470          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
    466471          f=$(am__strip_dir) \
    467           echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
    468           $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
     472          echo " $(includecoinHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includecoindir)/$$f'"; \
     473          $(includecoinHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includecoindir)/$$f"; \
    469474        done
    470475
    471 uninstall-includeHEADERS:
     476uninstall-includecoinHEADERS:
    472477        @$(NORMAL_UNINSTALL)
    473         @list='$(include_HEADERS)'; for p in $$list; do \
     478        @list='$(includecoin_HEADERS)'; for p in $$list; do \
    474479          f=$(am__strip_dir) \
    475           echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
    476           rm -f "$(DESTDIR)$(includedir)/$$f"; \
     480          echo " rm -f '$(DESTDIR)$(includecoindir)/$$f'"; \
     481          rm -f "$(DESTDIR)$(includecoindir)/$$f"; \
    477482        done
    478483
     
    556561all-am: Makefile $(LTLIBRARIES) $(HEADERS)
    557562installdirs:
    558         for dir in "$(DESTDIR)$(includedir)"; do \
     563        for dir in "$(DESTDIR)$(includecoindir)"; do \
    559564          test -z "$$dir" || $(mkdir_p) "$$dir"; \
    560565        done
     
    605610info-am:
    606611
    607 install-data-am: install-includeHEADERS
     612install-data-am: install-includecoinHEADERS
    608613
    609614install-exec-am:
     
    633638ps-am:
    634639
    635 uninstall-am: uninstall-includeHEADERS uninstall-info-am
     640uninstall-am: uninstall-includecoinHEADERS uninstall-info-am
    636641
    637642.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
     
    640645        distclean-tags distdir dvi dvi-am html html-am info info-am \
    641646        install install-am install-data install-data-am install-exec \
    642         install-exec-am install-includeHEADERS install-info \
     647        install-exec-am install-includecoinHEADERS install-info \
    643648        install-info-am install-man install-strip installcheck \
    644649        installcheck-am installdirs maintainer-clean \
    645650        maintainer-clean-generic mostlyclean mostlyclean-compile \
    646651        mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
    647         tags uninstall uninstall-am uninstall-includeHEADERS \
     652        tags uninstall uninstall-am uninstall-includecoinHEADERS \
    648653        uninstall-info-am
    649654
  • trunk/Bonmin/src/Interfaces/Makefile.am

    r982 r1014  
    9999########################################################################
    100100
    101 include_HEADERS = \
     101# Here list all the header files that are required by a user of the library,
     102# and that therefore should be installed in 'install/coin'
     103includecoindir = $(includedir)/coin
     104includecoin_HEADERS = \
    102105     ../../inc/config_bonmin.h \
    103106     BonOsiTMINLPInterface.hpp \
     
    124127        echo "#endif" >> bla
    125128        cat $(srcdir)/$(ConfigHeader) >> bla
    126         $(install_sh_DATA) bla $(DESTDIR)$(includedir)/$(ConfigHeader)
     129        $(install_sh_DATA) bla $(DESTDIR)$(includecoindir)/$(ConfigHeader)
    127130        rm -f bla
    128131
    129132uninstall-local:
    130         rm -f $(DESTDIR)$(includedir)/$(ConfigHeader)
     133        rm -f $(DESTDIR)$(includecoindir)/$(ConfigHeader)
    131134
    132135########################################################################
  • trunk/Bonmin/src/Interfaces/Makefile.in

    r982 r1014  
    4949@COIN_HAS_FILTERSQP_TRUE@am__append_3 = Filter/libfilterinterface.la
    5050subdir = src/Interfaces
    51 DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \
     51DIST_COMMON = $(includecoin_HEADERS) $(srcdir)/Makefile.am \
    5252        $(srcdir)/Makefile.in
    5353ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
     
    101101  esac;
    102102am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
    103 am__installdirs = "$(DESTDIR)$(includedir)"
    104 includeHEADERS_INSTALL = $(INSTALL_HEADER)
    105 HEADERS = $(include_HEADERS)
     103am__installdirs = "$(DESTDIR)$(includecoindir)"
     104includecoinHEADERS_INSTALL = $(INSTALL_HEADER)
     105HEADERS = $(includecoin_HEADERS)
    106106ETAGS = etags
    107107CTAGS = ctags
     
    410410#                Headers that need to be installed                     #
    411411########################################################################
    412 include_HEADERS = \
     412
     413# Here list all the header files that are required by a user of the library,
     414# and that therefore should be installed in 'install/coin'
     415includecoindir = $(includedir)/coin
     416includecoin_HEADERS = \
    413417     ../../inc/config_bonmin.h \
    414418     BonOsiTMINLPInterface.hpp \
     
    566570        -rm -f libtool
    567571uninstall-info-am:
    568 install-includeHEADERS: $(include_HEADERS)
     572install-includecoinHEADERS: $(includecoin_HEADERS)
    569573        @$(NORMAL_INSTALL)
    570         test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
    571         @list='$(include_HEADERS)'; for p in $$list; do \
     574        test -z "$(includecoindir)" || $(mkdir_p) "$(DESTDIR)$(includecoindir)"
     575        @list='$(includecoin_HEADERS)'; for p in $$list; do \
    572576          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
    573577          f=$(am__strip_dir) \
    574           echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
    575           $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
     578          echo " $(includecoinHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includecoindir)/$$f'"; \
     579          $(includecoinHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includecoindir)/$$f"; \
    576580        done
    577581
    578 uninstall-includeHEADERS:
     582uninstall-includecoinHEADERS:
    579583        @$(NORMAL_UNINSTALL)
    580         @list='$(include_HEADERS)'; for p in $$list; do \
     584        @list='$(includecoin_HEADERS)'; for p in $$list; do \
    581585          f=$(am__strip_dir) \
    582           echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
    583           rm -f "$(DESTDIR)$(includedir)/$$f"; \
     586          echo " rm -f '$(DESTDIR)$(includecoindir)/$$f'"; \
     587          rm -f "$(DESTDIR)$(includecoindir)/$$f"; \
    584588        done
    585589
     
    764768installdirs: installdirs-recursive
    765769installdirs-am:
    766         for dir in "$(DESTDIR)$(includedir)"; do \
     770        for dir in "$(DESTDIR)$(includecoindir)"; do \
    767771          test -z "$$dir" || $(mkdir_p) "$$dir"; \
    768772        done
     
    813817info-am:
    814818
    815 install-data-am: install-includeHEADERS
     819install-data-am: install-includecoinHEADERS
    816820
    817821install-exec-am: install-exec-local
     
    841845ps-am:
    842846
    843 uninstall-am: uninstall-includeHEADERS uninstall-info-am \
     847uninstall-am: uninstall-includecoinHEADERS uninstall-info-am \
    844848        uninstall-local
    845849
     
    853857        html-am info info-am install install-am install-data \
    854858        install-data-am install-exec install-exec-am \
    855         install-exec-local install-includeHEADERS install-info \
     859        install-exec-local install-includecoinHEADERS install-info \
    856860        install-info-am install-man install-strip installcheck \
    857861        installcheck-am installdirs installdirs-am maintainer-clean \
     
    860864        mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
    861865        tags tags-recursive uninstall uninstall-am \
    862         uninstall-includeHEADERS uninstall-info-am uninstall-local
     866        uninstall-includecoinHEADERS uninstall-info-am uninstall-local
    863867
    864868
     
    868872        echo "#endif" >> bla
    869873        cat $(srcdir)/$(ConfigHeader) >> bla
    870         $(install_sh_DATA) bla $(DESTDIR)$(includedir)/$(ConfigHeader)
     874        $(install_sh_DATA) bla $(DESTDIR)$(includecoindir)/$(ConfigHeader)
    871875        rm -f bla
    872876
    873877uninstall-local:
    874         rm -f $(DESTDIR)$(includedir)/$(ConfigHeader)
     878        rm -f $(DESTDIR)$(includecoindir)/$(ConfigHeader)
    875879
    876880astyle: $(ASTYLE_FILES)
Note: See TracChangeset for help on using the changeset viewer.