Ignore:
Timestamp:
Jun 19, 2011 10:38:54 AM (9 years ago)
Author:
stefan
Message:

sync with trunk rev2312

Location:
ThirdParty/Mumps/stable/1.4
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/Mumps/stable/1.4

  • ThirdParty/Mumps/stable/1.4/Makefile.in

    r2066 r2315  
    5959        $(top_srcdir)/configure config.guess config.sub depcomp \
    6060        install-sh ltmain.sh missing
    61 @HAVE_EXTERNALS_TRUE@am__append_1 = Externals
    62 @HAVE_EXTERNALS_TRUE@am__append_2 = .Externals-stamp
     61@HAVE_EXTERNALS_TRUE@am__append_1 = Dependencies
     62@HAVE_EXTERNALS_TRUE@am__append_2 = .Dependencies-stamp
    6363subdir = .
    6464ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
     
    8787        dmumps_ooc.lo dmumps_part1.lo dmumps_part2.lo dmumps_part3.lo \
    8888        dmumps_part4.lo dmumps_part5.lo dmumps_part6.lo \
    89         dmumps_part7.lo dmumps_part8.lo mumps_part9.lo mumps_c.lo \
    90         mumps_common.lo mumps_orderings.lo mumps_io.lo \
     89        dmumps_part7.lo dmumps_part8.lo mumps_part9.lo mumps_sol_es.lo \
     90        mumps_c.lo mumps_common.lo mumps_orderings.lo mumps_io.lo \
    9191        mumps_io_basic.lo mumps_io_thread.lo mumps_io_err.lo \
    9292        mumps_size.lo mpi.lo mpic.lo elapse.lo
     
    326326        $(MUMPSDIR)/src/dmumps_part8.F \
    327327        $(MUMPSDIR)/src/mumps_part9.F \
     328        $(MUMPSDIR)/src/mumps_sol_es.F \
    328329        $(MUMPSDIR)/src/mumps_c.c \
    329330        $(MUMPSDIR)/src/mumps_common.c\
     
    358359pkgconfiglibdir = $(libdir)/pkgconfig
    359360pkgconfiglib_DATA = coinmumps.pc
    360 @COIN_HAS_PKGCONFIG_TRUE@addlibsdir = $(DESTDIR)$(datadir)/coin/doc/ThirdParty/Mumps
    361361
    362362########################################################################
     
    515515mumps_part9.lo: $(MUMPSDIR)/src/mumps_part9.F
    516516        $(LIBTOOL) --tag=F77 --mode=compile $(F77) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_FFLAGS) $(FFLAGS) -c -o mumps_part9.lo `test -f '$(MUMPSDIR)/src/mumps_part9.F' || echo '$(srcdir)/'`$(MUMPSDIR)/src/mumps_part9.F
     517
     518mumps_sol_es.lo: $(MUMPSDIR)/src/mumps_sol_es.F
     519        $(LIBTOOL) --tag=F77 --mode=compile $(F77) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_FFLAGS) $(FFLAGS) -c -o mumps_sol_es.lo `test -f '$(MUMPSDIR)/src/mumps_sol_es.F' || echo '$(srcdir)/'`$(MUMPSDIR)/src/mumps_sol_es.F
    517520.F.f:
    518521        $(F77COMPILE) -F $<
     
    873876        @echo "This command is intended for maintainers to use"
    874877        @echo "it deletes files that may require special tools to rebuild."
    875 @COIN_HAS_PKGCONFIG_FALSE@install-data-hook:
    876 @COIN_HAS_PKGCONFIG_FALSE@uninstall-hook:
    877878clean: clean-am
    878879
     
    899900install-data-am: install-pkgconfiglibDATA \
    900901        install-thirdpartyincludeHEADERS
    901         @$(NORMAL_INSTALL)
    902         $(MAKE) $(AM_MAKEFLAGS) install-data-hook
    903902
    904903install-exec-am: install-libLTLIBRARIES
     
    932931uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \
    933932        uninstall-pkgconfiglibDATA uninstall-thirdpartyincludeHEADERS
    934         @$(NORMAL_INSTALL)
    935         $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
    936933
    937934.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
     
    941938        distclean-libtool distclean-tags distcleancheck distdir \
    942939        distuninstallcheck dvi dvi-am html html-am info info-am \
    943         install install-am install-data install-data-am \
    944         install-data-hook install-exec install-exec-am install-info \
    945         install-info-am install-libLTLIBRARIES install-man \
    946         install-pkgconfiglibDATA install-strip \
    947         install-thirdpartyincludeHEADERS installcheck installcheck-am \
    948         installdirs maintainer-clean maintainer-clean-generic \
    949         mostlyclean mostlyclean-compile mostlyclean-generic \
    950         mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
    951         uninstall-am uninstall-hook uninstall-info-am \
     940        install install-am install-data install-data-am install-exec \
     941        install-exec-am install-info install-info-am \
     942        install-libLTLIBRARIES install-man install-pkgconfiglibDATA \
     943        install-strip install-thirdpartyincludeHEADERS installcheck \
     944        installcheck-am installdirs maintainer-clean \
     945        maintainer-clean-generic mostlyclean mostlyclean-compile \
     946        mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
     947        tags uninstall uninstall-am uninstall-info-am \
    952948        uninstall-libLTLIBRARIES uninstall-pkgconfiglibDATA \
    953949        uninstall-thirdpartyincludeHEADERS
     
    978974dmumps_part5.lo dmumps_ooc.lo: mumps_static_mapping.lo
    979975
    980 dmumps_part2.lo dmumps_part5.lo dmumps_part8.lo: tools_common_mod.lo
    981 
    982 @COIN_HAS_PKGCONFIG_TRUE@install-data-hook:
    983 @COIN_HAS_PKGCONFIG_TRUE@       @$(mkdir_p) "$(addlibsdir)"
    984 @COIN_HAS_PKGCONFIG_TRUE@       PKG_CONFIG_PATH=@COIN_PKG_CONFIG_PATH@ \
    985 @COIN_HAS_PKGCONFIG_TRUE@       $(PKG_CONFIG) --libs coinmumps > $(addlibsdir)/mumps_addlibs.txt
    986 
    987 @COIN_HAS_PKGCONFIG_TRUE@uninstall-hook:
    988 @COIN_HAS_PKGCONFIG_TRUE@       rm -f $(addlibsdir)/mumps_addlibs.txt
    989 
    990 test: $(libampl)
     976dmumps_part2.lo dmumps_part5.lo dmumps_part8.lo: tools_common_mod.lo mumps_sol_es.lo
     977
     978# actually only dmumps_part8.lo depends on mumps_sol_es.lo, but having only one target
     979# on the left side makes automake think that we provide a rule how to build this target
     980dmumps_part2.lo dmumps_part8.lo: mumps_sol_es.lo
     981
     982test:
    991983        @echo "No test available for Mumps."
    992984
     
    10301022@MAINTAINER_MODE_TRUE@  cp $< $@
    10311023
    1032 # Take care of updating externals (if Externals file exists)
    1033 @HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@$(top_builddir)/Makefile: .Externals-stamp
    1034 
    1035 @HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@.Externals-stamp: $(srcdir)/Externals
    1036 @HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@     cd $(srcdir); svn propset svn:externals -F Externals .
    1037 @HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@     touch .Externals-stamp
    1038 
    1039 @HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@update-externals: .Externals-stamp
     1024# Take care of updating externals (if Dependencies file exists)
     1025@HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@$(top_builddir)/Makefile: .Dependencies-stamp
     1026
     1027@HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@.Dependencies-stamp: $(srcdir)/Dependencies
     1028@HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@     cd $(srcdir); BuildTools/set_externals Dependencies
     1029@HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@     touch .Dependencies-stamp
     1030
     1031@HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@update-externals: .Dependencies-stamp
    10401032@HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@     cd $(srcdir); svn update
    10411033
Note: See TracChangeset for help on using the changeset viewer.