Changeset 1734


Ignore:
Timestamp:
Jun 8, 2011 1:28:29 PM (8 years ago)
Author:
stefan
Message:

change to new way on how to use and install configuration header files

Location:
trunk/Clp
Files:
4 added
1 deleted
11 edited

Legend:

Unmodified
Added
Removed
  • trunk/Clp/Makefile.in

    r1695 r1734  
    6565        $(top_srcdir)/doxydoc/doxygen.conf.in \
    6666        $(top_srcdir)/examples/Makefile.in \
    67         $(top_srcdir)/inc/config_clp.h.in \
    6867        $(top_srcdir)/src/OsiClp/osi-clp-uninstalled.pc.in \
    6968        $(top_srcdir)/src/OsiClp/osi-clp.pc.in AUTHORS config.guess \
     
    8079 configure.lineno configure.status.lineno
    8180mkinstalldirs = $(install_sh) -d
    82 CONFIG_HEADER = $(top_builddir)/inc/config_clp.h
     81CONFIG_HEADER = $(top_builddir)/src/config.h \
     82        $(top_builddir)/src/config_clp.h
    8383CONFIG_CLEAN_FILES = examples/Makefile clp.pc clp-uninstalled.pc \
    8484        osi-clp.pc osi-clp-uninstalled.pc doxydoc/doxygen.conf
     
    447447$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
    448448        cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
    449 
    450 inc/config_clp.h: inc/stamp-h1
    451         @if test ! -f $@; then \
    452           rm -f inc/stamp-h1; \
    453           $(MAKE) inc/stamp-h1; \
    454         else :; fi
    455 
    456 inc/stamp-h1: $(top_srcdir)/inc/config_clp.h.in $(top_builddir)/config.status
    457         @rm -f inc/stamp-h1
    458         cd $(top_builddir) && $(SHELL) ./config.status inc/config_clp.h
    459 $(top_srcdir)/inc/config_clp.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
    460         cd $(top_srcdir) && $(AUTOHEADER)
    461         rm -f inc/stamp-h1
    462         touch $@
    463 
    464 distclean-hdr:
    465         -rm -f inc/config_clp.h inc/stamp-h1
    466449examples/Makefile: $(top_builddir)/config.status $(top_srcdir)/examples/Makefile.in
    467450        cd $(top_builddir) && $(SHELL) ./config.status $@
     
    639622        $(am__remove_distdir)
    640623        mkdir $(distdir)
    641         $(mkdir_p) $(distdir)/. $(distdir)/BuildTools $(distdir)/doc $(distdir)/doc/Howto $(distdir)/doxydoc $(distdir)/examples $(distdir)/inc $(distdir)/src/OsiClp
     624        $(mkdir_p) $(distdir)/. $(distdir)/BuildTools $(distdir)/doc $(distdir)/doc/Howto $(distdir)/doxydoc $(distdir)/examples $(distdir)/src/OsiClp
    642625        @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
    643626        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
     
    819802        -rm -f $(am__CONFIG_DISTCLEAN_FILES)
    820803        -rm -f Makefile
    821 distclean-am: clean-am distclean-generic distclean-hdr \
    822         distclean-libtool distclean-local distclean-tags
     804distclean-am: clean-am distclean-generic distclean-libtool \
     805        distclean-local distclean-tags
    823806
    824807dvi: dvi-recursive
     
    873856        clean-recursive ctags ctags-recursive dist dist-all dist-bzip2 \
    874857        dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \
    875         distclean-generic distclean-hdr distclean-libtool \
    876         distclean-local distclean-recursive distclean-tags \
    877         distcleancheck distdir distuninstallcheck dvi dvi-am html \
    878         html-am info info-am install install-am install-data \
    879         install-data-am install-data-hook install-exec install-exec-am \
     858        distclean-generic distclean-libtool distclean-local \
     859        distclean-recursive distclean-tags distcleancheck distdir \
     860        distuninstallcheck dvi dvi-am html html-am info info-am \
     861        install install-am install-data install-data-am \
     862        install-data-hook install-exec install-exec-am \
    880863        install-exec-local install-info install-info-am install-man \
    881864        install-pkgconfiglibDATA install-strip installcheck \
  • trunk/Clp/clp-uninstalled.pc.in

    r1657 r1734  
    77Version: @PACKAGE_VERSION@
    88Libs: ${libdir}/libClp.la @CLPLIB_PCLIBS@
    9 Cflags: -I@abs_source_dir@/src -I@ABSBUILDDIR@/inc
     9Cflags: -I@abs_source_dir@/src -I@ABSBUILDDIR@/src
    1010Requires: @CLPLIB_PCREQUIRES@
  • trunk/Clp/configure

    r1731 r1734  
    28802880        coin_opt_cflags="-O3"
    28812881        coin_add_cflags="-pipe"
    2882         coin_dbg_cflags="-g"
     2882        coin_dbg_cflags="-g -O0"
    28832883        coin_warn_cflags="-Wimplicit -Wparentheses -Wsequence-point -Wreturn-type -Wcast-qual -Wall -Wno-unknown-pragmas -Wno-long-long"
    28842884        case $build in
     
    38123812        coin_opt_cxxflags="-O3"
    38133813        coin_add_cxxflags="-pipe"
    3814         coin_dbg_cxxflags="-g"
     3814        coin_dbg_cxxflags="-g -O0"
    38153815        coin_warn_cxxflags="-Wparentheses -Wreturn-type -Wcast-qual -Wall -Wpointer-arith -Wwrite-strings -Wconversion -Wno-unknown-pragmas -Wno-long-long"
    38163816        case $build in
     
    2100321003COINUTILS_DATA_INSTALLED=
    2100421004
    21005 # initial list of dependencies is "coinutils", but we need to filter out version number specifications (= x, <= x, >= x)
     21005# initial list of dependencies is "coinutils", but we need to filter out version number specifications (= x, <= x, >= x, != x)
    2100621006projtoprocess="coinutils"
    2100721007
     
    2150021500OSI_DATA_INSTALLED=
    2150121501
    21502 # initial list of dependencies is "osi", but we need to filter out version number specifications (= x, <= x, >= x)
     21502# initial list of dependencies is "osi", but we need to filter out version number specifications (= x, <= x, >= x, != x)
    2150321503projtoprocess="osi"
    2150421504
     
    2197721977OSITESTS_DATA_INSTALLED=
    2197821978
    21979 # initial list of dependencies is "osi-unittests", but we need to filter out version number specifications (= x, <= x, >= x)
     21979# initial list of dependencies is "osi-unittests", but we need to filter out version number specifications (= x, <= x, >= x, != x)
    2198021980projtoprocess="osi-unittests"
    2198121981
     
    2243922439SAMPLE_DATA_INSTALLED=
    2244022440
    22441 # initial list of dependencies is "coindatasample", but we need to filter out version number specifications (= x, <= x, >= x)
     22441# initial list of dependencies is "coindatasample", but we need to filter out version number specifications (= x, <= x, >= x, != x)
    2244222442projtoprocess="coindatasample"
    2244322443
     
    2290122901NETLIB_DATA_INSTALLED=
    2290222902
    22903 # initial list of dependencies is "coindatanetlib", but we need to filter out version number specifications (= x, <= x, >= x)
     22903# initial list of dependencies is "coindatanetlib", but we need to filter out version number specifications (= x, <= x, >= x, != x)
    2290422904projtoprocess="coindatanetlib"
    2290522905
     
    2376823768GLPK_DATA_INSTALLED=
    2376923769
    23770 # initial list of dependencies is "coinglpk >= 4.39", but we need to filter out version number specifications (= x, <= x, >= x)
     23770# initial list of dependencies is "coinglpk >= 4.39", but we need to filter out version number specifications (= x, <= x, >= x, != x)
    2377123771projtoprocess="coinglpk "
    2377223772
     
    2428424284MUMPS_DATA_INSTALLED=
    2428524285
    24286 # initial list of dependencies is "coinmumps", but we need to filter out version number specifications (= x, <= x, >= x)
     24286# initial list of dependencies is "coinmumps", but we need to filter out version number specifications (= x, <= x, >= x, != x)
    2428724287projtoprocess="coinmumps"
    2428824288
     
    2494624946    coin_opt_fflags="-O3"
    2494724947    coin_add_fflags="-pipe"
    24948     coin_dbg_fflags="-g"
     24948    coin_dbg_fflags="-g -O0"
    2494924949    case $enable_doscompile in
    2495024950      mingw)
     
    2917729177BLAS_DATA_INSTALLED=
    2917829178
    29179 # initial list of dependencies is "coinblas", but we need to filter out version number specifications (= x, <= x, >= x)
     29179# initial list of dependencies is "coinblas", but we need to filter out version number specifications (= x, <= x, >= x, != x)
    2918029180projtoprocess="coinblas"
    2918129181
     
    3117531175
    3117631176# Here put the location and name of the configuration header file
    31177           ac_config_headers="$ac_config_headers inc/config_clp.h"
     31177                    ac_config_headers="$ac_config_headers src/config.h src/config_clp.h"
    3117831178
    3117931179
     
    3201132011  "doxydoc/doxygen.conf" ) CONFIG_FILES="$CONFIG_FILES doxydoc/doxygen.conf" ;;
    3201232012  "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
    32013   "inc/config_clp.h" ) CONFIG_HEADERS="$CONFIG_HEADERS inc/config_clp.h" ;;
     32013  "src/config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS src/config.h" ;;
     32014  "src/config_clp.h" ) CONFIG_HEADERS="$CONFIG_HEADERS src/config_clp.h" ;;
    3201432015  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
    3201532016echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
  • trunk/Clp/configure.ac

    r1722 r1734  
    169169                 src/OsiClp/Makefile
    170170                 test/Makefile
    171                 clp.pc
    172                 clp-uninstalled.pc])
     171                clp.pc
     172                clp-uninstalled.pc])
    173173                 
    174174if test $coin_has_osi = yes ; then
     
    180180
    181181# Here put the location and name of the configuration header file
    182 AC_CONFIG_HEADER([inc/config_clp.h])
     182AC_CONFIG_HEADER([src/config.h src/config_clp.h])
    183183
    184184# Finally, we let configure write all the output...
  • trunk/Clp/examples/testBarrier.cpp

    r1662 r1734  
    44// This code is licensed under the terms of the Eclipse Public License (EPL).
    55
     6// @TODO the ifdef WSSMP_BARRIER currently does not work - the define is never set
     7// best would be if one could tell ClpModel to use the wssmp factorization code, if available, without having to check for some define
     8
    69#include "ClpInterior.hpp"
    710#include "ClpSimplex.hpp"
     11#ifdef WSSMP_BARRIER
    812#include "ClpCholeskyWssmp.hpp"
     13#endif
    914#include "ClpCholeskyDense.hpp"
    1015int main(int argc, const char *argv[])
  • trunk/Clp/src/ClpConfig.h

    r1670 r1734  
    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 Clp.
    48 *
    59 * On systems where the code is configured with the configure script
    610 * (i.e., compilation is always done with HAVE_CONFIG_H defined), this
    7  * header file includes the automatically generated header file, and
    8  * undefines macros that might configure with other Config.h files.
     11 * header file includes the automatically generated header file.
    912 *
    1013 * On systems that are compiled in other ways (e.g., with the
     
    1215 * macros that depend on the operating system and the compiler.  The
    1316 * 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  *
     17 * (e.g., presence of other COIN-OR packages or third party code) are set
     18 * by the files config_*default.h. The project maintainer needs to remember
     19 * to update these file and choose reasonable defines.
     20 * A user can modify the default setting by editing the config_*default.h files.
    1921 */
    2022
     
    2325
    2426#ifdef HAVE_CONFIG_H
     27#ifdef CLP_BUILD
     28#include "config.h"
     29#else
    2530#include "config_clp.h"
    26 
    27 /* undefine macros that could conflict with those in other config.h
    28    files */
    29 #undef PACKAGE
    30 #undef PACKAGE_BUGREPORT
    31 #undef PACKAGE_NAME
    32 #undef PACKAGE_STRING
    33 #undef PACKAGE_TARNAME
    34 #undef PACKAGE_VERSION
    35 #undef VERSION
     31#endif
    3632
    3733#else /* HAVE_CONFIG_H */
    3834
    39 /* include the COIN-wide system specific configure header */
    40 #include "configall_system.h"
    41 
    42 /***************************************************************************/
    43 /*             HERE DEFINE THE CONFIGURATION SPECIFIC MACROS               */
    44 /***************************************************************************/
    45 
    46 /* Define to the debug sanity check level (0 is no test) */
    47 #define COIN_CLP_CHECKLEVEL 0
    48 
    49 /* Define to the debug verbosity level (0 is no output) */
    50 #define COIN_CLP_VERBOSITY 0
    51 
    52 /* Define to 1 if the Clp package is used */
    53 #define COIN_HAS_CLP 1
    54 
    55 /* Define to 1 if the CoinUtils package is used */
    56 #define COIN_HAS_COINUTILS 1
    57 
    58 /* Define to 1 if readline is available */
    59 /* #undef COIN_HAS_READLINE */
    60 
    61 /* Clp version */
    62 #define CLP_VERSION "trunk"
     35#ifdef CLP_BUILD
     36#include "config_default.h"
     37#else
     38#include "config_clp_default.h"
     39#endif
    6340
    6441#endif /* HAVE_CONFIG_H */
    6542
    66 #endif /*__CLPCONFIG_H__ */
     43#endif /*__CLPCONFIG_H__*/
  • trunk/Clp/src/Makefile.am

    r1701 r1734  
    138138endif
    139139
    140 # This line is necessary to allow VPATH compilation with MS compilers
    141 # on Cygwin
    142 DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)` -I$(top_builddir)/inc
     140# This line is necessary to allow VPATH compilation
     141DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)`
    143142
    144143########################################################################
     
    150149includecoindir = $(includedir)/coin
    151150includecoin_HEADERS = \
    152         ../inc/config_clp.h \
    153151        Clp_C_Interface.h \
    154152        ClpCholeskyBase.hpp \
     
    218216includecoin_HEADERS += CbcOrClpParam.cpp
    219217
    220 #############################################################################
    221 # Create the Config.h file that always defines HAVE_CONFIG_H and install it #
    222 #############################################################################
    223 
    224 # You only need to adapt the following line
    225 ConfigHeader = ClpConfig.h
    226 
    227218install-exec-local:
    228         echo "#ifndef HAVE_CONFIG_H" >bla
    229         echo "#define HAVE_CONFIG_H" >>bla
    230         echo "#endif" >> bla
    231         cat $(srcdir)/$(ConfigHeader) >> bla
    232         $(install_sh_DATA) bla $(DESTDIR)$(includecoindir)/$(ConfigHeader)
    233         rm -f bla
     219        $(install_sh_DATA) config_clp.h $(DESTDIR)$(includecoindir)/ClpConfig.h
    234220
    235221uninstall-local:
    236         rm -f $(DESTDIR)$(includecoindir)/$(ConfigHeader)
     222        rm -f $(DESTDIR)$(includecoindir)/ClpConfig.h
  • trunk/Clp/src/Makefile.in

    r1701 r1734  
    6464subdir = src
    6565DIST_COMMON = $(am__includecoin_HEADERS_DIST) $(srcdir)/Makefile.am \
    66         $(srcdir)/Makefile.in
     66        $(srcdir)/Makefile.in $(srcdir)/config.h.in \
     67        $(srcdir)/config_clp.h.in
    6768ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
    6869am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
     
    7172        $(ACLOCAL_M4)
    7273mkinstalldirs = $(install_sh) -d
    73 CONFIG_HEADER = $(top_builddir)/inc/config_clp.h
     74CONFIG_HEADER = config.h config_clp.h
    7475CONFIG_CLEAN_FILES =
    7576am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
     
    181182        pdf-recursive ps-recursive uninstall-info-recursive \
    182183        uninstall-recursive
    183 am__includecoin_HEADERS_DIST = ../inc/config_clp.h Clp_C_Interface.h \
    184         ClpCholeskyBase.hpp ClpCholeskyDense.hpp ClpConstraint.hpp \
    185         ClpConstraintLinear.hpp ClpConstraintQuadratic.hpp \
    186         ClpDualRowDantzig.hpp ClpDualRowPivot.hpp \
    187         ClpDualRowSteepest.hpp ClpDummyMatrix.hpp \
     184am__includecoin_HEADERS_DIST = Clp_C_Interface.h ClpCholeskyBase.hpp \
     185        ClpCholeskyDense.hpp ClpConstraint.hpp ClpConstraintLinear.hpp \
     186        ClpConstraintQuadratic.hpp ClpDualRowDantzig.hpp \
     187        ClpDualRowPivot.hpp ClpDualRowSteepest.hpp ClpDummyMatrix.hpp \
    188188        ClpDynamicExampleMatrix.hpp ClpDynamicMatrix.hpp \
    189189        ClpEventHandler.hpp ClpFactorization.hpp \
     
    536536        $(am__append_7)
    537537
    538 # This line is necessary to allow VPATH compilation with MS compilers
    539 # on Cygwin
    540 DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)` -I$(top_builddir)/inc
     538# This line is necessary to allow VPATH compilation
     539DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)`
    541540
    542541########################################################################
     
    549548
    550549# needed by Cbc
    551 includecoin_HEADERS = ../inc/config_clp.h Clp_C_Interface.h \
    552         ClpCholeskyBase.hpp ClpCholeskyDense.hpp ClpConstraint.hpp \
    553         ClpConstraintLinear.hpp ClpConstraintQuadratic.hpp \
    554         ClpDualRowDantzig.hpp ClpDualRowPivot.hpp \
    555         ClpDualRowSteepest.hpp ClpDummyMatrix.hpp \
     550includecoin_HEADERS = Clp_C_Interface.h ClpCholeskyBase.hpp \
     551        ClpCholeskyDense.hpp ClpConstraint.hpp ClpConstraintLinear.hpp \
     552        ClpConstraintQuadratic.hpp ClpDualRowDantzig.hpp \
     553        ClpDualRowPivot.hpp ClpDualRowSteepest.hpp ClpDummyMatrix.hpp \
    556554        ClpDynamicExampleMatrix.hpp ClpDynamicMatrix.hpp \
    557555        ClpEventHandler.hpp ClpFactorization.hpp \
     
    568566        $(am__append_8) $(am__append_9) $(am__append_10) \
    569567        $(am__append_11) $(am__append_12) CbcOrClpParam.cpp
    570 
    571 #############################################################################
    572 # Create the Config.h file that always defines HAVE_CONFIG_H and install it #
    573 #############################################################################
    574 
    575 # You only need to adapt the following line
    576 ConfigHeader = ClpConfig.h
    577 all: all-recursive
     568all: config.h config_clp.h
     569        $(MAKE) $(AM_MAKEFLAGS) all-recursive
    578570
    579571.SUFFIXES:
     
    608600$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
    609601        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
     602
     603config.h: stamp-h1
     604        @if test ! -f $@; then \
     605          rm -f stamp-h1; \
     606          $(MAKE) stamp-h1; \
     607        else :; fi
     608
     609stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
     610        @rm -f stamp-h1
     611        cd $(top_builddir) && $(SHELL) ./config.status src/config.h
     612$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
     613        cd $(top_srcdir) && $(AUTOHEADER)
     614        rm -f stamp-h1
     615        touch $@
     616
     617config_clp.h: stamp-h2
     618        @if test ! -f $@; then \
     619          rm -f stamp-h2; \
     620          $(MAKE) stamp-h2; \
     621        else :; fi
     622
     623stamp-h2: $(srcdir)/config_clp.h.in $(top_builddir)/config.status
     624        @rm -f stamp-h2
     625        cd $(top_builddir) && $(SHELL) ./config.status src/config_clp.h
     626
     627distclean-hdr:
     628        -rm -f config.h stamp-h1 config_clp.h stamp-h2
    610629install-libLTLIBRARIES: $(lib_LTLIBRARIES)
    611630        @$(NORMAL_INSTALL)
     
    860879tags: TAGS
    861880
    862 TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
     881TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in config_clp.h.in $(TAGS_DEPENDENCIES) \
    863882                $(TAGS_FILES) $(LISP)
    864883        tags=; \
     
    877896          fi; \
    878897        done; \
    879         list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
     898        list='$(SOURCES) $(HEADERS) config.h.in config_clp.h.in $(LISP) $(TAGS_FILES)'; \
    880899        unique=`for i in $$list; do \
    881900            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
     
    889908        fi
    890909ctags: CTAGS
    891 CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
     910CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in config_clp.h.in $(TAGS_DEPENDENCIES) \
    892911                $(TAGS_FILES) $(LISP)
    893912        tags=; \
    894913        here=`pwd`; \
    895         list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
     914        list='$(SOURCES) $(HEADERS) config.h.in config_clp.h.in $(LISP) $(TAGS_FILES)'; \
    896915        unique=`for i in $$list; do \
    897916            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
     
    912931
    913932distdir: $(DISTFILES)
    914         $(mkdir_p) $(distdir)/../inc
    915933        @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
    916934        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
     
    956974check-am: all-am
    957975check: check-recursive
    958 all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS)
     976all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS) config.h \
     977                config_clp.h
    959978install-binPROGRAMS: install-libLTLIBRARIES
    960979
     
    9971016        -rm -f Makefile
    9981017distclean-am: clean-am distclean-compile distclean-generic \
    999         distclean-libtool distclean-tags
     1018        distclean-hdr distclean-libtool distclean-tags
    10001019
    10011020dvi: dvi-recursive
     
    10461065        clean clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
    10471066        clean-libtool clean-recursive ctags ctags-recursive distclean \
    1048         distclean-compile distclean-generic distclean-libtool \
    1049         distclean-recursive distclean-tags distdir dvi dvi-am html \
    1050         html-am info info-am install install-am install-binPROGRAMS \
    1051         install-data install-data-am install-exec install-exec-am \
    1052         install-exec-local install-includecoinHEADERS install-info \
    1053         install-info-am install-libLTLIBRARIES install-man \
    1054         install-strip installcheck installcheck-am installdirs \
    1055         installdirs-am maintainer-clean maintainer-clean-generic \
    1056         maintainer-clean-recursive mostlyclean mostlyclean-compile \
    1057         mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
    1058         pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
     1067        distclean-compile distclean-generic distclean-hdr \
     1068        distclean-libtool distclean-recursive distclean-tags distdir \
     1069        dvi dvi-am html html-am info info-am install install-am \
     1070        install-binPROGRAMS install-data install-data-am install-exec \
     1071        install-exec-am install-exec-local install-includecoinHEADERS \
     1072        install-info install-info-am install-libLTLIBRARIES \
     1073        install-man install-strip installcheck installcheck-am \
     1074        installdirs installdirs-am maintainer-clean \
     1075        maintainer-clean-generic maintainer-clean-recursive \
     1076        mostlyclean mostlyclean-compile mostlyclean-generic \
     1077        mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
     1078        tags tags-recursive uninstall uninstall-am \
    10591079        uninstall-binPROGRAMS uninstall-includecoinHEADERS \
    10601080        uninstall-info-am uninstall-libLTLIBRARIES uninstall-local
     
    10621082
    10631083install-exec-local:
    1064         echo "#ifndef HAVE_CONFIG_H" >bla
    1065         echo "#define HAVE_CONFIG_H" >>bla
    1066         echo "#endif" >> bla
    1067         cat $(srcdir)/$(ConfigHeader) >> bla
    1068         $(install_sh_DATA) bla $(DESTDIR)$(includecoindir)/$(ConfigHeader)
    1069         rm -f bla
     1084        $(install_sh_DATA) config_clp.h $(DESTDIR)$(includecoindir)/ClpConfig.h
    10701085
    10711086uninstall-local:
    1072         rm -f $(DESTDIR)$(includecoindir)/$(ConfigHeader)
     1087        rm -f $(DESTDIR)$(includecoindir)/ClpConfig.h
    10731088# Tell versions [3.59,3.63) of GNU make to not export all variables.
    10741089# Otherwise a system limit (for SysV at least) may be exceeded.
  • trunk/Clp/src/OsiClp/Makefile.am

    r1659 r1734  
    2929        -I`$(CYGPATH_W) $(srcdir)/..`
    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..
    3433
    3534########################################################################
  • trunk/Clp/src/OsiClp/Makefile.in

    r1695 r1734  
    5353        $(ACLOCAL_M4)
    5454mkinstalldirs = $(install_sh) -d
    55 CONFIG_HEADER = $(top_builddir)/inc/config_clp.h
     55CONFIG_HEADER = $(top_builddir)/src/config.h \
     56        $(top_builddir)/src/config_clp.h
    5657CONFIG_CLEAN_FILES =
    5758am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
     
    365366
    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..
    370370
    371371########################################################################
  • trunk/Clp/test/Makefile.in

    r1695 r1734  
    5656        $(ACLOCAL_M4)
    5757mkinstalldirs = $(install_sh) -d
    58 CONFIG_HEADER = $(top_builddir)/inc/config_clp.h
     58CONFIG_HEADER = $(top_builddir)/src/config.h \
     59        $(top_builddir)/src/config_clp.h
    5960CONFIG_CLEAN_FILES =
    6061PROGRAMS = $(noinst_PROGRAMS)
     
    6667osiUnitTest_OBJECTS = $(am_osiUnitTest_OBJECTS)
    6768am__DEPENDENCIES_1 =
    68 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/inc
     69DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/src -I$(top_builddir)/src
    6970depcomp = $(SHELL) $(top_srcdir)/depcomp
    7071am__depfiles_maybe = depfiles
Note: See TracChangeset for help on using the changeset viewer.