Changeset 1411 for ThirdParty/Mumps/trunk/Makefile.in

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:

• ThirdParty/Mumps/trunk/Makefile.in (modified) (19 diffs)

ThirdParty/Mumps/trunk/Makefile.in

@@ -15 +15 @@
 @SET_MAKE@
 
-# Copyright (C) 2007-2009 International Business Machines and others.
+# Copyright (C) 2007, 2008 International Business Machines and others.
 # All Rights Reserved.
 # This file is distributed under the Common Public License.
@@ -28 +28 @@
 #                    Documentation installation                        #
 ########################################################################
-
-
 
 srcdir = @srcdir@
@@ -53 +51 @@
 build_triplet = @build@
 host_triplet = @host@
-DIST_COMMON = README $(am__configure_deps) \
+DIST_COMMON = $(am__configure_deps) \
         $(srcdir)/../../BuildTools/Makemain.inc $(srcdir)/Makefile.am \
-        $(srcdir)/Makefile.in $(srcdir)/mumps_addlibs.txt.in \
-        $(thirdpartyinclude_HEADERS) $(top_srcdir)/configure \
-        config.guess config.sub depcomp install-sh ltmain.sh missing
+        $(srcdir)/Makefile.in $(top_srcdir)/configure config.guess \
+        config.sub depcomp install-sh ltmain.sh missing
 @HAVE_EXTERNALS_TRUE@am__append_1 = Externals
 @HAVE_EXTERNALS_TRUE@am__append_2 = .Externals-stamp
@@ -69 +66 @@
  configure.lineno configure.status.lineno
 mkinstalldirs = $(install_sh) -d
-CONFIG_CLEAN_FILES = mumps_addlibs.txt
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(thirdpartylibdir)" \
-        "$(DESTDIR)$(addlibsdir)" "$(DESTDIR)$(thirdpartyincludedir)"
-thirdpartylibLTLIBRARIES_INSTALL = $(INSTALL)
-LTLIBRARIES = $(thirdpartylib_LTLIBRARIES)
+CONFIG_CLEAN_FILES =
+LTLIBRARIES = $(noinst_LTLIBRARIES)
 libcoinmumps_la_LIBADD =
 nodist_libcoinmumps_la_OBJECTS = dmumps_comm_buffer.lo \
@@ -91 +79 @@
         mpic.lo elapse.lo
 libcoinmumps_la_OBJECTS = $(nodist_libcoinmumps_la_OBJECTS)
+@SKIPMAKE_FALSE@am_libcoinmumps_la_rpath =
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -114 +103 @@
 SOURCES = $(nodist_libcoinmumps_la_SOURCES)
 DIST_SOURCES =
-addlibsDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(addlibs_DATA)
-thirdpartyincludeHEADERS_INSTALL = $(INSTALL_HEADER)
-HEADERS = $(thirdpartyinclude_HEADERS)
 ETAGS = etags
 CTAGS = ctags
@@ -153 +138 @@
 COIN_BUILD_BLAS_FALSE = @COIN_BUILD_BLAS_FALSE@
 COIN_BUILD_BLAS_TRUE = @COIN_BUILD_BLAS_TRUE@
+COIN_BUILD_MUMPS_FALSE = @COIN_BUILD_MUMPS_FALSE@
+COIN_BUILD_MUMPS_TRUE = @COIN_BUILD_MUMPS_TRUE@
 COIN_HAS_BLAS_FALSE = @COIN_HAS_BLAS_FALSE@
 COIN_HAS_BLAS_TRUE = @COIN_HAS_BLAS_TRUE@
 COIN_HAS_METIS_FALSE = @COIN_HAS_METIS_FALSE@
 COIN_HAS_METIS_TRUE = @COIN_HAS_METIS_TRUE@
+COIN_HAS_MUMPS_FALSE = @COIN_HAS_MUMPS_FALSE@
+COIN_HAS_MUMPS_TRUE = @COIN_HAS_MUMPS_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
@@ -199 +188 @@
 MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MAKEOKFILE = @MAKEOKFILE@
 MPICC = @MPICC@
 MPIF77 = @MPIF77@
 MUMPSDIR = @MUMPSDIR@
+MUMPSINCDIR = @MUMPSINCDIR@
+MUMPSLIB = @MUMPSLIB@
+MUMPS_INCFLAGS = @MUMPS_INCFLAGS@
 MY_DEFS = @MY_DEFS@
 MY_FDEFS = @MY_FDEFS@
