Changeset 624


Ignore:
Timestamp:
Jun 9, 2011 11:21:30 AM (9 years ago)
Author:
stefan
Message:

change to new way of using and installing configuration header files; avoid using private symbols from config.h (like COIN_HAS_ASL, COIN_HAS_NTY, COIN_HAS_SCIP) in public header files

Location:
trunk/Couenne
Files:
4 added
1 deleted
45 edited

Legend:

Unmodified
Added
Removed
  • trunk/Couenne/Makefile.in

    r623 r624  
    6464        $(srcdir)/BuildTools/Makemain.inc $(srcdir)/Makefile.am \
    6565        $(srcdir)/Makefile.in $(srcdir)/couenne-uninstalled.pc.in \
    66         $(srcdir)/couenne.pc.in $(top_srcdir)/configure \
    67         $(top_srcdir)/inc/config_couenne.h.in AUTHORS config.guess \
    68         config.sub depcomp install-sh ltmain.sh missing
     66        $(srcdir)/couenne.pc.in $(top_srcdir)/configure AUTHORS \
     67        config.guess config.sub depcomp install-sh ltmain.sh missing
    6968@HAVE_EXTERNALS_TRUE@am__append_3 = Dependencies
    7069@HAVE_EXTERNALS_TRUE@am__append_4 = .Dependencies-stamp
     
    7877 configure.lineno configure.status.lineno
    7978mkinstalldirs = $(install_sh) -d
    80 CONFIG_HEADER = $(top_builddir)/inc/config_couenne.h
     79CONFIG_HEADER = $(top_builddir)/src/config.h \
     80        $(top_builddir)/src/config_couenne.h
    8181CONFIG_CLEAN_FILES = couenne.pc couenne-uninstalled.pc
    8282SOURCES =
     
    420420$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
    421421        cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
    422 
    423 inc/config_couenne.h: inc/stamp-h1
    424         @if test ! -f $@; then \
    425           rm -f inc/stamp-h1; \
    426           $(MAKE) inc/stamp-h1; \
    427         else :; fi
    428 
    429 inc/stamp-h1: $(top_srcdir)/inc/config_couenne.h.in $(top_builddir)/config.status
    430         @rm -f inc/stamp-h1
    431         cd $(top_builddir) && $(SHELL) ./config.status inc/config_couenne.h
    432 $(top_srcdir)/inc/config_couenne.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
    433         cd $(top_srcdir) && $(AUTOHEADER)
    434         rm -f inc/stamp-h1
    435         touch $@
    436 
    437 distclean-hdr:
    438         -rm -f inc/config_couenne.h inc/stamp-h1
    439422couenne.pc: $(top_builddir)/config.status $(srcdir)/couenne.pc.in
    440423        cd $(top_builddir) && $(SHELL) ./config.status $@
     
    604587        $(am__remove_distdir)
    605588        mkdir $(distdir)
    606         $(mkdir_p) $(distdir)/. $(distdir)/BuildTools $(distdir)/inc $(distdir)/test
     589        $(mkdir_p) $(distdir)/. $(distdir)/BuildTools $(distdir)/test
    607590        @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
    608591        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
     
    783766        -rm -f $(am__CONFIG_DISTCLEAN_FILES)
    784767        -rm -f Makefile
    785 distclean-am: clean-am distclean-generic distclean-hdr \
    786         distclean-libtool distclean-local distclean-tags
     768distclean-am: clean-am distclean-generic distclean-libtool \
     769        distclean-local distclean-tags
    787770
    788771dvi: dvi-recursive
     
    837820        clean-recursive ctags ctags-recursive dist dist-all dist-bzip2 \
    838821        dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \
    839         distclean-generic distclean-hdr distclean-libtool \
    840         distclean-local distclean-recursive distclean-tags \
    841         distcleancheck distdir distuninstallcheck dvi dvi-am html \
    842         html-am info info-am install install-am install-data \
    843         install-data-am install-data-hook install-exec install-exec-am \
     822        distclean-generic distclean-libtool distclean-local \
     823        distclean-recursive distclean-tags distcleancheck distdir \
     824        distuninstallcheck dvi dvi-am html html-am info info-am \
     825        install install-am install-data install-data-am \
     826        install-data-hook install-exec install-exec-am \
    844827        install-exec-local install-info install-info-am install-man \
    845828        install-pkgconfiglibDATA install-strip installcheck \
  • trunk/Couenne/configure

    r623 r624  
    28502850        coin_opt_cflags="-O3"
    28512851        coin_add_cflags="-pipe"
    2852         coin_dbg_cflags="-g"
     2852        coin_dbg_cflags="-g -O0"
    28532853        coin_warn_cflags="-Wimplicit -Wparentheses -Wsequence-point -Wreturn-type -Wcast-qual -Wall -Wno-unknown-pragmas -Wno-long-long"
    28542854        case $build in
     
    37823782        coin_opt_cxxflags="-O3"
    37833783        coin_add_cxxflags="-pipe"
    3784         coin_dbg_cxxflags="-g"
     3784        coin_dbg_cxxflags="-g -O0"
    37853785        coin_warn_cxxflags="-Wparentheses -Wreturn-type -Wcast-qual -Wall -Wpointer-arith -Wwrite-strings -Wconversion -Wno-unknown-pragmas -Wno-long-long"
    37863786        case $build in
     
    48894889        coin_opt_cflags="-O3"
    48904890        coin_add_cflags="-pipe"
    4891         coin_dbg_cflags="-g"
     4891        coin_dbg_cflags="-g -O0"
    48924892        coin_warn_cflags="-Wimplicit -Wparentheses -Wsequence-point -Wreturn-type -Wcast-qual -Wall -Wno-unknown-pragmas -Wno-long-long"
    48934893        case $build in
     
    2320523205
    2320623206
     23207# more workaround for having ASL deep inside Couenne
     23208if test $coin_has_asl = yes ; then
     23209
     23210cat >>confdefs.h <<\_ACEOF
     23211#define COUENNEINTERFACE_FROM_ASL 1
     23212_ACEOF
     23213
     23214fi
     23215
    2320723216# Nauty library (for symmetry detection)
    2320823217ac_ext=c
     
    2820028209
    2820128210# Here put the location and name of the configuration header file
    28202           ac_config_headers="$ac_config_headers inc/config_couenne.h"
     28211                    ac_config_headers="$ac_config_headers src/config.h src/config_couenne.h"
    2820328212
    2820428213
     
    2902629035  "couenne-uninstalled.pc" ) CONFIG_FILES="$CONFIG_FILES couenne-uninstalled.pc" ;;
    2902729036  "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
    29028   "inc/config_couenne.h" ) CONFIG_HEADERS="$CONFIG_HEADERS inc/config_couenne.h" ;;
     29037  "src/config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS src/config.h" ;;
     29038  "src/config_couenne.h" ) CONFIG_HEADERS="$CONFIG_HEADERS src/config_couenne.h" ;;
    2902929039  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
    2903029040echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
  • trunk/Couenne/configure.ac

    r623 r624  
    7474AC_COIN_CHECK_PACKAGE(ASL, [bonminamplinterface], [CouenneLib])
    7575
     76# more workaround for having ASL deep inside Couenne
     77if test $coin_has_asl = yes ; then
     78  AC_DEFINE(COUENNEINTERFACE_FROM_ASL, 1, [whether CouenneInterface is derived from Bonmin's AmplInterface])
     79fi
     80
    7681# Nauty library (for symmetry detection)
    7782AC_LANG_PUSH(C)
     
    140145
    141146# Here put the location and name of the configuration header file
    142 AC_CONFIG_HEADER([inc/config_couenne.h])
     147AC_CONFIG_HEADER([src/config.h src/config_couenne.h])
    143148
    144149# Finally, we let configure write all the output...
  • trunk/Couenne/couenne-uninstalled.pc.in

    r487 r624  
    77Version: @PACKAGE_VERSION@
    88Libs: ${libdir}/main/libBonCouenne.la ${libdir}/libCouenne.la @COUENNELIB_PCLIBS@
    9 Cflags: -I@abs_source_dir@/src -I@abs_source_dir@/src/main -I@abs_source_dir@/src/expression -I@abs_source_dir@/src/expression/operators -I@abs_source_dir@/src/problem -I@abs_source_dir@/src/convex -I@abs_source_dir@/src/interfaces -I@ABSBUILDDIR@/inc
     9Cflags: -I@abs_source_dir@/src -I@abs_source_dir@/src/main -I@abs_source_dir@/src/expression -I@abs_source_dir@/src/expression/operators -I@abs_source_dir@/src/problem -I@abs_source_dir@/src/convex -I@abs_source_dir@/src/interfaces -I@ABSBUILDDIR@/src
    1010Requires: @COUENNELIB_PCREQUIRES@
  • trunk/Couenne/src/CouenneConfig.h

    r487 r624  
    1 /* $Id$ */
    2 /*
     1/* Copyright (C) 2011
     2 * All Rights Reserved.
     3 * This code is published under the Eclipse Public License.
     4 *
     5 * $Id$
     6 *
    37 * Include file for the configuration of Couenne.
    48 *
     
    1216 * macros that depend on the operating system and the compiler.  The
    1317 * macros that define the configuration of the particular user setting
    14  * (e.g., presence of other COIN packages or third party code) are set
    15  * here.  The project maintainer needs to remember to update this file
    16  * and choose reasonable defines.  A user can modify the default
    17  * setting by editing this file here.
     18 * (e.g., presence of other COIN-OR packages or third party code) are set
     19 * by the files config_*default.h. The project maintainer needs to remember
     20 * to update these file and choose reasonable defines.
     21 * A user can modify the default setting by editing the config_*default.h files.
    1822 *
    1923 */
    2024
    2125#ifndef __COUENNECONFIG_H__
     26#define __COUENNECONFIG_H__
    2227
    2328#ifdef HAVE_CONFIG_H
     29#ifdef COUENNE_BUILD
     30#include "config.h"
     31#else
    2432#include "config_couenne.h"
    25 
    26 /* undefine macros that could conflict with those in other config.h
    27    files */
    28 #undef PACKAGE
    29 #undef PACKAGE_BUGREPORT
    30 #undef PACKAGE_NAME
    31 #undef PACKAGE_STRING
    32 #undef PACKAGE_TARNAME
    33 #undef PACKAGE_VERSION
    34 #undef VERSION
     33#endif
    3534
    3635#else /* HAVE_CONFIG_H */
    3736
    38 /* include the COIN-wide system specific configure header */
    39 #include "configall_system.h"
    40 
    41 /***************************************************************************/
    42 /*             HERE DEFINE THE CONFIGURATION SPECIFIC MACROS               */
    43 /***************************************************************************/
    44 
    45 /* Define to the debug sanity check level (0 is no test) */
    46 #define COIN_COUENNE_CHECKLEVEL 0
    47 
    48 /* Define to the debug verbosity level (0 is no output) */
    49 #define COIN_COUENNE_VERBOSITY 0
    50 
    51 /* If defined, the Ampl Solver Library is available. */
    52 /* #undef COIN_HAS_ASL */
     37#ifdef COUENNE_BUILD
     38#include "config_default.h"
     39#else
     40#include "config_couenne_default.h"
     41#endif
    5342
    5443#endif /* HAVE_CONFIG_H */
  • trunk/Couenne/src/Makefile.am

    r608 r624  
    6868#       -I`$(CYGPATH_W) $(srcdir)/ellipcuts`
    6969
    70 if COIN_HAS_SPX
    71 AM_CPPFLAGS += $(SPXINCDIR)
    72 endif
    73 
    74 # This line is necessary to allow VPATH compilation with MS compilers
    75 # on Cygwin
    76 DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)` -I$(top_builddir)/inc
     70# This line is necessary to allow VPATH compilation
     71DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)`
    7772
    7873########################################################################
     
    8479includecoindir = $(includedir)/coin
    8580includecoin_HEADERS = \
    86         ../inc/config_couenne.h \
    8781        util/CouenneRootQ.hpp \
    8882        util/CouenneFunTriplets.hpp \
     
    9589        heuristics/BonInitHeuristic.hpp \
    9690        heuristics/CouenneFeasPump.hpp \
    97         heuristics/CouenneIterativeRounding.hpp \
    9891        branch/CouenneObject.hpp \
    9992        branch/CouenneVarObject.hpp \
     
    185178endif
    186179
    187 #############################################################################
    188 # Create the Config.h file that always defines HAVE_CONFIG_H and install it #
    189 #############################################################################
    190 
    191 # You only need to adapt the following line
    192 ConfigHeader = CouenneConfig.h
    193 
    194180install-exec-local:
    195         echo "#ifndef HAVE_CONFIG_H" >bla
    196         echo "#define HAVE_CONFIG_H" >>bla
    197         echo "#endif" >> bla
    198         cat $(srcdir)/$(ConfigHeader) >> bla
    199         $(install_sh_DATA) bla $(DESTDIR)$(includecoindir)/$(ConfigHeader)
    200         rm -f bla
     181        $(install_sh_DATA) config_couenne.h $(DESTDIR)$(includecoindir)/CouenneConfig.h
    201182
    202183uninstall-local:
    203         rm -f $(DESTDIR)$(includecoindir)/$(ConfigHeader)
     184        rm -f $(DESTDIR)$(includecoindir)/CouenneConfig.h
  • trunk/Couenne/src/Makefile.in

    r623 r624  
    4747host_triplet = @host@
    4848
    49 # AM_CPPFLAGS = $(COUENNELIB_CFLAGS) \
    50 #       -I`$(CYGPATH_W) $(srcdir)/convex` \
    51 #       -I`$(CYGPATH_W) $(srcdir)/interfaces` \
    52 #       -I`$(CYGPATH_W) $(srcdir)/heuristics` \
    53 #       -I`$(CYGPATH_W) $(srcdir)/expression` \
    54 #       -I`$(CYGPATH_W) $(srcdir)/expression/operators` \
    55 #       -I`$(CYGPATH_W) $(srcdir)/disjunctive` \
    56 #       -I`$(CYGPATH_W) $(srcdir)/main` \
    57 #       -I`$(CYGPATH_W) $(srcdir)/problem` \
    58 #       -I`$(CYGPATH_W) $(srcdir)/branch` \
    59 #       -I`$(CYGPATH_W) $(srcdir)/cut/sdpcuts` \
    60 #       -I`$(CYGPATH_W) $(srcdir)/cut/crossconv` \
    61 #       -I`$(CYGPATH_W) $(srcdir)/two_implied_bt`
    62 
    63 #       -I`$(CYGPATH_W) $(srcdir)/ellipcuts`
    64 @COIN_HAS_SPX_TRUE@am__append_1 = $(SPXINCDIR)
    65 
    6649#       ellipcuts/CouenneEllipCuts.hpp
    67 @COIN_HAS_NTY_TRUE@am__append_2 = branch/Nauty.h
     50@COIN_HAS_NTY_TRUE@am__append_1 = branch/Nauty.h
    6851subdir = src
    6952DIST_COMMON = $(am__includecoin_HEADERS_DIST) $(srcdir)/Makefile.am \
    70         $(srcdir)/Makefile.in
     53        $(srcdir)/Makefile.in $(srcdir)/config.h.in \
     54        $(srcdir)/config_couenne.h.in
    7155ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
    7256am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
     
    7559        $(ACLOCAL_M4)
    7660mkinstalldirs = $(install_sh) -d
    77 CONFIG_HEADER = $(top_builddir)/inc/config_couenne.h
     61CONFIG_HEADER = config.h config_couenne.h
    7862CONFIG_CLEAN_FILES =
    7963am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
     
    9882SOURCES = $(libCouenne_la_SOURCES)
    9983DIST_SOURCES = $(libCouenne_la_SOURCES)
    100 am__includecoin_HEADERS_DIST = ../inc/config_couenne.h \
    101         util/CouenneRootQ.hpp util/CouenneFunTriplets.hpp \
    102         main/BonCouenneInfo.hpp main/BonCouenneSetup.hpp \
    103         interfaces/BonCouenneInterface.hpp interfaces/CouenneTNLP.hpp \
     84am__includecoin_HEADERS_DIST = util/CouenneRootQ.hpp \
     85        util/CouenneFunTriplets.hpp main/BonCouenneInfo.hpp \
     86        main/BonCouenneSetup.hpp interfaces/BonCouenneInterface.hpp \
     87        interfaces/CouenneTNLP.hpp \
    10488        interfaces/CouenneMINLPInterface.hpp \
    10589        heuristics/BonNlpHeuristic.hpp heuristics/BonInitHeuristic.hpp \
    106         heuristics/CouenneFeasPump.hpp \
    107         heuristics/CouenneIterativeRounding.hpp \
    108         branch/CouenneObject.hpp branch/CouenneVarObject.hpp \
    109         branch/CouenneVTObject.hpp branch/CouenneThreeWayBranchObj.hpp \
     90        heuristics/CouenneFeasPump.hpp branch/CouenneObject.hpp \
     91        branch/CouenneVarObject.hpp branch/CouenneVTObject.hpp \
     92        branch/CouenneThreeWayBranchObj.hpp \
    11093        branch/CouenneBranchingObject.hpp \
    11194        branch/CouenneChooseVariable.hpp \
     
    448431# Here list all include flags, relative to this "srcdir" directory.  This
    449432# "cygpath" stuff is necessary to compile with native compilers on Windows.
    450 AM_CPPFLAGS = $(am__append_1)
    451 
    452 # This line is necessary to allow VPATH compilation with MS compilers
    453 # on Cygwin
    454 DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)` -I$(top_builddir)/inc
     433AM_CPPFLAGS =
     434
     435# AM_CPPFLAGS = $(COUENNELIB_CFLAGS) \
     436#       -I`$(CYGPATH_W) $(srcdir)/convex` \
     437#       -I`$(CYGPATH_W) $(srcdir)/interfaces` \
     438#       -I`$(CYGPATH_W) $(srcdir)/heuristics` \
     439#       -I`$(CYGPATH_W) $(srcdir)/expression` \
     440#       -I`$(CYGPATH_W) $(srcdir)/expression/operators` \
     441#       -I`$(CYGPATH_W) $(srcdir)/disjunctive` \
     442#       -I`$(CYGPATH_W) $(srcdir)/main` \
     443#       -I`$(CYGPATH_W) $(srcdir)/problem` \
     444#       -I`$(CYGPATH_W) $(srcdir)/branch` \
     445#       -I`$(CYGPATH_W) $(srcdir)/cut/sdpcuts` \
     446#       -I`$(CYGPATH_W) $(srcdir)/cut/crossconv` \
     447#       -I`$(CYGPATH_W) $(srcdir)/two_implied_bt`
     448
     449#       -I`$(CYGPATH_W) $(srcdir)/ellipcuts`
     450
     451# This line is necessary to allow VPATH compilation
     452DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)`
    455453
    456454########################################################################
     
    461459# and that therefore should be installed in 'include/coin'
    462460includecoindir = $(includedir)/coin
    463 includecoin_HEADERS = ../inc/config_couenne.h util/CouenneRootQ.hpp \
     461includecoin_HEADERS = util/CouenneRootQ.hpp \
    464462        util/CouenneFunTriplets.hpp main/BonCouenneInfo.hpp \
    465463        main/BonCouenneSetup.hpp interfaces/BonCouenneInterface.hpp \
     
    467465        interfaces/CouenneMINLPInterface.hpp \
    468466        heuristics/BonNlpHeuristic.hpp heuristics/BonInitHeuristic.hpp \
    469         heuristics/CouenneFeasPump.hpp \
    470         heuristics/CouenneIterativeRounding.hpp \
    471         branch/CouenneObject.hpp branch/CouenneVarObject.hpp \
    472         branch/CouenneVTObject.hpp branch/CouenneThreeWayBranchObj.hpp \
     467        heuristics/CouenneFeasPump.hpp branch/CouenneObject.hpp \
     468        branch/CouenneVarObject.hpp branch/CouenneVTObject.hpp \
     469        branch/CouenneThreeWayBranchObj.hpp \
    473470        branch/CouenneBranchingObject.hpp \
    474471        branch/CouenneChooseVariable.hpp \
     
    530527        cut/sdpcuts/populate.hpp cut/sdpcuts/quadratic_cuts_check.hpp \
    531528        cut/sdpcuts/rlt_cuts.hpp cut/sdpcuts/sdpcuts.hpp \
    532         cut/sdpcuts/tracer.hpp $(am__append_2)
    533 
    534 #############################################################################
    535 # Create the Config.h file that always defines HAVE_CONFIG_H and install it #
    536 #############################################################################
    537 
    538 # You only need to adapt the following line
    539 ConfigHeader = CouenneConfig.h
    540 all: all-am
     529        cut/sdpcuts/tracer.hpp $(am__append_1)
     530all: config.h config_couenne.h
     531        $(MAKE) $(AM_MAKEFLAGS) all-am
    541532
    542533.SUFFIXES:
     
    570561$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
    571562        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
     563
     564config.h: stamp-h1
     565        @if test ! -f $@; then \
     566          rm -f stamp-h1; \
     567          $(MAKE) stamp-h1; \
     568        else :; fi
     569
     570stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
     571        @rm -f stamp-h1
     572        cd $(top_builddir) && $(SHELL) ./config.status src/config.h
     573$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
     574        cd $(top_srcdir) && $(AUTOHEADER)
     575        rm -f stamp-h1
     576        touch $@
     577
     578config_couenne.h: stamp-h2
     579        @if test ! -f $@; then \
     580          rm -f stamp-h2; \
     581          $(MAKE) stamp-h2; \
     582        else :; fi
     583
     584stamp-h2: $(srcdir)/config_couenne.h.in $(top_builddir)/config.status
     585        @rm -f stamp-h2
     586        cd $(top_builddir) && $(SHELL) ./config.status src/config_couenne.h
     587
     588distclean-hdr:
     589        -rm -f config.h stamp-h1 config_couenne.h stamp-h2
    572590install-libLTLIBRARIES: $(lib_LTLIBRARIES)
    573591        @$(NORMAL_INSTALL)
     
    643661tags: TAGS
    644662
    645 TAGS:  $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
     663TAGS:  $(HEADERS) $(SOURCES) config.h.in config_couenne.h.in $(TAGS_DEPENDENCIES) \
    646664                $(TAGS_FILES) $(LISP)
    647665        tags=; \
    648666        here=`pwd`; \
    649         list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
     667        list='$(SOURCES) $(HEADERS) config.h.in config_couenne.h.in $(LISP) $(TAGS_FILES)'; \
    650668        unique=`for i in $$list; do \
    651669            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
     
    659677        fi
    660678ctags: CTAGS
    661 CTAGS:  $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
     679CTAGS:  $(HEADERS) $(SOURCES) config.h.in config_couenne.h.in $(TAGS_DEPENDENCIES) \
    662680                $(TAGS_FILES) $(LISP)
    663681        tags=; \
    664682        here=`pwd`; \
    665         list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
     683        list='$(SOURCES) $(HEADERS) config.h.in config_couenne.h.in $(LISP) $(TAGS_FILES)'; \
    666684        unique=`for i in $$list; do \
    667685            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
     
    682700
    683701distdir: $(DISTFILES)
    684         $(mkdir_p) $(distdir)/../inc $(distdir)/bound_tightening $(distdir)/bound_tightening/twoImpliedBT $(distdir)/branch $(distdir)/convex $(distdir)/cut/crossconv $(distdir)/cut/sdpcuts $(distdir)/disjunctive $(distdir)/expression $(distdir)/expression/operators $(distdir)/expression/operators/bounds $(distdir)/expression/partial $(distdir)/heuristics $(distdir)/interfaces $(distdir)/main $(distdir)/problem $(distdir)/problem/depGraph $(distdir)/standardize $(distdir)/util
     702        $(mkdir_p) $(distdir)/bound_tightening $(distdir)/bound_tightening/twoImpliedBT $(distdir)/branch $(distdir)/convex $(distdir)/cut/crossconv $(distdir)/cut/sdpcuts $(distdir)/disjunctive $(distdir)/expression $(distdir)/expression/operators $(distdir)/expression/operators/bounds $(distdir)/expression/partial $(distdir)/heuristics $(distdir)/interfaces $(distdir)/main $(distdir)/problem $(distdir)/problem/depGraph $(distdir)/standardize $(distdir)/util
    685703        @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
    686704        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
     
    711729check-am: all-am
    712730check: check-am
    713 all-am: Makefile $(LTLIBRARIES) $(HEADERS)
     731all-am: Makefile $(LTLIBRARIES) $(HEADERS) config.h config_couenne.h
    714732installdirs:
    715733        for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includecoindir)"; do \
     
    748766        -rm -f Makefile
    749767distclean-am: clean-am distclean-compile distclean-generic \
    750         distclean-libtool distclean-tags
     768        distclean-hdr distclean-libtool distclean-tags
    751769
    752770dvi: dvi-am
     
    792810.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
    793811        clean-libLTLIBRARIES clean-libtool ctags distclean \
    794         distclean-compile distclean-generic distclean-libtool \
    795         distclean-tags distdir dvi dvi-am html html-am info info-am \
    796         install install-am install-data install-data-am install-exec \
    797         install-exec-am install-exec-local install-includecoinHEADERS \
    798         install-info install-info-am install-libLTLIBRARIES \
    799         install-man install-strip installcheck installcheck-am \
    800         installdirs maintainer-clean maintainer-clean-generic \
    801         mostlyclean mostlyclean-compile mostlyclean-generic \
    802         mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
    803         uninstall-am uninstall-includecoinHEADERS uninstall-info-am \
     812        distclean-compile distclean-generic distclean-hdr \
     813        distclean-libtool distclean-tags distdir dvi dvi-am html \
     814        html-am info info-am install install-am install-data \
     815        install-data-am install-exec install-exec-am \
     816        install-exec-local install-includecoinHEADERS install-info \
     817        install-info-am install-libLTLIBRARIES install-man \
     818        install-strip installcheck installcheck-am installdirs \
     819        maintainer-clean maintainer-clean-generic mostlyclean \
     820        mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
     821        pdf pdf-am ps ps-am tags uninstall uninstall-am \
     822        uninstall-includecoinHEADERS uninstall-info-am \
    804823        uninstall-libLTLIBRARIES uninstall-local
    805824
    806825
    807826install-exec-local:
    808         echo "#ifndef HAVE_CONFIG_H" >bla
    809         echo "#define HAVE_CONFIG_H" >>bla
    810         echo "#endif" >> bla
    811         cat $(srcdir)/$(ConfigHeader) >> bla
    812         $(install_sh_DATA) bla $(DESTDIR)$(includecoindir)/$(ConfigHeader)
    813         rm -f bla
     827        $(install_sh_DATA) config_couenne.h $(DESTDIR)$(includecoindir)/CouenneConfig.h
    814828
    815829uninstall-local:
    816         rm -f $(DESTDIR)$(includecoindir)/$(ConfigHeader)
     830        rm -f $(DESTDIR)$(includecoindir)/CouenneConfig.h
    817831# Tell versions [3.59,3.63) of GNU make to not export all variables.
    818832# Otherwise a system limit (for SysV at least) may be exceeded.
  • trunk/Couenne/src/bound_tightening/Makefile.am

    r488 r624  
    4747        -I`$(CYGPATH_W) $(srcdir)/../expression/operators`
    4848
    49 # This line is necessary to allow VPATH compilation with MS compilers
    50 # on Cygwin
    51 DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)` -I$(top_builddir)/inc
     49# This line is necessary to allow VPATH compilation
     50DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)` -I..
  • trunk/Couenne/src/bound_tightening/Makefile.in

    r623 r624  
    5151        $(ACLOCAL_M4)
    5252mkinstalldirs = $(install_sh) -d
    53 CONFIG_HEADER = $(top_builddir)/inc/config_couenne.h
     53CONFIG_HEADER = $(top_builddir)/src/config.h \
     54        $(top_builddir)/src/config_couenne.h
    5455CONFIG_CLEAN_FILES =
    5556LTLIBRARIES = $(noinst_LTLIBRARIES)
     
    360361
    361362
    362 # This line is necessary to allow VPATH compilation with MS compilers
    363 # on Cygwin
    364 DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)` -I$(top_builddir)/inc
     363# This line is necessary to allow VPATH compilation
     364DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)` -I..
    365365all: all-am
    366366
  • trunk/Couenne/src/bound_tightening/twoImpliedBT/Makefile.am

    r608 r624  
    2929        -I`$(CYGPATH_W) $(srcdir)/../../bound_tightening`
    3030
    31 # This line is necessary to allow VPATH compilation with MS compilers
    32 # on Cygwin
    33 DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)` -I$(top_builddir)/inc
     31# This line is necessary to allow VPATH compilation
     32DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)` -I$(top_builddir)/src
  • trunk/Couenne/src/bound_tightening/twoImpliedBT/Makefile.in

    r623 r624  
    5353        $(ACLOCAL_M4)
    5454mkinstalldirs = $(install_sh) -d
    55 CONFIG_HEADER = $(top_builddir)/inc/config_couenne.h
     55CONFIG_HEADER = $(top_builddir)/src/config.h \
     56        $(top_builddir)/src/config_couenne.h
    5657CONFIG_CLEAN_FILES =
    5758LTLIBRARIES = $(noinst_LTLIBRARIES)
     
    335336
    336337
    337 # This line is necessary to allow VPATH compilation with MS compilers
    338 # on Cygwin
    339 DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)` -I$(top_builddir)/inc
     338# This line is necessary to allow VPATH compilation
     339DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)` -I$(top_builddir)/src
    340340all: all-am
    341341
  • trunk/Couenne/src/branch/Makefile.am

    r534 r624  
    6464endif
    6565
    66 # This line is necessary to allow VPATH compilation with MS compilers
    67 # on Cygwin
    68 DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)` -I$(top_builddir)/inc
     66# This line is necessary to allow VPATH compilation
     67DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)` -I..
  • trunk/Couenne/src/branch/Makefile.in

    r623 r624  
    5555        $(ACLOCAL_M4)
    5656mkinstalldirs = $(install_sh) -d
    57 CONFIG_HEADER = $(top_builddir)/inc/config_couenne.h
     57CONFIG_HEADER = $(top_builddir)/src/config.h \
     58        $(top_builddir)/src/config_couenne.h
    5859CONFIG_CLEAN_FILES =
    5960LTLIBRARIES = $(noinst_LTLIBRARIES)
     
    365366        -I`$(CYGPATH_W) $(srcdir)/../standardize` $(am__append_2)
    366367
    367 # This line is necessary to allow VPATH compilation with MS compilers
    368 # on Cygwin
    369 DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)` -I$(top_builddir)/inc
     368# This line is necessary to allow VPATH compilation
     369DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)` -I..
    370370all: all-am
    371371
  • trunk/Couenne/src/convex/Makefile.am

    r541 r624  
    6363endif
    6464
    65 # This line is necessary to allow VPATH compilation with MS compilers
    66 # on Cygwin
    67 DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)` -I$(top_builddir)/inc
     65# This line is necessary to allow VPATH compilation
     66DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)` -I..
  • trunk/Couenne/src/convex/Makefile.in

    r623 r624  
    5454        $(ACLOCAL_M4)
    5555mkinstalldirs = $(install_sh) -d
    56 CONFIG_HEADER = $(top_builddir)/inc/config_couenne.h
     56CONFIG_HEADER = $(top_builddir)/src/config.h \
     57        $(top_builddir)/src/config_couenne.h
    5758CONFIG_CLEAN_FILES =
    5859LTLIBRARIES = $(noinst_LTLIBRARIES)
     
    363364        -I`$(CYGPATH_W) $(srcdir)/../problem` $(am__append_1)
    364365
    365 # This line is necessary to allow VPATH compilation with MS compilers
    366 # on Cygwin
    367 DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)` -I$(top_builddir)/inc
     366# This line is necessary to allow VPATH compilation
     367DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)` -I..
    368368all: all-am
    369369
  • trunk/Couenne/src/cut/crossconv/Makefile.am

    r605 r624  
    3030        -I`$(CYGPATH_W) $(srcdir)/../../problem`
    3131
    32 # This line is necessary to allow VPATH compilation with MS compilers
    33 # on Cygwin
    34 DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)` -I$(top_builddir)/inc
     32# This line is necessary to allow VPATH compilation
     33DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)` -I$(top_builddir)/src
  • trunk/Couenne/src/cut/crossconv/Makefile.in

    r623 r624  
    5151        $(ACLOCAL_M4)
    5252mkinstalldirs = $(install_sh) -d
    53 CONFIG_HEADER = $(top_builddir)/inc/config_couenne.h
     53CONFIG_HEADER = $(top_builddir)/src/config.h \
     54        $(top_builddir)/src/config_couenne.h
    5455CONFIG_CLEAN_FILES =
    5556LTLIBRARIES = $(noinst_LTLIBRARIES)
     
    335336
    336337
    337 # This line is necessary to allow VPATH compilation with MS compilers
    338 # on Cygwin
    339 DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)` -I$(top_builddir)/inc
     338# This line is necessary to allow VPATH compilation
     339DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)` -I$(top_builddir)/src
    340340all: all-am
    341341
  • trunk/Couenne/src/cut/ellipcuts/Makefile.am

    r488 r624  
    2525        -I`$(CYGPATH_W) $(srcdir)/../problem`
    2626
    27 # This line is necessary to allow VPATH compilation with MS compilers
    28 # on Cygwin
    29 DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)` -I$(top_builddir)/inc
     27# This line is necessary to allow VPATH compilation
     28DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)` -I$(top_builddir)/src
  • trunk/Couenne/src/cut/sdpcuts/Makefile.am

    r605 r624  
    4545endif
    4646
    47 # This line is necessary to allow VPATH compilation with MS compilers
    48 # on Cygwin
    49 DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)` -I$(top_builddir)/inc
     47# This line is necessary to allow VPATH compilation
     48DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)` -I$(top_builddir)/src
  • trunk/Couenne/src/cut/sdpcuts/Makefile.in

    r623 r624  
    5252        $(ACLOCAL_M4)
    5353mkinstalldirs = $(install_sh) -d
    54 CONFIG_HEADER = $(top_builddir)/inc/config_couenne.h
     54CONFIG_HEADER = $(top_builddir)/src/config.h \
     55        $(top_builddir)/src/config_couenne.h
    5556CONFIG_CLEAN_FILES =
    5657LTLIBRARIES = $(noinst_LTLIBRARIES)
     
    346347        $(srcdir)/../../problem` $(am__append_1)
    347348
    348 # This line is necessary to allow VPATH compilation with MS compilers
    349 # on Cygwin
    350 DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)` -I$(top_builddir)/inc
     349# This line is necessary to allow VPATH compilation
     350DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)` -I$(top_builddir)/src
    351351all: all-am
    352352
  • trunk/Couenne/src/disjunctive/Makefile.am

    r501 r624  
    3535        -I`$(CYGPATH_W) $(srcdir)/../problem`
    3636
    37 # This line is necessary to allow VPATH compilation with MS compilers
    38 # on Cygwin
    39 DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)` -I$(top_builddir)/inc
     37# This line is necessary to allow VPATH compilation
     38DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)` -I..
  • trunk/Couenne/src/disjunctive/Makefile.in

    r623 r624  
    5151        $(ACLOCAL_M4)
    5252mkinstalldirs = $(install_sh) -d
    53 CONFIG_HEADER = $(top_builddir)/inc/config_couenne.h
     53CONFIG_HEADER = $(top_builddir)/src/config.h \
     54        $(top_builddir)/src/config_couenne.h
    5455CONFIG_CLEAN_FILES =
    5556LTLIBRARIES = $(noinst_LTLIBRARIES)
     
    343344
    344345
    345 # This line is necessary to allow VPATH compilation with MS compilers
    346 # on Cygwin
    347 DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)` -I$(top_builddir)/inc
     346# This line is necessary to allow VPATH compilation
     347DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)` -I..
    348348all: all-am
    349349
  • trunk/Couenne/src/expression/Makefile.am

    r488 r624  
    9696        -I`$(CYGPATH_W) $(srcdir)/../problem/depGraph`
    9797
    98 # This line is necessary to allow VPATH compilation with MS compilers
    99 # on Cygwin
    100 DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)` -I$(top_builddir)/inc
     98# This line is necessary to allow VPATH compilation
     99DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)` -I..
  • trunk/Couenne/src/expression/Makefile.in

    r623 r624  
    5151        $(ACLOCAL_M4)
    5252mkinstalldirs = $(install_sh) -d
    53 CONFIG_HEADER = $(top_builddir)/inc/config_couenne.h
     53CONFIG_HEADER = $(top_builddir)/src/config.h \
     54        $(top_builddir)/src/config_couenne.h
    5455CONFIG_CLEAN_FILES =
    5556LTLIBRARIES = $(noinst_LTLIBRARIES)
     
    420421
    421422
    422 # This line is necessary to allow VPATH compilation with MS compilers
    423 # on Cygwin
    424 DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)` -I$(top_builddir)/inc
     423# This line is necessary to allow VPATH compilation
     424DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)` -I..
    425425all: all-am
    426426
  • trunk/Couenne/src/heuristics/CouenneFPSolveMILP.cpp

    r619 r624  
    1111#include "CbcModel.hpp"
    1212
     13#include "CouenneConfig.h"
    1314#include "CouenneFeasPump.hpp"
    1415#include "CouenneMINLPInterface.hpp"
  • trunk/Couenne/src/heuristics/CouenneFeasPump.hpp

    r622 r624  
    1818#include "CbcHeuristic.hpp"
    1919
    20 #include "config_couenne.h"
     20#include "CouenneConfig.h"
    2121
    2222#ifdef COIN_HAS_SCIP
     
    200200    int maxIter_;
    201201
    202 #ifdef COIN_HAS_SCIP
    203202    /// use SCIP instead of Cbc for solving MILPs
    204203     bool useSCIP_;
    205204     int milpMethod_;
     205  };
     206}
     207
    206208#endif
    207   };
    208 }
    209 
    210 #endif
  • trunk/Couenne/src/heuristics/CouenneFeasPumpConstructors.cpp

    r622 r624  
    1313#include "IpOptionsList.hpp"
    1414
     15#include "CouenneConfig.h"
    1516#include "CouenneFeasPump.hpp"
    1617#include "CouenneMINLPInterface.hpp"
  • trunk/Couenne/src/heuristics/Makefile.am

    r600 r624  
    4343endif
    4444
    45 # This line is necessary to allow VPATH compilation with MS compilers
    46 # on Cygwin
    47 DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)` -I$(top_builddir)/inc
     45# This line is necessary to allow VPATH compilation
     46DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)` -I..
  • trunk/Couenne/src/heuristics/Makefile.in

    r623 r624  
    5353        $(ACLOCAL_M4)
    5454mkinstalldirs = $(install_sh) -d
    55 CONFIG_HEADER = $(top_builddir)/inc/config_couenne.h
     55CONFIG_HEADER = $(top_builddir)/src/config.h \
     56        $(top_builddir)/src/config_couenne.h
    5657CONFIG_CLEAN_FILES =
    5758LTLIBRARIES = $(noinst_LTLIBRARIES)
     
    343344        $(am__append_2)
    344345
    345 # This line is necessary to allow VPATH compilation with MS compilers
    346 # on Cygwin
    347 DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)` -I$(top_builddir)/inc
     346# This line is necessary to allow VPATH compilation
     347DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)` -I..
    348348all: all-am
    349349
  • trunk/Couenne/src/interfaces/BonCouenneInterface.cpp

    r574 r624  
    4242}
    4343
    44 #ifdef COIN_HAS_ASL   
     44#ifdef COUENNEINTERFACE_FROM_ASL
    4545void
    4646CouenneInterface::readAmplNlFile(char **& argv, Ipopt::SmartPtr<Bonmin::RegisteredOptions> roptions,
  • trunk/Couenne/src/interfaces/BonCouenneInterface.hpp

    r488 r624  
    1313#define CouenneInterface_H
    1414
     15#include "CouenneConfig.h"
    1516#include "CouenneCutGenerator.hpp"
    1617
    17 #ifdef COIN_HAS_ASL
     18#ifdef COUENNEINTERFACE_FROM_ASL
    1819#include "BonAmplInterface.hpp"
    1920
     
    4849    virtual std::string  appName() {return "couenne";}
    4950
    50 #ifdef COIN_HAS_ASL   
     51#ifdef COUENNEINTERFACE_FROM_ASL
    5152    /** read ampl file using inputed options, journalist....*/
    5253    virtual void readAmplNlFile(char **& argv, Ipopt::SmartPtr<Bonmin::RegisteredOptions> roptions,
  • trunk/Couenne/src/interfaces/Makefile.am

    r488 r624  
    2929        -I`$(CYGPATH_W) $(srcdir)/../problem`
    3030
    31 # This line is necessary to allow VPATH compilation with MS compilers
    32 # on Cygwin
    33 DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)` -I$(top_builddir)/inc
     31# This line is necessary to allow VPATH compilation
     32DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)` -I..
  • trunk/Couenne/src/interfaces/Makefile.in

    r623 r624  
    5151        $(ACLOCAL_M4)
    5252mkinstalldirs = $(install_sh) -d
    53 CONFIG_HEADER = $(top_builddir)/inc/config_couenne.h
     53CONFIG_HEADER = $(top_builddir)/src/config.h \
     54        $(top_builddir)/src/config_couenne.h
    5455CONFIG_CLEAN_FILES =
    5556LTLIBRARIES = $(noinst_LTLIBRARIES)
     
    335336
    336337
    337 # This line is necessary to allow VPATH compilation with MS compilers
    338 # on Cygwin
    339 DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)` -I$(top_builddir)/inc
     338# This line is necessary to allow VPATH compilation
     339DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)` -I..
    340340all: all-am
    341341
  • trunk/Couenne/src/main/Makefile.am

    r608 r624  
    5353        -I`$(CYGPATH_W) $(srcdir)/../readnl`
    5454
    55 # This line is necessary to allow VPATH compilation with MS compilers
    56 # on Cygwin
    57 DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)` -I$(top_builddir)/inc
     55# This line is necessary to allow VPATH compilation
     56DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)` -I..
  • trunk/Couenne/src/main/Makefile.in

    r623 r624  
    5353        $(ACLOCAL_M4)
    5454mkinstalldirs = $(install_sh) -d
    55 CONFIG_HEADER = $(top_builddir)/inc/config_couenne.h
     55CONFIG_HEADER = $(top_builddir)/src/config.h \
     56        $(top_builddir)/src/config_couenne.h
    5657CONFIG_CLEAN_FILES =
    5758am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
     
    363364
    364365
    365 # This line is necessary to allow VPATH compilation with MS compilers
    366 # on Cygwin
    367 DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)` -I$(top_builddir)/inc
     366# This line is necessary to allow VPATH compilation
     367DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)` -I..
    368368all: all-am
    369369
  • trunk/Couenne/src/problem/CouenneProblem.hpp

    r586 r624  
    4949}
    5050
    51 #ifdef COIN_HAS_NTY
    5251
    5352class Nauty;
     
    120119    }
    121120  };
    122 #endif
    123121
    124122
     
    277275  Bonmin::BabSetupBase *bonBase_;
    278276
    279 #ifdef COIN_HAS_ASL
    280277  /// AMPL structure pointer (temporary --- looking forward to embedding into OS...)
    281278  ASL *asl_;
    282 #endif
    283279
    284280  /// some originals may be unused due to their zero multiplicity
     
    350346  // Symmetry Info
    351347
    352 #ifdef COIN_HAS_NTY
    353348  std::vector<int>  *Find_Orbit(int) const;
    354349  mutable std::vector<Node> node_info;
     
    367362  // bool node_sort (  Node  a, Node  b);
    368363  // bool index_sort (  Node  a, Node  b);
    369 #endif
    370364
    371365  /// empty if no NTY, symmetry data structure setup otherwise
  • trunk/Couenne/src/problem/Makefile.am

    r595 r624  
    7070endif
    7171
    72 # This line is necessary to allow VPATH compilation with MS compilers
    73 # on Cygwin
    74 DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)` -I$(top_builddir)/inc
     72# This line is necessary to allow VPATH compilation
     73DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)` -I..
  • trunk/Couenne/src/problem/Makefile.in

    r623 r624  
    7070        $(ACLOCAL_M4)
    7171mkinstalldirs = $(install_sh) -d
    72 CONFIG_HEADER = $(top_builddir)/inc/config_couenne.h
     72CONFIG_HEADER = $(top_builddir)/src/config.h \
     73        $(top_builddir)/src/config_couenne.h
    7374CONFIG_CLEAN_FILES =
    7475LTLIBRARIES = $(noinst_LTLIBRARIES)
     
    372373        $(srcdir)/../problem/depGraph` $(am__append_2)
    373374
    374 # This line is necessary to allow VPATH compilation with MS compilers
    375 # on Cygwin
    376 DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)` -I$(top_builddir)/inc
     375# This line is necessary to allow VPATH compilation
     376DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)` -I..
    377377all: all-am
    378378
  • trunk/Couenne/src/readnl/Makefile.am

    r488 r624  
    3131        -I`$(CYGPATH_W) $(srcdir)/../problem`
    3232
    33 # This line is necessary to allow VPATH compilation with MS compilers
    34 # on Cygwin
    35 DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)` -I$(top_builddir)/inc
     33# This line is necessary to allow VPATH compilation
     34DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)` -I..
  • trunk/Couenne/src/readnl/Makefile.in

    r623 r624  
    5151        $(ACLOCAL_M4)
    5252mkinstalldirs = $(install_sh) -d
    53 CONFIG_HEADER = $(top_builddir)/inc/config_couenne.h
     53CONFIG_HEADER = $(top_builddir)/src/config.h \
     54        $(top_builddir)/src/config_couenne.h
    5455CONFIG_CLEAN_FILES =
    5556am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
     
    342343
    343344
    344 # This line is necessary to allow VPATH compilation with MS compilers
    345 # on Cygwin
    346 DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)` -I$(top_builddir)/inc
     345# This line is necessary to allow VPATH compilation
     346DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)` -I..
    347347all: all-am
    348348
  • trunk/Couenne/src/standardize/Makefile.am

    r488 r624  
    3535        -I`$(CYGPATH_W) $(srcdir)/../problem/depGraph`
    3636
    37 # This line is necessary to allow VPATH compilation with MS compilers
    38 # on Cygwin
    39 DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)` -I$(top_builddir)/inc
     37# This line is necessary to allow VPATH compilation
     38DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)` -I..
  • trunk/Couenne/src/standardize/Makefile.in

    r623 r624  
    5151        $(ACLOCAL_M4)
    5252mkinstalldirs = $(install_sh) -d
    53 CONFIG_HEADER = $(top_builddir)/inc/config_couenne.h
     53CONFIG_HEADER = $(top_builddir)/src/config.h \
     54        $(top_builddir)/src/config_couenne.h
    5455CONFIG_CLEAN_FILES =
    5556LTLIBRARIES = $(noinst_LTLIBRARIES)
     
    343344
    344345
    345 # This line is necessary to allow VPATH compilation with MS compilers
    346 # on Cygwin
    347 DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)` -I$(top_builddir)/inc
     346# This line is necessary to allow VPATH compilation
     347DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)` -I..
    348348all: all-am
    349349
  • trunk/Couenne/src/util/Makefile.am

    r488 r624  
    2727        -I`$(CYGPATH_W) $(srcdir)/../util`
    2828
    29 # This line is necessary to allow VPATH compilation with MS compilers
    30 # on Cygwin
    31 DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)` -I$(top_builddir)/inc
     29# This line is necessary to allow VPATH compilation
     30DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)` -I..
  • trunk/Couenne/src/util/Makefile.in

    r623 r624  
    5151        $(ACLOCAL_M4)
    5252mkinstalldirs = $(install_sh) -d
    53 CONFIG_HEADER = $(top_builddir)/inc/config_couenne.h
     53CONFIG_HEADER = $(top_builddir)/src/config.h \
     54        $(top_builddir)/src/config_couenne.h
    5455CONFIG_CLEAN_FILES =
    5556LTLIBRARIES = $(noinst_LTLIBRARIES)
     
    331332
    332333
    333 # This line is necessary to allow VPATH compilation with MS compilers
    334 # on Cygwin
    335 DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)` -I$(top_builddir)/inc
     334# This line is necessary to allow VPATH compilation
     335DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)` -I..
    336336all: all-am
    337337
  • trunk/Couenne/test/Makefile.in

    r623 r624  
    5151        $(ACLOCAL_M4)
    5252mkinstalldirs = $(install_sh) -d
    53 CONFIG_HEADER = $(top_builddir)/inc/config_couenne.h
     53CONFIG_HEADER = $(top_builddir)/src/config.h \
     54        $(top_builddir)/src/config_couenne.h
    5455CONFIG_CLEAN_FILES = grandTest.sh
    5556SOURCES =
Note: See TracChangeset for help on using the changeset viewer.