Changeset 1230

Timestamp:

Jan 6, 2009 4:29:13 PM (12 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:

• Makefile.am (modified) (1 diff)
• Makefile.in (modified) (2 diffs)
• configure (modified) (1 diff)
• configure.ac (modified) (1 diff)
• get.Glpk (modified) (1 diff)

ThirdParty/Glpk/trunk/Makefile.am

@@ -107 +107 @@
 $(GLPKDIR)/src/glpssx02.c
 
+libcoinglpk_la_DEPENDENCIES = $(srcdir)/$(GLPKDIR)/include/config.h
+
+# CoinUtils and SYMPHONY include glpmpl.h and have HAVE_CONFIG_H defined
+# so we put a dummy config.h file into the glpk include directory. At least
+# a newline is needed to avoid a bug in Sun Solaris Studio, 64-bit optimised
+# build.
+$(srcdir)/$(GLPKDIR)/include/config.h :
+        echo "" > $(srcdir)/$(GLPKDIR)/include/config.h
+
 DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)`
 

ThirdParty/Glpk/trunk/Makefile.in

@@ -346 +346 @@
 $(GLPKDIR)/src/glpssx02.c
 
+libcoinglpk_la_DEPENDENCIES = $(srcdir)/$(GLPKDIR)/include/config.h
 DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)`
 AM_CPPFLAGS = -I`$(CYGPATH_W) $(srcdir)/$(GLPKDIR)/include` -I$(GLPKDIR)
@@ -1422 +1423 @@
 
 
+# CoinUtils and SYMPHONY include glpmpl.h and have HAVE_CONFIG_H defined
+# so we put a dummy config.h file into the glpk include directory. At least
+# a newline is needed to avoid a bug in Sun Solaris Studio, 64-bit optimised
+# build.
+$(srcdir)/$(GLPKDIR)/include/config.h :
+        echo "" > $(srcdir)/$(GLPKDIR)/include/config.h
+
 install-doc: $(DocFiles)
         test -z "$(DocInstallDir)" || $(mkdir_p) "$(DESTDIR)$(DocInstallDir)"

ThirdParty/Glpk/trunk/configure

@@ -20074 +20074 @@
 if test x"$use_thirdpartyglpk" = xbuild ; then
   touch $MAKEOKFILE
-  # CoinUtils and SYMPHONY include glpmpl.h and have HAVE_CONFIG_H defined
-  # so we put a dummy config.h file into the glpk include directory. At least
-  # a newline is needed to avoid a bug in Sun Solaris Studio, 64-bit optimised
-  # build.
-  echo "" > ${GLPKINCDIR}/config.h
   echo "$as_me:$LINENO: checking GLPK version" >&5
 echo $ECHO_N "checking GLPK version... $ECHO_C" >&6

ThirdParty/Glpk/trunk/configure.ac

@@ -70 +70 @@
 if test x"$use_thirdpartyglpk" = xbuild ; then
   touch $MAKEOKFILE
-  # CoinUtils and SYMPHONY include glpmpl.h and have HAVE_CONFIG_H defined
-  # so we put a dummy config.h file into the glpk include directory. At least
-  # a newline is needed to avoid a bug in Sun Solaris Studio, 64-bit optimised
-  # build.
-  echo "" > ${GLPKINCDIR}/config.h
   AC_MSG_CHECKING([GLPK version])
   majorver=`awk '/define GLP_MAJOR_VERSION/ {print $3}' ${GLPKINCDIR}/glpk.h`

ThirdParty/Glpk/trunk/get.Glpk

@@ -47 +47 @@
 echo "Done downloading the source code for GLPK."
 echo "Applying patch file."
-echo " "
 
 patch -p0 < glpk.patch
 
+echo "Touch every source file to force rebuild of whole package."
+
+touch glpk/src/*.c glpk/include/*.h
+
 echo " "
 echo "Verify that there are no error message in the output above."