@@ -218 +211 @@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SKIPMAKE_FALSE = @SKIPMAKE_FALSE@
+SKIPMAKE_TRUE = @SKIPMAKE_TRUE@
 STRIP = @STRIP@
 VERSION = @VERSION@
@@ -276 +271 @@
 AUTOMAKE_OPTIONS = foreign
 EXTRA_DIST = get.mumps INSTALL.MUMPS $(am__append_1)
-thirdpartylibdir = $(prefix)/lib/ThirdParty
-thirdpartylib_LTLIBRARIES = libcoinmumps.la
+@SKIPMAKE_FALSE@noinst_LTLIBRARIES = libcoinmumps.la
+@SKIPMAKE_TRUE@noinst_LTLIBRARIES = 
 nodist_libcoinmumps_la_SOURCES = \
         $(MUMPSDIR)/src/dmumps_comm_buffer.F \
@@ -317 +312 @@
 MODEXT = mod
 CLEANFILES = *.$(MODEXT)
-thirdpartyincludedir = $(includedir)/coin/ThirdParty
-thirdpartyinclude_HEADERS = \
-  $(MUMPSDIR)/include/dmumps_c.h \
-  $(MUMPSDIR)/include/mumps_compat.h \
-  $(MUMPSDIR)/include/mumps_c_types.h
-
-addlibsdir = $(prefix)/share/doc/coin/ThirdParty/Mumps
-addlibs_DATA = README mumps_addlibs.txt
 
 ########################################################################
@@ -371 +358 @@
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
         cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-mumps_addlibs.txt: $(top_builddir)/config.status $(srcdir)/mumps_addlibs.txt.in
