Ignore:
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:
1 edited

Legend:

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

    r1299 r1321  
    5757        $(srcdir)/../../ltmain.sh $(srcdir)/../../missing \
    5858        $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
     59        $(srcdir)/config_glpk.h.in $(srcdir)/glpk_addlibs.txt.in \
    5960        $(top_srcdir)/configure
    6061@HAVE_EXTERNALS_TRUE@am__append_1 = Externals
     
    6970 configure.lineno configure.status.lineno
    7071mkinstalldirs = $(install_sh) -d
    71 CONFIG_CLEAN_FILES =
     72CONFIG_HEADER = config_glpk.h
     73CONFIG_CLEAN_FILES = glpk_addlibs.txt
    7274LTLIBRARIES = $(noinst_LTLIBRARIES)
    7375libcoinglpk_la_LIBADD =
     
    145147COIN_HAS_GLPK_FALSE = @COIN_HAS_GLPK_FALSE@
    146148COIN_HAS_GLPK_TRUE = @COIN_HAS_GLPK_TRUE@
     149COIN_HAS_ZLIB_FALSE = @COIN_HAS_ZLIB_FALSE@
     150COIN_HAS_ZLIB_TRUE = @COIN_HAS_ZLIB_TRUE@
    147151CPP = @CPP@
    148152CPPFLAGS = @CPPFLAGS@
     
    167171GLPKINCDIR = @GLPKINCDIR@
    168172GLPKLIB = @GLPKLIB@
     173GLPKOBJDIR = @GLPKOBJDIR@
    169174HAVE_EXTERNALS_FALSE = @HAVE_EXTERNALS_FALSE@
    170175HAVE_EXTERNALS_TRUE = @HAVE_EXTERNALS_TRUE@
     
    374379
    375380
    376 # CoinUtils and SYMPHONY include glpmpl.h and have HAVE_CONFIG_H defined
    377 # so we put a dummy config.h file and required include files into the glpk
    378 # include directory. At least a newline is needed to avoid a bug in
    379 # Sun Solaris Studio, 64-bit optimised build.
     381# CoinUtils and SYMPHONY include glpmpl.h, have HAVE_CONFIG_H defined,
     382# and so Glpk attempts to include config.h.
     383# Therefore, we put a simple config.h file into $(GLPKDIR)/include.
     384# It's purpose is to include the config_glpk.h file that is generated
     385# by configure.
    380386libcoinglpk_la_DEPENDENCIES = $(srcdir)/$(GLPKDIR)/include/config.h \
    381387  $(srcdir)/$(GLPKDIR)/include/glpmpl.h \
     
    403409DocFiles = README AUTHORS LICENSE
    404410DocInstallDir = $(prefix)/share/doc/coin/$(PACKAGE_NAME)
    405 all: all-am
     411all: config_glpk.h
     412        $(MAKE) $(AM_MAKEFLAGS) all-am
    406413
    407414.SUFFIXES:
     
    440447$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
    441448        cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
     449
     450config_glpk.h: stamp-h1
     451        @if test ! -f $@; then \
     452          rm -f stamp-h1; \
     453          $(MAKE) stamp-h1; \
     454        else :; fi
     455
     456stamp-h1: $(srcdir)/config_glpk.h.in $(top_builddir)/config.status
     457        @rm -f stamp-h1
     458        cd $(top_builddir) && $(SHELL) ./config.status config_glpk.h
     459$(srcdir)/config_glpk.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
     460        cd $(top_srcdir) && $(AUTOHEADER)
     461        rm -f stamp-h1
     462        touch $@
     463
     464distclean-hdr:
     465        -rm -f config_glpk.h stamp-h1
     466glpk_addlibs.txt: $(top_builddir)/config.status $(srcdir)/glpk_addlibs.txt.in
     467        cd $(top_builddir) && $(SHELL) ./config.status $@
    442468
    443469clean-noinstLTLIBRARIES:
     
    13801406tags: TAGS
    13811407
    1382 TAGS:  $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
     1408TAGS:  $(HEADERS) $(SOURCES) config_glpk.h.in $(TAGS_DEPENDENCIES) \
    13831409                $(TAGS_FILES) $(LISP)
    13841410        tags=; \
    13851411        here=`pwd`; \
    1386         list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
     1412        list='$(SOURCES) $(HEADERS) config_glpk.h.in $(LISP) $(TAGS_FILES)'; \
    13871413        unique=`for i in $$list; do \
    13881414            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
     
    13961422        fi
    13971423ctags: CTAGS
    1398 CTAGS:  $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
     1424CTAGS:  $(HEADERS) $(SOURCES) config_glpk.h.in $(TAGS_DEPENDENCIES) \
    13991425                $(TAGS_FILES) $(LISP)
    14001426        tags=; \
    14011427        here=`pwd`; \
    1402         list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
     1428        list='$(SOURCES) $(HEADERS) config_glpk.h.in $(LISP) $(TAGS_FILES)'; \
    14031429        unique=`for i in $$list; do \
    14041430            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
     
    14211447        $(am__remove_distdir)
    14221448        mkdir $(distdir)
    1423         $(mkdir_p) $(distdir)/../.. $(distdir)/../../BuildTools
     1449        $(mkdir_p) $(distdir)/. $(distdir)/../.. $(distdir)/../../BuildTools
    14241450        @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
    14251451        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
     
    15471573check-am: all-am
    15481574check: check-am
    1549 all-am: Makefile $(LTLIBRARIES)
     1575all-am: Makefile $(LTLIBRARIES) config_glpk.h
    15501576installdirs:
    15511577install: install-am
     
    15841610        -rm -f Makefile
    15851611distclean-am: clean-am distclean-compile distclean-generic \
    1586         distclean-libtool distclean-tags
     1612        distclean-hdr distclean-libtool distclean-tags
    15871613
    15881614dvi: dvi-am
     
    16321658        dist-all dist-bzip2 dist-gzip dist-shar dist-tarZ dist-zip \
    16331659        distcheck distclean distclean-compile distclean-generic \
    1634         distclean-libtool distclean-tags distcleancheck distdir \
    1635         distuninstallcheck dvi dvi-am html html-am info info-am \
    1636         install install-am install-data install-data-am install-exec \
    1637         install-exec-am install-info install-info-am install-man \
    1638         install-strip installcheck installcheck-am installdirs \
    1639         maintainer-clean maintainer-clean-generic mostlyclean \
    1640         mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
    1641         pdf pdf-am ps ps-am tags uninstall uninstall-am \
    1642         uninstall-info-am
    1643 
    1644 
    1645 $(srcdir)/$(GLPKDIR)/include/config.h :
    1646         echo "" > $(srcdir)/$(GLPKDIR)/include/config.h
     1660        distclean-hdr distclean-libtool distclean-tags distcleancheck \
     1661        distdir distuninstallcheck dvi dvi-am html html-am info \
     1662        info-am install install-am install-data install-data-am \
     1663        install-exec install-exec-am install-info install-info-am \
     1664        install-man install-strip installcheck installcheck-am \
     1665        installdirs maintainer-clean maintainer-clean-generic \
     1666        mostlyclean mostlyclean-compile mostlyclean-generic \
     1667        mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
     1668        uninstall-am uninstall-info-am
     1669
     1670
     1671$(srcdir)/$(GLPKDIR)/include/config.h : $(srcdir)/config.h
     1672        cp $(srcdir)/config.h $(srcdir)/$(GLPKDIR)/include/config.h
    16471673
    16481674$(srcdir)/$(GLPKDIR)/include/glpmpl.h : $(srcdir)/$(GLPKDIR)/src/glpmpl.h
Note: See TracChangeset for help on using the changeset viewer.