Changeset 345


Ignore:
Timestamp:
Jun 1, 2006 4:10:33 PM (13 years ago)
Author:
andreasw
Message:

use proper automake variables for includes and #defines

Location:
trunk/Cbc/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Cbc/src/Makefile.am

    r339 r345  
    6868        $(CGLOBJDIR)/src/libCgl.la \
    6969        $(OSIOBJDIR)/src/OsiCbc/libOsiCbc.la
    70 CXXFLAGS += -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiCbc`
     70AM_CPPFLAGS = -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiCbc`
    7171
    7272# List all additionally required solver and Osi libraries
    7373if COIN_HAS_CLP
    74   CXXFLAGS += -I`$(CYGPATH_W) $(CLPSRCDIR)/src` \
     74  AM_CPPFLAGS += -I`$(CYGPATH_W) $(CLPSRCDIR)/src` \
    7575        -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiClp` \
    7676        -I`$(CYGPATH_W) $(CLPOBJDIR)/inc`
     
    8181
    8282if COIN_HAS_CPX
    83   CXXFLAGS += -I`$(CYGPATH_W) $(CPXINCDIR)` \
     83  AM_CPPFLAGS += -I`$(CYGPATH_W) $(CPXINCDIR)` \
    8484        -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiCpx`
    8585  cbc_LDADD += $(OSIOBJDIR)/src/OsiCpx/libOsiCpx.la
     
    8787
    8888if COIN_HAS_DYLP
    89   CXXFLAGS += -I`$(CYGPATH_W) $(DYLPSRCDIR)/src/DylpStdLib` \
     89  AM_CPPFLAGS += -I`$(CYGPATH_W) $(DYLPSRCDIR)/src/DylpStdLib` \
    9090        -I`$(CYGPATH_W) $(DYLPSRCDIR)/src/Dylp` \
    9191        -I`$(CYGPATH_W) $(DYLPOBJDIR)/inc` \
     
    9797
    9898if COIN_HAS_FMP
    99   CXXFLAGS += -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiFmp`
     99  AM_CPPFLAGS += -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiFmp`
    100100  cbc_LDADD += $(OSIOBJDIR)/src/OsiFmp/libOsiFmp.la
    101101endif
    102102
    103103if COIN_HAS_GLPK
    104   CXXFLAGS += -I`$(CYGPATH_W) $(GLPKINCDIR)` \
     104  AM_CPPFLAGS += -I`$(CYGPATH_W) $(GLPKINCDIR)` \
    105105        -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiGlpk`
    106106  cbc_LDADD += $(OSIOBJDIR)/src/OsiGlpk/libOsiGlpk.la
     
    108108
    109109if COIN_HAS_MSK
    110   CXXFLAGS += -I`$(CYGPATH_W) $(MSKINCDIR)` \
     110  AM_CPPFLAGS += -I`$(CYGPATH_W) $(MSKINCDIR)` \
    111111        -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiMsk`
    112112  cbc_LDADD += $(OSIOBJDIR)/src/OsiMsk/libOsiMsk.la
     
    114114
    115115if COIN_HAS_OSL
    116   CXXFLAGS += -I`$(CYGPATH_W) $(OSLINCDIR)` \
     116  AM_CPPFLAGS += -I`$(CYGPATH_W) $(OSLINCDIR)` \
    117117        -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiOsl`
    118118  cbc_LDADD += $(OSIOBJDIR)/src/OsiOsl/libOsiOsl.la
     
    120120
    121121if COIN_HAS_SPX
    122   CXXFLAGS += -I`$(CYGPATH_W) $(SPXINCDIR)` \
     122  AM_CPPFLAGS += -I`$(CYGPATH_W) $(SPXINCDIR)` \
    123123        -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiSpx`
    124124  cbc_LDADD += $(OSIOBJDIR)/src/OsiSpx/libOsiSpx.la
     
    126126
    127127if COIN_HAS_SYM
    128   CXXFLAGS += -I`$(CYGPATH_W) $(SYMSRCDIR)/src` \
     128  AM_CPPFLAGS += -I`$(CYGPATH_W) $(SYMSRCDIR)/src` \
    129129        -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiSym`
    130130  cbc_LDADD += $(OSIOBJDIR)/src/OsiSym/libOsiSym.la \
     
    134134
    135135if COIN_HAS_VOL
    136   CXXFLAGS += -I`$(CYGPATH_W) $(VOLSRCDIR)/src` \
     136  AM_CPPFLAGS += -I`$(CYGPATH_W) $(VOLSRCDIR)/src` \
    137137        -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiVol`
    138138  cbc_LDADD += $(OSIOBJDIR)/src/OsiVol/libOsiVol.la \
     
    142142
    143143if COIN_HAS_XPR
    144   CXXFLAGS += -I`$(CYGPATH_W) $(XPRINCDIR)` \
     144  AM_CPPFLAGS += -I`$(CYGPATH_W) $(XPRINCDIR)` \
    145145        -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiXpr`
    146146  cbc_LDADD += $(OSIOBJDIR)/src/OsiXpr/libOsiXpr.la
     
    161161#                           solve program                              #
    162162########################################################################
    163 
    164 #ToDo: I'm not sure if I'm doing the right thing here
    165163
    166164# Name of the executable compiled in this directory.  We want it to be
     
    198196# "top_srcdir" refers to the basic directory for the main package that is
    199197# being compiled.
    200 CXXFLAGS += \
     198AM_CPPFLAGS += \
    201199        -I`$(CYGPATH_W) $(CGLSRCDIR)/src` \
    202200        -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglClique` \
     
    215213
    216214# List additional defines
    217 DEFS += -DCOIN_NO_CLP_MESSAGE -DUSE_CBCCONFIG
     215AM_CPPFLAGS += -DCOIN_NO_CLP_MESSAGE -DUSE_CBCCONFIG
    218216
    219217# This line is necessary to allow VPATH compilation with MS compilers
  • trunk/Cbc/src/Makefile.in

    r340 r345  
    276276CXXDEFS = @CXXDEFS@
    277277CXXDEPMODE = @CXXDEPMODE@
    278 
    279 ########################################################################
    280 #                            Additional flags                          #
    281 ########################################################################
    282 
    283 # Here list all include flags, relative to this "srcdir" directory.  This
    284 # "cygpath" stuff is necessary to compile with native compilers on Windows.
    285 # "top_srcdir" refers to the basic directory for the main package that is
    286 # being compiled.
    287 CXXFLAGS = @CXXFLAGS@ -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiCbc` \
    288         $(am__append_1) $(am__append_4) $(am__append_6) \
    289         $(am__append_9) $(am__append_11) $(am__append_13) \
    290         $(am__append_15) $(am__append_17) $(am__append_19) \
    291         $(am__append_22) $(am__append_25) -I`$(CYGPATH_W) \
    292         $(CGLSRCDIR)/src` -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglClique` \
    293         -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglFlowCover` -I`$(CYGPATH_W) \
    294         $(CGLSRCDIR)/src/CglGomory` -I`$(CYGPATH_W) \
    295         $(CGLSRCDIR)/src/CglKnapsackCover` -I`$(CYGPATH_W) \
    296         $(CGLSRCDIR)/src/CglMixedIntegerRounding` -I`$(CYGPATH_W) \
    297         $(CGLSRCDIR)/src/CglMixedIntegerRounding2` -I`$(CYGPATH_W) \
    298         $(CGLSRCDIR)/src/CglOddHole` -I`$(CYGPATH_W) \
    299         $(CGLSRCDIR)/src/CglPreProcess` -I`$(CYGPATH_W) \
    300         $(CGLSRCDIR)/src/CglProbing` -I`$(CYGPATH_W) \
    301         $(CGLSRCDIR)/src/CglRedSplit` -I`$(CYGPATH_W) \
    302         $(CGLSRCDIR)/src/CglTwomir` -I`$(CYGPATH_W) \
    303         $(COINUTILSSRCDIR)/src` -I`$(CYGPATH_W) $(OSISRCDIR)/src`
     278CXXFLAGS = @CXXFLAGS@
    304279CYGPATH_W = @CYGPATH_W@
    305 
    306 # List additional defines
    307 DEFS = @DEFS@ -DCOIN_NO_CLP_MESSAGE -DUSE_CBCCONFIG
     280DEFS = @DEFS@
    308281DEPDIR = @DEPDIR@
    309282DYLPOBJDIR = @DYLPOBJDIR@
     
    479452        $(COINUTILSOBJDIR)/src/libCoinUtils.la
    480453
     454########################################################################
     455#                            Additional flags                          #
     456########################################################################
     457
     458# Here list all include flags, relative to this "srcdir" directory.  This
     459# "cygpath" stuff is necessary to compile with native compilers on Windows.
     460# "top_srcdir" refers to the basic directory for the main package that is
     461# being compiled.
     462
     463# List additional defines
     464AM_CPPFLAGS = -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiCbc` $(am__append_1) \
     465        $(am__append_4) $(am__append_6) $(am__append_9) \
     466        $(am__append_11) $(am__append_13) $(am__append_15) \
     467        $(am__append_17) $(am__append_19) $(am__append_22) \
     468        $(am__append_25) -I`$(CYGPATH_W) $(CGLSRCDIR)/src` \
     469        -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglClique` -I`$(CYGPATH_W) \
     470        $(CGLSRCDIR)/src/CglFlowCover` -I`$(CYGPATH_W) \
     471        $(CGLSRCDIR)/src/CglGomory` -I`$(CYGPATH_W) \
     472        $(CGLSRCDIR)/src/CglKnapsackCover` -I`$(CYGPATH_W) \
     473        $(CGLSRCDIR)/src/CglMixedIntegerRounding` -I`$(CYGPATH_W) \
     474        $(CGLSRCDIR)/src/CglMixedIntegerRounding2` -I`$(CYGPATH_W) \
     475        $(CGLSRCDIR)/src/CglOddHole` -I`$(CYGPATH_W) \
     476        $(CGLSRCDIR)/src/CglPreProcess` -I`$(CYGPATH_W) \
     477        $(CGLSRCDIR)/src/CglProbing` -I`$(CYGPATH_W) \
     478        $(CGLSRCDIR)/src/CglRedSplit` -I`$(CYGPATH_W) \
     479        $(CGLSRCDIR)/src/CglTwomir` -I`$(CYGPATH_W) \
     480        $(COINUTILSSRCDIR)/src` -I`$(CYGPATH_W) $(OSISRCDIR)/src` \
     481        -DCOIN_NO_CLP_MESSAGE -DUSE_CBCCONFIG
     482
    481483# Finally, the -rpath flag is used by libtool to make sure that the shared
    482484# library is found (in the lib install directory) when we are using dynamic
Note: See TracChangeset for help on using the changeset viewer.