-        cd $(top_builddir) && $(SHELL) ./config.status $@
-install-thirdpartylibLTLIBRARIES: $(thirdpartylib_LTLIBRARIES)
-        @$(NORMAL_INSTALL)
-        test -z "$(thirdpartylibdir)" || $(mkdir_p) "$(DESTDIR)$(thirdpartylibdir)"
-        @list='$(thirdpartylib_LTLIBRARIES)'; for p in $$list; do \
-          if test -f $$p; then \
-            f=$(am__strip_dir) \
-            echo " $(LIBTOOL) --mode=install $(thirdpartylibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(thirdpartylibdir)/$$f'"; \
-            $(LIBTOOL) --mode=install $(thirdpartylibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(thirdpartylibdir)/$$f"; \
-          else :; fi; \
-        done
-
-uninstall-thirdpartylibLTLIBRARIES:
-        @$(NORMAL_UNINSTALL)
-        @set -x; list='$(thirdpartylib_LTLIBRARIES)'; for p in $$list; do \
-          p=$(am__strip_dir) \
-          echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(thirdpartylibdir)/$$p'"; \
-          $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(thirdpartylibdir)/$$p"; \
-        done
-
-clean-thirdpartylibLTLIBRARIES:
-        -test -z "$(thirdpartylib_LTLIBRARIES)" || rm -f $(thirdpartylib_LTLIBRARIES)
-        @list='$(thirdpartylib_LTLIBRARIES)'; for p in $$list; do \
+
+clean-noinstLTLIBRARIES:
+        -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+        @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
           dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
           test "$$dir" != "$$p" || dir=.; \
@@ -401 +368 @@
         done
 libcoinmumps.la: $(libcoinmumps_la_OBJECTS) $(libcoinmumps_la_DEPENDENCIES) 
-        $(F77LINK) -rpath $(thirdpartylibdir) $(libcoinmumps_la_LDFLAGS) $(libcoinmumps_la_OBJECTS) $(libcoinmumps_la_LIBADD) $(LIBS)
+        $(F77LINK) $(am_libcoinmumps_la_rpath) $(libcoinmumps_la_LDFLAGS) $(libcoinmumps_la_OBJECTS) $(libcoinmumps_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
@@ -583 +550 @@
         -rm -f libtool
 uninstall-info-am:
-install-addlibsDATA: $(addlibs_DATA)
-        @$(NORMAL_INSTALL)
-        test -z "$(addlibsdir)" || $(mkdir_p) "$(DESTDIR)$(addlibsdir)"
-        @list='$(addlibs_DATA)'; for p in $$list; do \
-          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-          f=$(am__strip_dir) \
-          echo " $(addlibsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(addlibsdir)/$$f'"; \
-          $(addlibsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(addlibsdir)/$$f"; \
-        done
-
-uninstall-addlibsDATA:
-        @$(NORMAL_UNINSTALL)
-        @list='$(addlibs_DATA)'; for p in $$list; do \
-          f=$(am__strip_dir) \
-          echo " rm -f '$(DESTDIR)$(addlibsdir)/$$f'"; \
-          rm -f "$(DESTDIR)$(addlibsdir)/$$f"; \
-        done
-install-thirdpartyincludeHEADERS: $(thirdpartyinclude_HEADERS)
-        @$(NORMAL_INSTALL)
-        test -z "$(thirdpartyincludedir)" || $(mkdir_p) "$(DESTDIR)$(thirdpartyincludedir)"
-        @list='$(thirdpartyinclude_HEADERS)'; for p in $$list; do \
-          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-          f=$(am__strip_dir) \
-          echo " $(thirdpartyincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(thirdpartyincludedir)/$$f'"; \
-          $(thirdpartyincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(thirdpartyincludedir)/$$f"; \
-        done
-
-uninstall-thirdpartyincludeHEADERS:
-        @$(NORMAL_UNINSTALL)
-        @list='$(thirdpartyinclude_HEADERS)'; for p in $$list; do \
-          f=$(am__strip_dir) \
-          echo " rm -f '$(DESTDIR)$(thirdpartyincludedir)/$$f'"; \
-          rm -f "$(DESTDIR)$(thirdpartyincludedir)/$$f"; \
-        done
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -669 +602 @@
         $(am__remove_distdir)
         mkdir $(distdir)
-        $(mkdir_p) $(distdir)/$(MUMPSDIR)/include $(distdir)/. $(distdir)/../../BuildTools
+        $(mkdir_p) $(distdir)/../../BuildTools
         @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
         topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
@@ -795 +728 @@
 check-am: all-am
 check: check-am
-all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS)
+all-am: Makefile $(LTLIBRARIES)
 installdirs:
-        for dir in "$(DESTDIR)$(thirdpartylibdir)" "$(DESTDIR)$(addlibsdir)" "$(DESTDIR)$(thirdpartyincludedir)"; do \
-          test -z "$$dir" || $(mkdir_p) "$$dir"; \
-        done
 install: install-am
 install-exec: install-exec-am
@@ -828 +758 @@
 clean: clean-am
 
-clean-am: clean-generic clean-libtool clean-thirdpartylibLTLIBRARIES \
+clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
         mostlyclean-am
 
@@ -848 +778 @@
 info-am:
 
-install-data-am: install-addlibsDATA install-thirdpartyincludeHEADERS \
-        install-thirdpartylibLTLIBRARIES
+install-data-am:
 
 install-exec-am:
@@ -879 +808 @@
 ps-am:
 
-uninstall-am: uninstall-addlibsDATA uninstall-info-am \
-        uninstall-thirdpartyincludeHEADERS \
-        uninstall-thirdpartylibLTLIBRARIES
+uninstall-am: uninstall-info-am
 
 .PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
-        clean-generic clean-libtool clean-thirdpartylibLTLIBRARIES \
-        ctags dist dist-all dist-bzip2 dist-gzip dist-shar dist-tarZ \
-        dist-zip distcheck distclean distclean-compile \
-        distclean-generic distclean-libtool distclean-tags \
-        distcleancheck distdir distuninstallcheck dvi dvi-am html \
-        html-am info info-am install install-addlibsDATA install-am \
-        install-data install-data-am install-exec install-exec-am \
-        install-info install-info-am install-man install-strip \
-        install-thirdpartyincludeHEADERS \
-        install-thirdpartylibLTLIBRARIES installcheck installcheck-am \
-        installdirs maintainer-clean maintainer-clean-generic \
-        mostlyclean mostlyclean-compile mostlyclean-generic \
-        mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
-        uninstall-addlibsDATA uninstall-am uninstall-info-am \
-        uninstall-thirdpartyincludeHEADERS \
-        uninstall-thirdpartylibLTLIBRARIES
+        clean-generic clean-libtool clean-noinstLTLIBRARIES ctags dist \
+        dist-all dist-bzip2 dist-gzip dist-shar dist-tarZ dist-zip \
+        distcheck distclean distclean-compile distclean-generic \
+        distclean-libtool distclean-tags distcleancheck distdir \
+        distuninstallcheck dvi dvi-am html html-am info info-am \
+        install install-am install-data install-data-am install-exec \
+        install-exec-am install-info install-info-am install-man \
+        install-strip installcheck installcheck-am installdirs \
+        maintainer-clean maintainer-clean-generic mostlyclean \
+        mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+        pdf pdf-am ps ps-am tags uninstall uninstall-am \
+        uninstall-info-am