Changeset 3804 for ThirdParty/Glpk


Ignore:
Timestamp:
Jan 24, 2018 9:32:18 PM (19 months ago)
Author:
lou
Message:

Pruned away various bits that looked like unnecessary cruft.

Location:
ThirdParty/Glpk/branches/autotools-update
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/Glpk/branches/autotools-update/Makefile.in

    r3782 r3804  
    1 # Makefile.in generated by automake 1.15 from Makefile.am.
     1# Makefile.in generated by automake 1.15.1 from Makefile.am.
    22# @configure_input@
    33
    4 # Copyright (C) 1994-2014 Free Software Foundation, Inc.
     4# Copyright (C) 1994-2017 Free Software Foundation, Inc.
    55
    66# This Makefile.in is free software; the Free Software Foundation
     
    2626
    2727########################################################################
    28 #                    Documentation installation                        #
     28#        Variables for documentation and data directories              #
    2929########################################################################
     30
     31# COIN overrides the default definitions of datadir and docdir.
    3032
    3133VPATH = @srcdir@
     
    8587am__make_dryrun = (target_option=n; $(am__make_running_with_option))
    8688am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
    87 pkgdatadir = $(datadir)/@PACKAGE@
    8889pkgincludedir = $(includedir)/@PACKAGE@
    8990pkglibdir = $(libdir)/@PACKAGE@
     
    202203CSCOPE = cscope
    203204DIST_SUBDIRS = $(SUBDIRS)
     205pkgdatadir = $(datadir)/$(PACKAGE_NAME)
    204206ACLOCAL = @ACLOCAL@
    205207AMTAR = @AMTAR@
     
    227229EXEEXT = @EXEEXT@
    228230FGREP = @FGREP@
    229 GLPKDIR = @GLPKDIR@
    230 GLPK_LIBS = @GLPK_LIBS@
    231231GLPK_SVN_REV = @GLPK_SVN_REV@
    232232GREP = @GREP@
     
    289289build_vendor = @build_vendor@
    290290builddir = @builddir@
    291 datadir = @datadir@
     291datadir = @datarootdir@/coin/data
    292292datarootdir = @datarootdir@
    293 docdir = @docdir@
     293docdir = @datarootdir@/coin/doc
    294294dvidir = @dvidir@
    295295exec_prefix = @exec_prefix@
     
    337337CLEANFILES =
    338338DISTCLEANFILES =
     339pkgdocdir = $(docdir)/$(PACKAGE_NAME)
     340doxydocdir = $(pkgdocdir)/doxydoc
     341doxyhtmldir = $(doxydocdir)
     342
     343########################################################################
     344#                    Documentation installation                        #
     345########################################################################
    339346DocFiles = README AUTHORS LICENSE
    340 DocInstallDir = $(datadir)/coin/doc/$(PACKAGE_NAME)
    341347COIN_HAS_DOXYGEN = @COIN_HAS_DOXYGEN_TRUE@TRUE
    342348COIN_HAS_LATEX = @COIN_HAS_LATEX_TRUE@TRUE
     349
     350# Needless to say, it's important that doxydocdir_nosub not be a target for
     351# autoconf substitution.
     352DOXYTAG_EDIT = sed -e 's|@docdir_nosub@|$(docdir)|g'
    343353all: config_glpk.h
    344354        $(MAKE) $(AM_MAKEFLAGS) all-recursive
     
    669679        if test "$(COIN_HAS_DOXYGEN)" = TRUE; then \
    670680          if test -d "doxydoc/"; then \
     681            if test -f doxydoc/doxygen.conf ; then \
     682              $(DOXYTAG_EDIT) \
     683                doxydoc/doxygen.conf > doxydoc/doxygen.conf.tmp ; \
     684              mv doxydoc/doxygen.conf.tmp doxydoc/doxygen.conf ; \
     685            fi ; \
    671686            doxygen doxydoc/doxygen.conf;\
    672687          fi;\
     
    685700
    686701clean-doxygen-docs:
    687         if test -d "doxydoc/"; then \
     702        if test -d "doxydoc"; then \
    688703          cd doxydoc ;\
    689704          rm -rf html latex *.log *.tag;\
     
    692707install-doxygen-docs: doxygen-docs
    693708        if test "$(COIN_HAS_DOXYGEN)" = TRUE; then \
    694           if test -d "doxydoc/"; then \
    695             test -d "$(DESTDIR)$(DocInstallDir)/doxydoc" || \
    696                  $(mkdir_p) "$(DESTDIR)$(DocInstallDir)/doxydoc"; \
    697             $(INSTALL_DATA) @coin_doxy_tagname@ \
    698                 "$(DESTDIR)$(DocInstallDir)/@coin_doxy_tagname@";\
     709          if test -d "doxydoc"; then \
     710            test -d "$(DESTDIR)$(doxydocdir)" || \
     711                 $(mkdir_p) "$(DESTDIR)$(doxydocdir)"; \
     712            $(INSTALL_DATA) doxydoc/@coin_doxy_tagname@ \
     713                "$(DESTDIR)$(doxydocdir)"; \
    699714            if test -f "doxydoc/latex/refman.pdf"; then \
    700715              $(INSTALL_DATA) doxydoc/latex/refman.pdf \
    701                   "$(DESTDIR)$(DocInstallDir)";\
     716                  "$(DESTDIR)$(doxydocdir)";\
    702717            fi;\
    703718            if test -d "doxydoc/html"; then \
    704               test -d "$(DESTDIR)$(DocInstallDir)/doxydoc/search/" || \
    705                    $(mkdir_p) "$(DESTDIR)$(DocInstallDir)/doxydoc/search/"; \
     719              test -d "$(DESTDIR)$(doxyhtmldir)/search/" || \
     720                   $(mkdir_p) "$(DESTDIR)$(doxyhtmldir)/search/"; \
    706721              $(INSTALL_DATA) doxydoc/html/*.* \
    707                   "$(DESTDIR)$(DocInstallDir)/doxydoc";\
     722                  "$(DESTDIR)$(doxyhtmldir)";\
    708723              $(INSTALL_DATA) doxydoc/html/search/*.* \
    709                   "$(DESTDIR)$(DocInstallDir)/doxydoc/search";\
     724                  "$(DESTDIR)$(doxyhtmldir)/search";\
    710725            fi;\
    711726          fi;\
    712727        fi
    713728
     729# It's not clear that uninstall-doc should also remove doxygen doc'n. Write
     730# the rules so that the last one will remove pkgdocdir (which should be empty
     731# by then).
     732
    714733uninstall-doxygen-docs:
    715         if test -d "$(DESTDIR)$(DocInstallDir)/doxydoc/"; then \
    716           rm -rf "$(DESTDIR)$(DocInstallDir)/doxydoc/"; \
     734        if test -d "$(DESTDIR)$(doxydocdir)"; then \
     735          rm -rf "$(DESTDIR)$(doxydocdir)"; \
    717736        fi
    718         if test -f "$(DESTDIR)$(DocInstallDir)/refman.pdf"; then \
    719           rm -f "$(DESTDIR)$(DocInstallDir)/refman.pdf"; \
    720         fi
    721         rmdir "$(DESTDIR)$(DocInstallDir)"
     737        rmdir $(DESTDIR)$(pkgdocdir) || true
    722738
    723739install-doc: $(DocFiles)
    724         test -z "$(DocInstallDir)" || $(mkdir_p) "$(DESTDIR)$(DocInstallDir)"
     740        $(mkdir_p) "$(DESTDIR)$(pkgdocdir)"
    725741        for file in $(DocFiles); do \
    726742          if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \
    727743          if test -f "$$dir$$file"; then \
    728744            $(INSTALL_DATA) "$$dir$$file" \
    729                 "$(DESTDIR)$(DocInstallDir)/$$file"; \
     745                "$(DESTDIR)$(pkgdocdir)/$$file"; \
    730746          fi; \
    731747        done
     
    733749uninstall-doc:
    734750        for file in $(DocFiles); do \
    735           rm -f "$(DESTDIR)$(DocInstallDir)/$$file"; \
     751          rm -f "$(DESTDIR)$(pkgdocdir)/$$file"; \
    736752        done
     753        rmdir $(DESTDIR)$(pkgdocdir) || true
    737754
    738755########################################################################
  • ThirdParty/Glpk/branches/autotools-update/coinglpk.pc.in

    r3250 r3804  
    99Version: @PACKAGE_VERSION@
    1010Libs: -L${libdir} -lcoinglpk
    11 Libs.private: @GLPK_LIBS@
    1211Cflags: -I${includedir}
  • ThirdParty/Glpk/branches/autotools-update/configure

    r3782 r3804  
    645645LTLIBOBJS
    646646LIBOBJS
    647 GLPK_LIBS
    648 GLPKDIR
    649647subdirs
    650648LT_LDFLAGS
     
    1197611974# Finish up
    1197711975
    11978 GLPKDIR=glpk
    11979 
    11980 
    1198111976ac_config_files="$ac_config_files Makefile coinglpk.pc"
    1198211977
    1198311978ac_config_headers="$ac_config_headers config_glpk.h"
    11984 
    11985 
    1198611979
    1198711980
  • ThirdParty/Glpk/branches/autotools-update/configure.ac

    r3782 r3804  
    5151# Finish up
    5252
    53 GLPKDIR=glpk
    54 AC_SUBST(GLPKDIR)
    55 
    5653AC_CONFIG_FILES([Makefile coinglpk.pc])
    5754AC_CONFIG_HEADER([config_glpk.h])
    5855
    59 AC_SUBST(GLPK_LIBS)
    60 
    6156AC_COIN_FINALIZE
    6257
Note: See TracChangeset for help on using the changeset viewer.