Ignore:
Timestamp:
Sep 13, 2009 2:24:20 PM (11 years ago)
Author:
stefan
Message:

revert my recent changes related to BSPsplit after copying them into branches

File:
1 edited

Legend:

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

    r1388 r1411  
    1515@SET_MAKE@
    1616
    17 # Copyright (C) 2007-2009 International Business Machines and others.
     17# Copyright (C) 2007, 2008 International Business Machines and others.
    1818# All Rights Reserved.
    1919# This file is distributed under the Common Public License.
     
    2828#                    Documentation installation                        #
    2929########################################################################
    30 
    31 
    3230
    3331srcdir = @srcdir@
     
    5351build_triplet = @build@
    5452host_triplet = @host@
    55 DIST_COMMON = README $(am__configure_deps) \
     53DIST_COMMON = $(am__configure_deps) \
    5654        $(srcdir)/../../BuildTools/Makemain.inc $(srcdir)/Makefile.am \
    57         $(srcdir)/Makefile.in $(srcdir)/mumps_addlibs.txt.in \
    58         $(thirdpartyinclude_HEADERS) $(top_srcdir)/configure \
    59         config.guess config.sub depcomp install-sh ltmain.sh missing
     55        $(srcdir)/Makefile.in $(top_srcdir)/configure config.guess \
     56        config.sub depcomp install-sh ltmain.sh missing
    6057@HAVE_EXTERNALS_TRUE@am__append_1 = Externals
    6158@HAVE_EXTERNALS_TRUE@am__append_2 = .Externals-stamp
     
    6966 configure.lineno configure.status.lineno
    7067mkinstalldirs = $(install_sh) -d
    71 CONFIG_CLEAN_FILES = mumps_addlibs.txt
    72 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
    73 am__vpath_adj = case $$p in \
    74     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
    75     *) f=$$p;; \
    76   esac;
    77 am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
    78 am__installdirs = "$(DESTDIR)$(thirdpartylibdir)" \
    79         "$(DESTDIR)$(addlibsdir)" "$(DESTDIR)$(thirdpartyincludedir)"
    80 thirdpartylibLTLIBRARIES_INSTALL = $(INSTALL)
    81 LTLIBRARIES = $(thirdpartylib_LTLIBRARIES)
     68CONFIG_CLEAN_FILES =
     69LTLIBRARIES = $(noinst_LTLIBRARIES)
    8270libcoinmumps_la_LIBADD =
    8371nodist_libcoinmumps_la_OBJECTS = dmumps_comm_buffer.lo \
     
    9179        mpic.lo elapse.lo
    9280libcoinmumps_la_OBJECTS = $(nodist_libcoinmumps_la_OBJECTS)
     81@SKIPMAKE_FALSE@am_libcoinmumps_la_rpath =
    9382depcomp = $(SHELL) $(top_srcdir)/depcomp
    9483am__depfiles_maybe = depfiles
     
    114103SOURCES = $(nodist_libcoinmumps_la_SOURCES)
    115104DIST_SOURCES =
    116 addlibsDATA_INSTALL = $(INSTALL_DATA)
    117 DATA = $(addlibs_DATA)
    118 thirdpartyincludeHEADERS_INSTALL = $(INSTALL_HEADER)
    119 HEADERS = $(thirdpartyinclude_HEADERS)
    120105ETAGS = etags
    121106CTAGS = ctags
     
    153138COIN_BUILD_BLAS_FALSE = @COIN_BUILD_BLAS_FALSE@
    154139COIN_BUILD_BLAS_TRUE = @COIN_BUILD_BLAS_TRUE@
     140COIN_BUILD_MUMPS_FALSE = @COIN_BUILD_MUMPS_FALSE@
     141COIN_BUILD_MUMPS_TRUE = @COIN_BUILD_MUMPS_TRUE@
    155142COIN_HAS_BLAS_FALSE = @COIN_HAS_BLAS_FALSE@
    156143COIN_HAS_BLAS_TRUE = @COIN_HAS_BLAS_TRUE@
    157144COIN_HAS_METIS_FALSE = @COIN_HAS_METIS_FALSE@
    158145COIN_HAS_METIS_TRUE = @COIN_HAS_METIS_TRUE@
     146COIN_HAS_MUMPS_FALSE = @COIN_HAS_MUMPS_FALSE@
     147COIN_HAS_MUMPS_TRUE = @COIN_HAS_MUMPS_TRUE@
    159148CPP = @CPP@
    160149CPPFLAGS = @CPPFLAGS@
     
    199188MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
    200189MAKEINFO = @MAKEINFO@
     190MAKEOKFILE = @MAKEOKFILE@
    201191MPICC = @MPICC@
    202192MPIF77 = @MPIF77@
    203193MUMPSDIR = @MUMPSDIR@
     194MUMPSINCDIR = @MUMPSINCDIR@
     195MUMPSLIB = @MUMPSLIB@
     196MUMPS_INCFLAGS = @MUMPS_INCFLAGS@
    204197MY_DEFS = @MY_DEFS@
    205198MY_FDEFS = @MY_FDEFS@
     
    218211SET_MAKE = @SET_MAKE@
    219212SHELL = @SHELL@
     213SKIPMAKE_FALSE = @SKIPMAKE_FALSE@
     214SKIPMAKE_TRUE = @SKIPMAKE_TRUE@
    220215STRIP = @STRIP@
    221216VERSION = @VERSION@
     
    276271AUTOMAKE_OPTIONS = foreign
    277272EXTRA_DIST = get.mumps INSTALL.MUMPS $(am__append_1)
    278 thirdpartylibdir = $(prefix)/lib/ThirdParty
    279 thirdpartylib_LTLIBRARIES = libcoinmumps.la
     273@SKIPMAKE_FALSE@noinst_LTLIBRARIES = libcoinmumps.la
     274@SKIPMAKE_TRUE@noinst_LTLIBRARIES =
    280275nodist_libcoinmumps_la_SOURCES = \
    281276        $(MUMPSDIR)/src/dmumps_comm_buffer.F \
     
    317312MODEXT = mod
    318313CLEANFILES = *.$(MODEXT)
    319 thirdpartyincludedir = $(includedir)/coin/ThirdParty
    320 thirdpartyinclude_HEADERS = \
    321   $(MUMPSDIR)/include/dmumps_c.h \
    322   $(MUMPSDIR)/include/mumps_compat.h \
    323   $(MUMPSDIR)/include/mumps_c_types.h
    324 
    325 addlibsdir = $(prefix)/share/doc/coin/ThirdParty/Mumps
    326 addlibs_DATA = README mumps_addlibs.txt
    327314
    328315########################################################################
     
    371358$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
    372359        cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
    373 mumps_addlibs.txt: $(top_builddir)/config.status $(srcdir)/mumps_addlibs.txt.in
    374         cd $(top_builddir) && $(SHELL) ./config.status $@
    375 install-thirdpartylibLTLIBRARIES: $(thirdpartylib_LTLIBRARIES)
    376         @$(NORMAL_INSTALL)
    377         test -z "$(thirdpartylibdir)" || $(mkdir_p) "$(DESTDIR)$(thirdpartylibdir)"
    378         @list='$(thirdpartylib_LTLIBRARIES)'; for p in $$list; do \
    379           if test -f $$p; then \
    380             f=$(am__strip_dir) \
    381             echo " $(LIBTOOL) --mode=install $(thirdpartylibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(thirdpartylibdir)/$$f'"; \
    382             $(LIBTOOL) --mode=install $(thirdpartylibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(thirdpartylibdir)/$$f"; \
    383           else :; fi; \
    384         done
    385 
    386 uninstall-thirdpartylibLTLIBRARIES:
    387         @$(NORMAL_UNINSTALL)
    388         @set -x; list='$(thirdpartylib_LTLIBRARIES)'; for p in $$list; do \
    389           p=$(am__strip_dir) \
    390           echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(thirdpartylibdir)/$$p'"; \
    391           $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(thirdpartylibdir)/$$p"; \
    392         done
    393 
    394 clean-thirdpartylibLTLIBRARIES:
    395         -test -z "$(thirdpartylib_LTLIBRARIES)" || rm -f $(thirdpartylib_LTLIBRARIES)
    396         @list='$(thirdpartylib_LTLIBRARIES)'; for p in $$list; do \
     360
     361clean-noinstLTLIBRARIES:
     362        -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
     363        @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
    397364          dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
    398365          test "$$dir" != "$$p" || dir=.; \
     
    401368        done
    402369libcoinmumps.la: $(libcoinmumps_la_OBJECTS) $(libcoinmumps_la_DEPENDENCIES)
    403         $(F77LINK) -rpath $(thirdpartylibdir) $(libcoinmumps_la_LDFLAGS) $(libcoinmumps_la_OBJECTS) $(libcoinmumps_la_LIBADD) $(LIBS)
     370        $(F77LINK) $(am_libcoinmumps_la_rpath) $(libcoinmumps_la_LDFLAGS) $(libcoinmumps_la_OBJECTS) $(libcoinmumps_la_LIBADD) $(LIBS)
    404371
    405372mostlyclean-compile:
     
    583550        -rm -f libtool
    584551uninstall-info-am:
    585 install-addlibsDATA: $(addlibs_DATA)
    586         @$(NORMAL_INSTALL)
    587         test -z "$(addlibsdir)" || $(mkdir_p) "$(DESTDIR)$(addlibsdir)"
    588         @list='$(addlibs_DATA)'; for p in $$list; do \
    589           if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
    590           f=$(am__strip_dir) \
    591           echo " $(addlibsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(addlibsdir)/$$f'"; \
    592           $(addlibsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(addlibsdir)/$$f"; \
    593         done
    594 
    595 uninstall-addlibsDATA:
    596         @$(NORMAL_UNINSTALL)
    597         @list='$(addlibs_DATA)'; for p in $$list; do \
    598           f=$(am__strip_dir) \
    599           echo " rm -f '$(DESTDIR)$(addlibsdir)/$$f'"; \
    600           rm -f "$(DESTDIR)$(addlibsdir)/$$f"; \
    601         done
    602 install-thirdpartyincludeHEADERS: $(thirdpartyinclude_HEADERS)
    603         @$(NORMAL_INSTALL)
    604         test -z "$(thirdpartyincludedir)" || $(mkdir_p) "$(DESTDIR)$(thirdpartyincludedir)"
    605         @list='$(thirdpartyinclude_HEADERS)'; for p in $$list; do \
    606           if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
    607           f=$(am__strip_dir) \
    608           echo " $(thirdpartyincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(thirdpartyincludedir)/$$f'"; \
    609           $(thirdpartyincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(thirdpartyincludedir)/$$f"; \
    610         done
    611 
    612 uninstall-thirdpartyincludeHEADERS:
    613         @$(NORMAL_UNINSTALL)
    614         @list='$(thirdpartyinclude_HEADERS)'; for p in $$list; do \
    615           f=$(am__strip_dir) \
    616           echo " rm -f '$(DESTDIR)$(thirdpartyincludedir)/$$f'"; \
    617           rm -f "$(DESTDIR)$(thirdpartyincludedir)/$$f"; \
    618         done
    619552
    620553ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
     
    669602        $(am__remove_distdir)
    670603        mkdir $(distdir)
    671         $(mkdir_p) $(distdir)/$(MUMPSDIR)/include $(distdir)/. $(distdir)/../../BuildTools
     604        $(mkdir_p) $(distdir)/../../BuildTools
    672605        @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
    673606        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
     
    795728check-am: all-am
    796729check: check-am
    797 all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS)
     730all-am: Makefile $(LTLIBRARIES)
    798731installdirs:
    799         for dir in "$(DESTDIR)$(thirdpartylibdir)" "$(DESTDIR)$(addlibsdir)" "$(DESTDIR)$(thirdpartyincludedir)"; do \
    800           test -z "$$dir" || $(mkdir_p) "$$dir"; \
    801         done
    802732install: install-am
    803733install-exec: install-exec-am
     
    828758clean: clean-am
    829759
    830 clean-am: clean-generic clean-libtool clean-thirdpartylibLTLIBRARIES \
     760clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
    831761        mostlyclean-am
    832762
     
    848778info-am:
    849779
    850 install-data-am: install-addlibsDATA install-thirdpartyincludeHEADERS \
    851         install-thirdpartylibLTLIBRARIES
     780install-data-am:
    852781
    853782install-exec-am:
     
    879808ps-am:
    880809
    881 uninstall-am: uninstall-addlibsDATA uninstall-info-am \
    882         uninstall-thirdpartyincludeHEADERS \
    883         uninstall-thirdpartylibLTLIBRARIES
     810uninstall-am: uninstall-info-am
    884811
    885812.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
    886         clean-generic clean-libtool clean-thirdpartylibLTLIBRARIES \
    887         ctags dist dist-all dist-bzip2 dist-gzip dist-shar dist-tarZ \
    888         dist-zip distcheck distclean distclean-compile \
    889         distclean-generic distclean-libtool distclean-tags \
    890         distcleancheck distdir distuninstallcheck dvi dvi-am html \
    891         html-am info info-am install install-addlibsDATA install-am \
    892         install-data install-data-am install-exec install-exec-am \
    893         install-info install-info-am install-man install-strip \
    894         install-thirdpartyincludeHEADERS \
    895         install-thirdpartylibLTLIBRARIES installcheck installcheck-am \
    896         installdirs maintainer-clean maintainer-clean-generic \
    897         mostlyclean mostlyclean-compile mostlyclean-generic \
    898         mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
    899         uninstall-addlibsDATA uninstall-am uninstall-info-am \
    900         uninstall-thirdpartyincludeHEADERS \
    901         uninstall-thirdpartylibLTLIBRARIES
     813        clean-generic clean-libtool clean-noinstLTLIBRARIES ctags dist \
     814        dist-all dist-bzip2 dist-gzip dist-shar dist-tarZ dist-zip \
     815        distcheck distclean distclean-compile distclean-generic \
     816        distclean-libtool distclean-tags distcleancheck distdir \
     817        distuninstallcheck dvi dvi-am html html-am info info-am \
     818        install install-am install-data install-data-am install-exec \
     819        install-exec-am install-info install-info-am install-man \
     820        install-strip installcheck installcheck-am installdirs \
     821        maintainer-clean maintainer-clean-generic mostlyclean \
     822        mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
     823        pdf pdf-am ps ps-am tags uninstall uninstall-am \
     824        uninstall-info-am
    902825
    903826
Note: See TracChangeset for help on using the changeset viewer.