Changeset 1321 for ThirdParty/Glpk/trunk/Makefile.in

Timestamp:

Jul 11, 2009 3:24:18 PM (12 years ago)

Author:

stefan

Message:

create config.h and config_glpk.h for glpk; check for additional libraries, especially for odbc and mysql drivers (for Osi ticket 72); store additional dependencies in glpk_addlibs.txt

File:

• ThirdParty/Glpk/trunk/Makefile.in (modified) (13 diffs)

ThirdParty/Glpk/trunk/Makefile.in

@@ -57 +57 @@
         $(srcdir)/../../ltmain.sh $(srcdir)/../../missing \
         $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+        $(srcdir)/config_glpk.h.in $(srcdir)/glpk_addlibs.txt.in \
         $(top_srcdir)/configure
 @HAVE_EXTERNALS_TRUE@am__append_1 = Externals
@@ -69 +70 @@
  configure.lineno configure.status.lineno
 mkinstalldirs = $(install_sh) -d
-CONFIG_CLEAN_FILES =
+CONFIG_HEADER = config_glpk.h
+CONFIG_CLEAN_FILES = glpk_addlibs.txt
 LTLIBRARIES = $(noinst_LTLIBRARIES)
 libcoinglpk_la_LIBADD =
@@ -145 +147 @@
 COIN_HAS_GLPK_FALSE = @COIN_HAS_GLPK_FALSE@
 COIN_HAS_GLPK_TRUE = @COIN_HAS_GLPK_TRUE@
+COIN_HAS_ZLIB_FALSE = @COIN_HAS_ZLIB_FALSE@
+COIN_HAS_ZLIB_TRUE = @COIN_HAS_ZLIB_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
@@ -167 +171 @@
 GLPKINCDIR = @GLPKINCDIR@
 GLPKLIB = @GLPKLIB@
+GLPKOBJDIR = @GLPKOBJDIR@
 HAVE_EXTERNALS_FALSE = @HAVE_EXTERNALS_FALSE@
 HAVE_EXTERNALS_TRUE = @HAVE_EXTERNALS_TRUE@
@@ -374 +379 @@
 
 
-# CoinUtils and SYMPHONY include glpmpl.h and have HAVE_CONFIG_H defined
-# so we put a dummy config.h file and required include files into the glpk
-# include directory. At least a newline is needed to avoid a bug in
-# Sun Solaris Studio, 64-bit optimised build.
+# CoinUtils and SYMPHONY include glpmpl.h, have HAVE_CONFIG_H defined,
+# and so Glpk attempts to include config.h.
+# Therefore, we put a simple config.h file into $(GLPKDIR)/include.
+# It's purpose is to include the config_glpk.h file that is generated
+# by configure.
 libcoinglpk_la_DEPENDENCIES = $(srcdir)/$(GLPKDIR)/include/config.h \
   $(srcdir)/$(GLPKDIR)/include/glpmpl.h \
@@ -403 +409 @@
 DocFiles = README AUTHORS LICENSE
 DocInstallDir = $(prefix)/share/doc/coin/$(PACKAGE_NAME)
-all: all-am
+all: config_glpk.h
+        $(MAKE) $(AM_MAKEFLAGS) all-am
 
 .SUFFIXES:
@@ -440 +447 @@
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
         cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+
+config_glpk.h: stamp-h1
+        @if test ! -f $@; then \
+          rm -f stamp-h1; \
+          $(MAKE) stamp-h1; \
+        else :; fi
+
+stamp-h1: $(srcdir)/config_glpk.h.in $(top_builddir)/config.status
+        @rm -f stamp-h1
+        cd $(top_builddir) && $(SHELL) ./config.status config_glpk.h
+$(srcdir)/config_glpk.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) 
+        cd $(top_srcdir) && $(AUTOHEADER)
+        rm -f stamp-h1
+        touch $@
+
+distclean-hdr:
+        -rm -f config_glpk.h stamp-h1
+glpk_addlibs.txt: $(top_builddir)/config.status $(srcdir)/glpk_addlibs.txt.in
+        cd $(top_builddir) && $(SHELL) ./config.status $@
 
 clean-noinstLTLIBRARIES:
@@ -1380 +1406 @@
 tags: TAGS
 
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+TAGS:  $(HEADERS) $(SOURCES) config_glpk.h.in $(TAGS_DEPENDENCIES) \
                 $(TAGS_FILES) $(LISP)
         tags=; \
         here=`pwd`; \
-        list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+        list='$(SOURCES) $(HEADERS) config_glpk.h.in $(LISP) $(TAGS_FILES)'; \
         unique=`for i in $$list; do \
             if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
@@ -1396 +1422 @@
         fi
 ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+CTAGS:  $(HEADERS) $(SOURCES) config_glpk.h.in $(TAGS_DEPENDENCIES) \
                 $(TAGS_FILES) $(LISP)
         tags=; \
         here=`pwd`; \
-        list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+        list='$(SOURCES) $(HEADERS) config_glpk.h.in $(LISP) $(TAGS_FILES)'; \
         unique=`for i in $$list; do \
             if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
@@ -1421 +1447 @@
         $(am__remove_distdir)
         mkdir $(distdir)
-        $(mkdir_p) $(distdir)/../.. $(distdir)/../../BuildTools
+        $(mkdir_p) $(distdir)/. $(distdir)/../.. $(distdir)/../../BuildTools
         @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
         topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
@@ -1547 +1573 @@
 check-am: all-am
 check: check-am
-all-am: Makefile $(LTLIBRARIES)
+all-am: Makefile $(LTLIBRARIES) config_glpk.h
 installdirs:
 install: install-am
@@ -1584 +1610 @@
         -rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-        distclean-libtool distclean-tags
+        distclean-hdr distclean-libtool distclean-tags
 
 dvi: dvi-am
@@ -1632 +1658 @@
         dist-all dist-bzip2 dist-gzip dist-shar dist-tarZ dist-zip \
         distcheck distclean distclean-compile distclean-generic \
-        distclean-libtool distclean-tags distcleancheck distdir \
-        distuninstallcheck dvi dvi-am html html-am info info-am \
-        install install-am install-data install-data-am install-exec \
-        install-exec-am install-info install-info-am install-man \
-        install-strip installcheck installcheck-am installdirs \
-        maintainer-clean maintainer-clean-generic mostlyclean \
-        mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-        pdf pdf-am ps ps-am tags uninstall uninstall-am \
-        uninstall-info-am
-
-
-$(srcdir)/$(GLPKDIR)/include/config.h :
-        echo "" > $(srcdir)/$(GLPKDIR)/include/config.h
+        distclean-hdr distclean-libtool distclean-tags distcleancheck \
+        distdir distuninstallcheck dvi dvi-am html html-am info \
+        info-am install install-am install-data install-data-am \
+        install-exec install-exec-am install-info install-info-am \
+        install-man install-strip installcheck installcheck-am \
+        installdirs maintainer-clean maintainer-clean-generic \
+        mostlyclean mostlyclean-compile mostlyclean-generic \
+        mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+        uninstall-am uninstall-info-am
+
+
+$(srcdir)/$(GLPKDIR)/include/config.h : $(srcdir)/config.h
+        cp $(srcdir)/config.h $(srcdir)/$(GLPKDIR)/include/config.h
 
 $(srcdir)/$(GLPKDIR)/include/glpmpl.h : $(srcdir)/$(GLPKDIR)/src/glpmpl.h