Changeset 1230 for ThirdParty/Glpk


Ignore:
Timestamp:
Jan 6, 2009 4:29:13 PM (11 years ago)
Author:
stefan
Message:

force rebuild of all files after get.glpk has been called; move creation of config.h into Makefile

Location:
ThirdParty/Glpk/trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/Glpk/trunk/Makefile.am

    r1226 r1230  
    107107$(GLPKDIR)/src/glpssx02.c
    108108
     109libcoinglpk_la_DEPENDENCIES = $(srcdir)/$(GLPKDIR)/include/config.h
     110
     111# CoinUtils and SYMPHONY include glpmpl.h and have HAVE_CONFIG_H defined
     112# so we put a dummy config.h file into the glpk include directory. At least
     113# a newline is needed to avoid a bug in Sun Solaris Studio, 64-bit optimised
     114# build.
     115$(srcdir)/$(GLPKDIR)/include/config.h :
     116        echo "" > $(srcdir)/$(GLPKDIR)/include/config.h
     117
    109118DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)`
    110119
  • ThirdParty/Glpk/trunk/Makefile.in

    r1226 r1230  
    346346$(GLPKDIR)/src/glpssx02.c
    347347
     348libcoinglpk_la_DEPENDENCIES = $(srcdir)/$(GLPKDIR)/include/config.h
    348349DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)`
    349350AM_CPPFLAGS = -I`$(CYGPATH_W) $(srcdir)/$(GLPKDIR)/include` -I$(GLPKDIR)
     
    14221423
    14231424
     1425# CoinUtils and SYMPHONY include glpmpl.h and have HAVE_CONFIG_H defined
     1426# so we put a dummy config.h file into the glpk include directory. At least
     1427# a newline is needed to avoid a bug in Sun Solaris Studio, 64-bit optimised
     1428# build.
     1429$(srcdir)/$(GLPKDIR)/include/config.h :
     1430        echo "" > $(srcdir)/$(GLPKDIR)/include/config.h
     1431
    14241432install-doc: $(DocFiles)
    14251433        test -z "$(DocInstallDir)" || $(mkdir_p) "$(DESTDIR)$(DocInstallDir)"
  • ThirdParty/Glpk/trunk/configure

    r1226 r1230  
    2007420074if test x"$use_thirdpartyglpk" = xbuild ; then
    2007520075  touch $MAKEOKFILE
    20076   # CoinUtils and SYMPHONY include glpmpl.h and have HAVE_CONFIG_H defined
    20077   # so we put a dummy config.h file into the glpk include directory. At least
    20078   # a newline is needed to avoid a bug in Sun Solaris Studio, 64-bit optimised
    20079   # build.
    20080   echo "" > ${GLPKINCDIR}/config.h
    2008120076  echo "$as_me:$LINENO: checking GLPK version" >&5
    2008220077echo $ECHO_N "checking GLPK version... $ECHO_C" >&6
  • ThirdParty/Glpk/trunk/configure.ac

    r1226 r1230  
    7070if test x"$use_thirdpartyglpk" = xbuild ; then
    7171  touch $MAKEOKFILE
    72   # CoinUtils and SYMPHONY include glpmpl.h and have HAVE_CONFIG_H defined
    73   # so we put a dummy config.h file into the glpk include directory. At least
    74   # a newline is needed to avoid a bug in Sun Solaris Studio, 64-bit optimised
    75   # build.
    76   echo "" > ${GLPKINCDIR}/config.h
    7772  AC_MSG_CHECKING([GLPK version])
    7873  majorver=`awk '/define GLP_MAJOR_VERSION/ {print $3}' ${GLPKINCDIR}/glpk.h`
  • ThirdParty/Glpk/trunk/get.Glpk

    r1226 r1230  
    4747echo "Done downloading the source code for GLPK."
    4848echo "Applying patch file."
    49 echo " "
    5049
    5150patch -p0 < glpk.patch
    5251
     52echo "Touch every source file to force rebuild of whole package."
     53
     54touch glpk/src/*.c glpk/include/*.h
     55
    5356echo " "
    5457echo "Verify that there are no error message in the output above."
Note: See TracChangeset for help on using the changeset viewer.