Ignore:
Timestamp:
Jun 9, 2011 9:09:23 AM (9 years ago)
Author:
stefan
Message:

change to new way of using and installing configuration header files

File:
1 edited

Legend:

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

    r1598 r1660  
    186186AM_CPPFLAGS += -DCOIN_NO_CLP_MESSAGE -DUSE_CBCCONFIG
    187187
    188 # This line is necessary to allow VPATH compilation with MS compilers
    189 # on Cygwin
    190 DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)` -I$(top_builddir)/inc
     188# This line is necessary to allow VPATH compilation
     189DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)` -I$(top_builddir)/src
    191190
    192191########################################################################
     
    198197includecoindir = $(includedir)/coin
    199198includecoin_HEADERS = \
    200         ../inc/config_cbc.h \
    201199        Cbc_C_Interface.h \
    202200        CbcBranchActual.hpp \
     
    269267        ClpAmplObjective.hpp
    270268
    271 #############################################################################
    272 # Create the Config.h file that always defines HAVE_CONFIG_H and install it #
    273 #############################################################################
    274 
    275 # You only need to adapt the following line
    276 ConfigHeader = CbcConfig.h
    277 
    278269install-exec-local:
    279         echo "#ifndef HAVE_CONFIG_H" >bla
    280         echo "#define HAVE_CONFIG_H" >>bla
    281         echo "#endif" >> bla
    282         cat $(srcdir)/$(ConfigHeader) >> bla
    283         $(install_sh_DATA) bla $(DESTDIR)$(includecoindir)/$(ConfigHeader)
    284         rm -f bla
     270        $(install_sh_DATA) config_cbc.h $(DESTDIR)$(includecoindir)/CbcConfig.h
    285271
    286272uninstall-local:
    287         rm -f $(DESTDIR)$(includecoindir)/$(ConfigHeader)
     273        rm -f $(DESTDIR)$(includecoindir)/CbcConfig.h
Note: See TracChangeset for help on using the changeset viewer.