Ignore:
Timestamp:
Nov 6, 2007 2:52:31 PM (12 years ago)
Author:
stefan
Message:

update to GLPK 4.23 (now also need to setup a config.h)

File:
1 edited

Legend:

Unmodified
Added
Removed

  • ThirdParty/Glpk/trunk/Makefile.in

    r582 r735  
    5757        $(srcdir)/../../ltmain.sh $(srcdir)/../../missing \
    5858        $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
    59         $(top_srcdir)/configure
     59        $(top_srcdir)/configure $(top_srcdir)/glpk/config.h.in
    6060@HAVE_EXTERNALS_TRUE@am__append_1 = Externals
    6161@HAVE_EXTERNALS_TRUE@am__append_2 = .Externals-stamp
    … …  
    6969 configure.lineno configure.status.lineno
    7070mkinstalldirs = $(install_sh) -d
     71CONFIG_HEADER = $(top_builddir)/glpk/config.h
    7172CONFIG_CLEAN_FILES =
    7273LTLIBRARIES = $(noinst_LTLIBRARIES)
    … …  
    7475nodist_libcoinglpk_la_OBJECTS = glpapi01.lo glpapi02.lo glpapi03.lo \
    7576        glpapi04.lo glpapi05.lo glpapi06.lo glpapi07.lo glpapi08.lo \
    76         glpapi09.lo glpapi10.lo glpapi11.lo glpavl.lo glpbfd.lo \
    77         glpbfx.lo glpdmp.lo glpfhv.lo glpgmp.lo glphbm.lo glpios01.lo \
    78         glpios02.lo glpios03.lo glpios04.lo glpipm.lo glpipp01.lo \
    79         glpipp02.lo glplib01.lo glplib02.lo glplib03.lo glplib04.lo \
    80         glplib05.lo glplib06.lo glplib07.lo glplib08.lo glplib09.lo \
    81         glplpf.lo glplpp01.lo glplpp02.lo glplpx01.lo glplpx02.lo \
    82         glplpx03.lo glplpx04.lo glplpx05.lo glplpx06.lo glplpx07.lo \
    83         glplpx08.lo glplpx09.lo glplpx10.lo glplpx11.lo glplpx12.lo \
    84         glplpx13.lo glplpx14.lo glplpx15.lo glplpx16.lo glplpx17.lo \
    85         glplpx18.lo glplpx19.lo glpluf.lo glplux.lo glpmat.lo \
    86         glpmpl01.lo glpmpl02.lo glpmpl03.lo glpmpl04.lo glpqmd.lo \
    87         glprng01.lo glprng02.lo glpscf.lo glpscg.lo glpscs.lo \
    88         glpspx01.lo glpspx02.lo glpssx01.lo glpssx02.lo
     77        glpapi09.lo glpapi10.lo glpapi11.lo glpapi12.lo glpavl.lo \
     78        glpbfd.lo glpbfx.lo glpdmp.lo glpfhv.lo glpgmp.lo glphbm.lo \
     79        glpios01.lo glpios02.lo glpios03.lo glpios04.lo glpipm.lo \
     80        glpipp01.lo glpipp02.lo glplib01.lo glplib02.lo glplib03.lo \
     81        glplib04.lo glplib05.lo glplib06.lo glplib07.lo glplib08.lo \
     82        glplib09.lo glplpf.lo glplpp01.lo glplpp02.lo glplpx01.lo \
     83        glplpx02.lo glplpx03.lo glplpx04.lo glplpx05.lo glplpx06.lo \
     84        glplpx07.lo glplpx08.lo glplpx09.lo glplpx10.lo glplpx11.lo \
     85        glplpx12.lo glplpx13.lo glplpx14.lo glplpx15.lo glplpx16.lo \
     86        glplpx17.lo glplpx18.lo glplpx19.lo glplpx20.lo glpluf.lo \
     87        glplux.lo glpmat.lo glpmpl01.lo glpmpl02.lo glpmpl03.lo \
     88        glpmpl04.lo glppds.lo glpqmd.lo glprng01.lo glprng02.lo \
     89        glpscf.lo glpscg.lo glpscs.lo glpspx01.lo glpspx02.lo \
     90        glpssx01.lo glpssx02.lo
    8991libcoinglpk_la_OBJECTS = $(nodist_libcoinglpk_la_OBJECTS)
    9092@COIN_BUILD_GLPK_TRUE@am_libcoinglpk_la_rpath =
    … …  
    264266$(GLPKDIR)/src/glpapi10.c \
    265267$(GLPKDIR)/src/glpapi11.c \
     268$(GLPKDIR)/src/glpapi12.c \
    266269$(GLPKDIR)/src/glpavl.c \
    267270$(GLPKDIR)/src/glpbfd.c \
    … …  
    309312$(GLPKDIR)/src/glplpx18.c \
    310313$(GLPKDIR)/src/glplpx19.c \
     314$(GLPKDIR)/src/glplpx20.c \
    311315$(GLPKDIR)/src/glpluf.c \
    312316$(GLPKDIR)/src/glplux.c \
    … …  
    316320$(GLPKDIR)/src/glpmpl03.c \
    317321$(GLPKDIR)/src/glpmpl04.c \
     322$(GLPKDIR)/src/glppds.c \
    318323$(GLPKDIR)/src/glpqmd.c \
    319324$(GLPKDIR)/src/glprng01.c \
    … …  
    328333
    329334DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)`
    330 AM_CPPFLAGS = -I`$(CYGPATH_W) $(srcdir)/$(GLPKDIR)/include`
     335AM_CPPFLAGS = -I`$(CYGPATH_W) $(srcdir)/$(GLPKDIR)/include` -I$(GLPKDIR)
    331336libcoinglpk_la_LDFLAGS = $(LT_LDFLAGS)
    332337
    … …  
    375380        cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
    376381
     382glpk/config.h: glpk/stamp-h1
     383        @if test ! -f $@; then \
     384          rm -f glpk/stamp-h1; \
     385          $(MAKE) glpk/stamp-h1; \
     386        else :; fi
     387
     388glpk/stamp-h1: $(top_srcdir)/glpk/config.h.in $(top_builddir)/config.status
     389        @rm -f glpk/stamp-h1
     390        cd $(top_builddir) && $(SHELL) ./config.status glpk/config.h
     391$(top_srcdir)/glpk/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
     392        cd $(top_srcdir) && $(AUTOHEADER)
     393        rm -f glpk/stamp-h1
     394        touch $@
     395
     396distclean-hdr:
     397        -rm -f glpk/config.h glpk/stamp-h1
     398
    377399clean-noinstLTLIBRARIES:
    378400        -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
    … …  
    403425@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glpapi10.Plo@am__quote@
    404426@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glpapi11.Plo@am__quote@
     427@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glpapi12.Plo@am__quote@
    405428@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glpavl.Plo@am__quote@
    406429@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glpbfd.Plo@am__quote@
    … …  
    448471@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glplpx18.Plo@am__quote@
    449472@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glplpx19.Plo@am__quote@
     473@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glplpx20.Plo@am__quote@
    450474@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glpluf.Plo@am__quote@
    451475@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glplux.Plo@am__quote@
    … …  
    455479@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glpmpl03.Plo@am__quote@
    456480@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glpmpl04.Plo@am__quote@
     481@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glppds.Plo@am__quote@
    457482@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glpqmd.Plo@am__quote@
    458483@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glprng01.Plo@am__quote@
    … …  
    564589@am__fastdepCC_FALSE@   $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o glpapi11.lo `test -f '$(GLPKDIR)/src/glpapi11.c' || echo '$(srcdir)/'`$(GLPKDIR)/src/glpapi11.c
    565590
     591glpapi12.lo: $(GLPKDIR)/src/glpapi12.c
     592@am__fastdepCC_TRUE@    if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT glpapi12.lo -MD -MP -MF "$(DEPDIR)/glpapi12.Tpo" -c -o glpapi12.lo `test -f '$(GLPKDIR)/src/glpapi12.c' || echo '$(srcdir)/'`$(GLPKDIR)/src/glpapi12.c; \
     593@am__fastdepCC_TRUE@    then mv -f "$(DEPDIR)/glpapi12.Tpo" "$(DEPDIR)/glpapi12.Plo"; else rm -f "$(DEPDIR)/glpapi12.Tpo"; exit 1; fi
     594@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$(GLPKDIR)/src/glpapi12.c' object='glpapi12.lo' libtool=yes @AMDEPBACKSLASH@
     595@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     596@am__fastdepCC_FALSE@   $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o glpapi12.lo `test -f '$(GLPKDIR)/src/glpapi12.c' || echo '$(srcdir)/'`$(GLPKDIR)/src/glpapi12.c
     597
    566598glpavl.lo: $(GLPKDIR)/src/glpavl.c
    567599@am__fastdepCC_TRUE@    if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT glpavl.lo -MD -MP -MF "$(DEPDIR)/glpavl.Tpo" -c -o glpavl.lo `test -f '$(GLPKDIR)/src/glpavl.c' || echo '$(srcdir)/'`$(GLPKDIR)/src/glpavl.c; \
    … …  
    879911@am__fastdepCC_FALSE@   $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o glplpx19.lo `test -f '$(GLPKDIR)/src/glplpx19.c' || echo '$(srcdir)/'`$(GLPKDIR)/src/glplpx19.c
    880912
     913glplpx20.lo: $(GLPKDIR)/src/glplpx20.c
     914@am__fastdepCC_TRUE@    if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT glplpx20.lo -MD -MP -MF "$(DEPDIR)/glplpx20.Tpo" -c -o glplpx20.lo `test -f '$(GLPKDIR)/src/glplpx20.c' || echo '$(srcdir)/'`$(GLPKDIR)/src/glplpx20.c; \
     915@am__fastdepCC_TRUE@    then mv -f "$(DEPDIR)/glplpx20.Tpo" "$(DEPDIR)/glplpx20.Plo"; else rm -f "$(DEPDIR)/glplpx20.Tpo"; exit 1; fi
     916@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$(GLPKDIR)/src/glplpx20.c' object='glplpx20.lo' libtool=yes @AMDEPBACKSLASH@
     917@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     918@am__fastdepCC_FALSE@   $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o glplpx20.lo `test -f '$(GLPKDIR)/src/glplpx20.c' || echo '$(srcdir)/'`$(GLPKDIR)/src/glplpx20.c
     919
    881920glpluf.lo: $(GLPKDIR)/src/glpluf.c
    882921@am__fastdepCC_TRUE@    if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT glpluf.lo -MD -MP -MF "$(DEPDIR)/glpluf.Tpo" -c -o glpluf.lo `test -f '$(GLPKDIR)/src/glpluf.c' || echo '$(srcdir)/'`$(GLPKDIR)/src/glpluf.c; \
    … …  
    927966@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    928967@am__fastdepCC_FALSE@   $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o glpmpl04.lo `test -f '$(GLPKDIR)/src/glpmpl04.c' || echo '$(srcdir)/'`$(GLPKDIR)/src/glpmpl04.c
     968
     969glppds.lo: $(GLPKDIR)/src/glppds.c
     970@am__fastdepCC_TRUE@    if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT glppds.lo -MD -MP -MF "$(DEPDIR)/glppds.Tpo" -c -o glppds.lo `test -f '$(GLPKDIR)/src/glppds.c' || echo '$(srcdir)/'`$(GLPKDIR)/src/glppds.c; \
     971@am__fastdepCC_TRUE@    then mv -f "$(DEPDIR)/glppds.Tpo" "$(DEPDIR)/glppds.Plo"; else rm -f "$(DEPDIR)/glppds.Tpo"; exit 1; fi
     972@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$(GLPKDIR)/src/glppds.c' object='glppds.lo' libtool=yes @AMDEPBACKSLASH@
     973@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     974@am__fastdepCC_FALSE@   $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o glppds.lo `test -f '$(GLPKDIR)/src/glppds.c' || echo '$(srcdir)/'`$(GLPKDIR)/src/glppds.c
    929975
    930976glpqmd.lo: $(GLPKDIR)/src/glpqmd.c
    … …  
    10591105        $(am__remove_distdir)
    10601106        mkdir $(distdir)
    1061         $(mkdir_p) $(distdir)/../.. $(distdir)/../../BuildTools
     1107        $(mkdir_p) $(distdir)/../.. $(distdir)/../../BuildTools $(distdir)/glpk
    10621108        @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
    10631109        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
    … …  
    12221268        -rm -f Makefile
    12231269distclean-am: clean-am distclean-compile distclean-generic \
    1224         distclean-libtool distclean-tags
     1270        distclean-hdr distclean-libtool distclean-tags
    12251271
    12261272dvi: dvi-am
    … …  
    12701316        dist-all dist-bzip2 dist-gzip dist-shar dist-tarZ dist-zip \
    12711317        distcheck distclean distclean-compile distclean-generic \
    1272         distclean-libtool distclean-tags distcleancheck distdir \
    1273         distuninstallcheck dvi dvi-am html html-am info info-am \
    1274         install install-am install-data install-data-am install-exec \
    1275         install-exec-am install-info install-info-am install-man \
    1276         install-strip installcheck installcheck-am installdirs \
    1277         maintainer-clean maintainer-clean-generic mostlyclean \
    1278         mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
    1279         pdf pdf-am ps ps-am tags uninstall uninstall-am \
    1280         uninstall-info-am
     1318        distclean-hdr distclean-libtool distclean-tags distcleancheck \
     1319        distdir distuninstallcheck dvi dvi-am html html-am info \
     1320        info-am install install-am install-data install-data-am \
     1321        install-exec install-exec-am install-info install-info-am \
     1322        install-man install-strip installcheck installcheck-am \
     1323        installdirs maintainer-clean maintainer-clean-generic \
     1324        mostlyclean mostlyclean-compile mostlyclean-generic \
     1325        mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
     1326        uninstall-am uninstall-info-am
    12811327
    12821328
Note: See TracChangeset for help on using the changeset viewer.