Changeset 4052


Ignore:
Timestamp:
Jan 9, 2020 11:54:49 PM (5 months ago)
Author:
stefan
Message:

do not need subdir-objects or Makemain.inc

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

Legend:

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

    r3782 r4052  
    55## $Id$
    66
    7 AUTOMAKE_OPTIONS = foreign subdir-objects
     7AUTOMAKE_OPTIONS = foreign
    88
    99EXTRA_DIST = get.GLPK INSTALL.Glpk glpk.patch
     
    2727
    2828DISTCLEANFILES =
    29 
    30 include BuildTools/Makemain.inc
  • ThirdParty/Glpk/branches/autotools-update/Makefile.in

    r4050 r4052  
    1818# All Rights Reserved.
    1919# This file is distributed under the Eclipse Public License.
    20 
    21 # Copyright (C) 2006, 2007 International Business Machines and others.
    22 # All Rights Reserved.
    23 # This file is distributed under the Eclipse Public License.
    24 
    25 # Author:  Andreas Waechter           IBM    2006-04-13
    26 
    27 ########################################################################
    28 #        Variables for documentation and data directories              #
    29 ########################################################################
    30 
    31 # Set these up to provide some uniformity in naming while also conforming
    32 # to Gnu directory standards. For reasons known only to the autoconf
    33 # developers, autoconf leaves datadir = $(datarootdir) but forces docdir
    34 # to $(datarootdir)/doc/$(PACKAGE_TARNAME).
    3520
    3621VPATH = @srcdir@
     
    9075am__make_dryrun = (target_option=n; $(am__make_running_with_option))
    9176am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
     77pkgdatadir = $(datadir)/@PACKAGE@
     78pkgincludedir = $(includedir)/@PACKAGE@
    9279pkglibdir = $(libdir)/@PACKAGE@
    9380pkglibexecdir = $(libexecdir)/@PACKAGE@
     
    204191CSCOPE = cscope
    205192DIST_SUBDIRS = $(SUBDIRS)
    206 pkgdatadir = $(datadir)/$(PACKAGE_TARNAME)
    207 pkgincludedir = $(includedir)/coin-or
    208193ACLOCAL = @ACLOCAL@
    209194AMTAR = @AMTAR@
     
    325310top_builddir = @top_builddir@
    326311top_srcdir = @top_srcdir@
    327 AUTOMAKE_OPTIONS = foreign subdir-objects
     312AUTOMAKE_OPTIONS = foreign
    328313EXTRA_DIST = get.GLPK INSTALL.Glpk glpk.patch
    329314pkgconfiglibdir = $(libdir)/pkgconfig
     
    338323CLEANFILES =
    339324DISTCLEANFILES =
    340 pkgdocdir = $(docdir)
    341 
    342 # doxydocdir is the top-level directory for doxygen documentation. It holds
    343 # the tag file and possibly the PDF or Postscript version. doxyhtmldir is
    344 # typically a subdirectory containing all the files doxygen creates for
    345 # html documentation.
    346 doxydocdir = $(pkgdocdir)/doxydoc
    347 doxyhtmldir = $(doxydocdir)/html
    348 
    349 ########################################################################
    350 #                    Documentation installation                        #
    351 ########################################################################
    352 DocFiles = README AUTHORS LICENSE
    353 COIN_HAS_DOXYGEN = @COIN_HAS_DOXYGEN_TRUE@TRUE
    354 COIN_HAS_LATEX = @COIN_HAS_LATEX_TRUE@TRUE
    355 
    356 # Needless to say, it's important that baredocdir_nosub not be a target for
    357 # autoconf substitution.
    358 DOXYTAG_EDIT = sed -e 's|@baredocdir_nosub@|$(datarootdir)/doc|g'
    359325all: config_glpk.h
    360326        $(MAKE) $(AM_MAKEFLAGS) all-recursive
     
    363329am--refresh: Makefile
    364330        @:
    365 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/BuildTools/Makemain.inc $(am__configure_deps)
     331$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
    366332        @for dep in $?; do \
    367333          case '$(am__configure_deps)' in \
     
    385351            cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \
    386352        esac;
    387 $(srcdir)/BuildTools/Makemain.inc $(am__empty):
    388353
    389354$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
     
    682647        @cd glpk ; $(MAKE) check
    683648
    684 doxygen-docs:
    685         if test "$(COIN_HAS_DOXYGEN)" = TRUE; then \
    686           if test -d "doxydoc/"; then \
    687             if test -f doxydoc/doxygen.conf ; then \
    688               $(DOXYTAG_EDIT) \
    689                 doxydoc/doxygen.conf > doxydoc/doxygen.conf.tmp ; \
    690               mv doxydoc/doxygen.conf.tmp doxydoc/doxygen.conf ; \
    691             fi ; \
    692             doxygen doxydoc/doxygen.conf;\
    693           fi;\
    694         fi
    695 
    696 pdf-doxygen-docs: doxygen-docs
    697         if test "$(COIN_HAS_DOXYGEN)" = TRUE; then \
    698           if test -d "doxydoc/latex"; then \
    699             if test "$(COIN_HAS_LATEX)" = TRUE; then \
    700               cd doxydoc/latex;\
    701               $(MAKE) pdf;\
    702               cd -;\
    703             fi;\
    704           fi;\
    705         fi
    706 
    707 clean-doxygen-docs:
    708         if test -d "doxydoc"; then \
    709           cd doxydoc ;\
    710           rm -rf html latex *.log *.tag;\
    711         fi
    712 
    713 install-doxygen-docs: doxygen-docs
    714         if test "$(COIN_HAS_DOXYGEN)" = TRUE; then \
    715           if test -d "doxydoc"; then \
    716             test -d "$(DESTDIR)$(doxydocdir)" || \
    717                  $(mkdir_p) "$(DESTDIR)$(doxydocdir)"; \
    718             $(INSTALL_DATA) doxydoc/@coin_doxy_tagname@ \
    719                 "$(DESTDIR)$(doxydocdir)"; \
    720             if test -f "doxydoc/latex/refman.pdf"; then \
    721               $(INSTALL_DATA) doxydoc/latex/refman.pdf \
    722                   "$(DESTDIR)$(doxydocdir)";\
    723             fi;\
    724             if test -d "doxydoc/html"; then \
    725               test -d "$(DESTDIR)$(doxyhtmldir)/search/" || \
    726                    $(mkdir_p) "$(DESTDIR)$(doxyhtmldir)/search/"; \
    727               $(INSTALL_DATA) doxydoc/html/*.* \
    728                   "$(DESTDIR)$(doxyhtmldir)";\
    729               $(INSTALL_DATA) doxydoc/html/search/*.* \
    730                   "$(DESTDIR)$(doxyhtmldir)/search";\
    731             fi;\
    732           fi;\
    733         fi
    734 
    735 # It's not clear that uninstall-doc should also remove doxygen doc'n. Write
    736 # the rules so that the last one will remove pkgdocdir (which should be empty
    737 # by then).
    738 
    739 uninstall-doxygen-docs:
    740         if test -d "$(DESTDIR)$(doxydocdir)"; then \
    741           rm -rf "$(DESTDIR)$(doxydocdir)"; \
    742         fi
    743         rmdir $(DESTDIR)$(pkgdocdir) || true
    744 
    745 install-doc:
    746         $(mkdir_p) "$(DESTDIR)$(pkgdocdir)"
    747         for file in $(DocFiles); do \
    748           if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \
    749           if test -f "$$dir$$file"; then \
    750             $(INSTALL_DATA) "$$dir$$file" "$(DESTDIR)$(pkgdocdir)/$$file"; \
    751           fi; \
    752         done
    753 
    754 uninstall-doc:
    755         for file in $(DocFiles); do \
    756           rm -f "$(DESTDIR)$(pkgdocdir)/$$file"; \
    757         done
    758         rmdir $(DESTDIR)$(pkgdocdir) || true
    759 
    760 ########################################################################
    761 #                         Maintainer Stuff                             #
    762 ########################################################################
    763 
    764 # Make sure acinclude is using most recent coin.m4
    765 @MAINTAINER_MODE_TRUE@$(srcdir)/acinclude.m4: $(BUILDTOOLSDIR)/coin.m4
    766 @MAINTAINER_MODE_TRUE@  cat $(LIBTOOLM4) $< > $@
    767 
    768 # Make sure the autotools scripts are up to date
    769 @MAINTAINER_MODE_TRUE@$(AUX_DIR)/install-sh: $(BUILDTOOLSDIR)/install-sh
    770 @MAINTAINER_MODE_TRUE@  cp $< $@
    771 
    772 @MAINTAINER_MODE_TRUE@$(AUX_DIR)/missing: $(BUILDTOOLSDIR)/missing
    773 @MAINTAINER_MODE_TRUE@  cp $< $@
    774 
    775 @MAINTAINER_MODE_TRUE@$(AUX_DIR)/config.guess: $(BUILDTOOLSDIR)/config.guess
    776 @MAINTAINER_MODE_TRUE@  cp $< $@
    777 
    778 @MAINTAINER_MODE_TRUE@$(AUX_DIR)/config.sub: $(BUILDTOOLSDIR)/config.sub
    779 @MAINTAINER_MODE_TRUE@  cp $< $@
    780 
    781 @MAINTAINER_MODE_TRUE@$(AUX_DIR)/depcomp: $(BUILDTOOLSDIR)/depcomp
    782 @MAINTAINER_MODE_TRUE@  cp $< $@
    783 
    784 @MAINTAINER_MODE_TRUE@$(AUX_DIR)/ltmain.sh: $(BUILDTOOLSDIR)/ltmain.sh
    785 @MAINTAINER_MODE_TRUE@  cp $< $@
    786 
    787 .PHONY: install-doc uninstall-doc \
    788         doxygen-docs pdf-doxygen-docs clean-doxygen-docs \
    789         install-doxygen-docs uninstall-doxygen-docs
    790 
    791649# Tell versions [3.59,3.63) of GNU make to not export all variables.
    792650# Otherwise a system limit (for SysV at least) may be exceeded.
  • ThirdParty/Glpk/branches/autotools-update/configure

    r4050 r4052  
    1483714837$as_echo "$as_me: Configuration of $PACKAGE_NAME successful" >&6;}
    1483814838
    14839 
  • ThirdParty/Glpk/branches/autotools-update/configure.ac

    r4050 r4052  
    6161
    6262AC_COIN_FINALIZE
    63 
Note: See TracChangeset for help on using the changeset viewer.