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/Blas/trunk/Makefile.in

    r1396 r1411  
    2828#                    Documentation installation                        #
    2929########################################################################
    30 
    3130
    3231srcdir = @srcdir@
    … …  
    5251build_triplet = @build@
    5352host_triplet = @host@
    54 DIST_COMMON = README $(am__configure_deps) \
     53DIST_COMMON = $(am__configure_deps) \
    5554        $(srcdir)/../../BuildTools/Makemain.inc \
    5655        $(srcdir)/../../config.guess $(srcdir)/../../config.sub \
    5756        $(srcdir)/../../install-sh $(srcdir)/../../ltmain.sh \
    5857        $(srcdir)/../../missing $(srcdir)/Makefile.am \
    59         $(srcdir)/Makefile.in $(srcdir)/blas-uninstalled.pc.in \
    60         $(srcdir)/blas.pc.in $(srcdir)/blas_addlibs.txt.in \
    61         $(top_srcdir)/configure
     58        $(srcdir)/Makefile.in $(top_srcdir)/configure
    6259@HAVE_EXTERNALS_TRUE@am__append_1 = Externals
    6360@HAVE_EXTERNALS_TRUE@am__append_2 = .Externals-stamp
    … …  
    7168 configure.lineno configure.status.lineno
    7269mkinstalldirs = $(install_sh) -d
    73 CONFIG_CLEAN_FILES = blas_addlibs.txt blas.pc blas-uninstalled.pc
    74 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
    75 am__vpath_adj = case $$p in \
    76     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
    77     *) f=$$p;; \
    78   esac;
    79 am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
    80 am__installdirs = "$(DESTDIR)$(thirdpartylibdir)" \
    81         "$(DESTDIR)$(addlibsdir)" "$(DESTDIR)$(pkgconfiglibdir)"
    82 thirdpartylibLTLIBRARIES_INSTALL = $(INSTALL)
    83 LTLIBRARIES = $(thirdpartylib_LTLIBRARIES)
     70CONFIG_CLEAN_FILES =
     71LTLIBRARIES = $(noinst_LTLIBRARIES)
    8472libcoinblas_la_LIBADD =
    85 am_libcoinblas_la_OBJECTS = dasum.lo daxpy.lo dcopy.lo ddot.lo \
     73nodist_libcoinblas_la_OBJECTS = dasum.lo daxpy.lo dcopy.lo ddot.lo \
    8674        dgbmv.lo dgemm.lo dgemv.lo dger.lo dnrm2.lo drot.lo drotg.lo \
    8775        drotm.lo drotmg.lo dsbmv.lo dscal.lo dsdot.lo dspmv.lo \
    … …  
    8977        dsyr.lo dsyrk.lo dtbmv.lo dtbsv.lo dtpmv.lo dtpsv.lo dtrmm.lo \
    9078        dtrmv.lo dtrsm.lo dtrsv.lo idamax.lo lsame.lo xerbla.lo
    91 libcoinblas_la_OBJECTS = $(am_libcoinblas_la_OBJECTS)
     79libcoinblas_la_OBJECTS = $(nodist_libcoinblas_la_OBJECTS)
     80@SKIPMAKE_FALSE@am_libcoinblas_la_rpath =
    9281DEFAULT_INCLUDES = -I. -I$(srcdir)
    9382F77COMPILE = $(F77) $(AM_FFLAGS) $(FFLAGS)
    … …  
    9786F77LINK = $(LIBTOOL) --tag=F77 --mode=link $(F77LD) $(AM_FFLAGS) \
    9887        $(FFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
    99 SOURCES = $(libcoinblas_la_SOURCES)
    100 DIST_SOURCES = $(libcoinblas_la_SOURCES)
    101 addlibsDATA_INSTALL = $(INSTALL_DATA)
    102 pkgconfiglibDATA_INSTALL = $(INSTALL_DATA)
    103 DATA = $(addlibs_DATA) $(pkgconfiglib_DATA)
     88SOURCES = $(nodist_libcoinblas_la_SOURCES)
     89DIST_SOURCES =
    10490ETAGS = etags
    10591CTAGS = ctags
    … …  
    130116AUX_DIR = @AUX_DIR@
    131117AWK = @AWK@
    132 BLASDOCDIR = @BLASDOCDIR@
    133 BLASOBJDIR = @BLASOBJDIR@
    134 BLASSRCDIR = @BLASSRCDIR@
    135118BUILDTOOLSDIR = @BUILDTOOLSDIR@
    136119CC = @CC@
    … …  
    138121CDEFS = @CDEFS@
    139122CFLAGS = @CFLAGS@
     123COIN_BUILD_BLAS_FALSE = @COIN_BUILD_BLAS_FALSE@
     124COIN_BUILD_BLAS_TRUE = @COIN_BUILD_BLAS_TRUE@
    140125COIN_HAS_BLAS_FALSE = @COIN_HAS_BLAS_FALSE@
    141126COIN_HAS_BLAS_TRUE = @COIN_HAS_BLAS_TRUE@
    … …  
    160145FADDLIBS = @FADDLIBS@
    161146FFLAGS = @FFLAGS@
     147FLIBS = @FLIBS@
    162148HAVE_EXTERNALS_FALSE = @HAVE_EXTERNALS_FALSE@
    163149HAVE_EXTERNALS_TRUE = @HAVE_EXTERNALS_TRUE@
    … …  
    179165MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
    180166MAKEINFO = @MAKEINFO@
     167MAKEOKFILE = @MAKEOKFILE@
    181168MPICC = @MPICC@
    182169MPIF77 = @MPIF77@
    … …  
    195182SET_MAKE = @SET_MAKE@
    196183SHELL = @SHELL@
     184SKIPMAKE_FALSE = @SKIPMAKE_FALSE@
     185SKIPMAKE_TRUE = @SKIPMAKE_TRUE@
    197186STRIP = @STRIP@
    198187VERSION = @VERSION@
    … …  
    253242AUTOMAKE_OPTIONS = foreign
    254243EXTRA_DIST = get.blas INSTALL.BLAS $(am__append_1)
    255 thirdpartylibdir = $(prefix)/lib/ThirdParty
    256 thirdpartylib_LTLIBRARIES = libcoinblas.la
    257 pkgconfiglibdir = $(prefix)/lib/ThirdParty/pkgconfig
    258 pkgconfiglib_DATA = blas.pc
    259 libcoinblas_la_SOURCES = \
     244@SKIPMAKE_FALSE@noinst_LTLIBRARIES = libcoinblas.la
     245@SKIPMAKE_TRUE@noinst_LTLIBRARIES =
     246nodist_libcoinblas_la_SOURCES = \
    260247        dasum.f \
    261248        daxpy.f \
    … …  
    297284
    298285libcoinblas_la_LDFLAGS = $(LT_LDFLAGS)
    299 addlibsdir = $(prefix)/share/doc/coin/ThirdParty/Blas
    300 addlibs_DATA = blas_addlibs.txt README
    301286
    302287########################################################################
    … …  
    345330$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
    346331        cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
    347 blas_addlibs.txt: $(top_builddir)/config.status $(srcdir)/blas_addlibs.txt.in
    348         cd $(top_builddir) && $(SHELL) ./config.status $@
    349 blas.pc: $(top_builddir)/config.status $(srcdir)/blas.pc.in
    350         cd $(top_builddir) && $(SHELL) ./config.status $@
    351 blas-uninstalled.pc: $(top_builddir)/config.status $(srcdir)/blas-uninstalled.pc.in
    352         cd $(top_builddir) && $(SHELL) ./config.status $@
    353 install-thirdpartylibLTLIBRARIES: $(thirdpartylib_LTLIBRARIES)
    354         @$(NORMAL_INSTALL)
    355         test -z "$(thirdpartylibdir)" || $(mkdir_p) "$(DESTDIR)$(thirdpartylibdir)"
    356         @list='$(thirdpartylib_LTLIBRARIES)'; for p in $$list; do \
    357           if test -f $$p; then \
    358             f=$(am__strip_dir) \
    359             echo " $(LIBTOOL) --mode=install $(thirdpartylibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(thirdpartylibdir)/$$f'"; \
    360             $(LIBTOOL) --mode=install $(thirdpartylibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(thirdpartylibdir)/$$f"; \
    361           else :; fi; \
    362         done
    363 
    364 uninstall-thirdpartylibLTLIBRARIES:
    365         @$(NORMAL_UNINSTALL)
    366         @set -x; list='$(thirdpartylib_LTLIBRARIES)'; for p in $$list; do \
    367           p=$(am__strip_dir) \
    368           echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(thirdpartylibdir)/$$p'"; \
    369           $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(thirdpartylibdir)/$$p"; \
    370         done
    371 
    372 clean-thirdpartylibLTLIBRARIES:
    373         -test -z "$(thirdpartylib_LTLIBRARIES)" || rm -f $(thirdpartylib_LTLIBRARIES)
    374         @list='$(thirdpartylib_LTLIBRARIES)'; for p in $$list; do \
     332
     333clean-noinstLTLIBRARIES:
     334        -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
     335        @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
    375336          dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
    376337          test "$$dir" != "$$p" || dir=.; \
    … …  
    379340        done
    380341libcoinblas.la: $(libcoinblas_la_OBJECTS) $(libcoinblas_la_DEPENDENCIES)
    381         $(F77LINK) -rpath $(thirdpartylibdir) $(libcoinblas_la_LDFLAGS) $(libcoinblas_la_OBJECTS) $(libcoinblas_la_LIBADD) $(LIBS)
     342        $(F77LINK) $(am_libcoinblas_la_rpath) $(libcoinblas_la_LDFLAGS) $(libcoinblas_la_OBJECTS) $(libcoinblas_la_LIBADD) $(LIBS)
    382343
    383344mostlyclean-compile:
    … …  
    405366        -rm -f libtool
    406367uninstall-info-am:
    407 install-addlibsDATA: $(addlibs_DATA)
    408         @$(NORMAL_INSTALL)
    409         test -z "$(addlibsdir)" || $(mkdir_p) "$(DESTDIR)$(addlibsdir)"
    410         @list='$(addlibs_DATA)'; for p in $$list; do \
    411           if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
    412           f=$(am__strip_dir) \
    413           echo " $(addlibsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(addlibsdir)/$$f'"; \
    414           $(addlibsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(addlibsdir)/$$f"; \
    415         done
    416 
    417 uninstall-addlibsDATA:
    418         @$(NORMAL_UNINSTALL)
    419         @list='$(addlibs_DATA)'; for p in $$list; do \
    420           f=$(am__strip_dir) \
    421           echo " rm -f '$(DESTDIR)$(addlibsdir)/$$f'"; \
    422           rm -f "$(DESTDIR)$(addlibsdir)/$$f"; \
    423         done
    424 install-pkgconfiglibDATA: $(pkgconfiglib_DATA)
    425         @$(NORMAL_INSTALL)
    426         test -z "$(pkgconfiglibdir)" || $(mkdir_p) "$(DESTDIR)$(pkgconfiglibdir)"
    427         @list='$(pkgconfiglib_DATA)'; for p in $$list; do \
    428           if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
    429           f=$(am__strip_dir) \
    430           echo " $(pkgconfiglibDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgconfiglibdir)/$$f'"; \
    431           $(pkgconfiglibDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgconfiglibdir)/$$f"; \
    432         done
    433 
    434 uninstall-pkgconfiglibDATA:
    435         @$(NORMAL_UNINSTALL)
    436         @list='$(pkgconfiglib_DATA)'; for p in $$list; do \
    437           f=$(am__strip_dir) \
    438           echo " rm -f '$(DESTDIR)$(pkgconfiglibdir)/$$f'"; \
    439           rm -f "$(DESTDIR)$(pkgconfiglibdir)/$$f"; \
    440         done
    441368
    442369ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
    … …  
    491418        $(am__remove_distdir)
    492419        mkdir $(distdir)
    493         $(mkdir_p) $(distdir)/. $(distdir)/../.. $(distdir)/../../BuildTools
     420        $(mkdir_p) $(distdir)/../.. $(distdir)/../../BuildTools
    494421        @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
    495422        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
    … …  
    617544check-am: all-am
    618545check: check-am
    619 all-am: Makefile $(LTLIBRARIES) $(DATA)
     546all-am: Makefile $(LTLIBRARIES)
    620547installdirs:
    621         for dir in "$(DESTDIR)$(thirdpartylibdir)" "$(DESTDIR)$(addlibsdir)" "$(DESTDIR)$(pkgconfiglibdir)"; do \
    622           test -z "$$dir" || $(mkdir_p) "$$dir"; \
    623         done
    624548install: install-am
    625549install-exec: install-exec-am
    … …  
    649573clean: clean-am
    650574
    651 clean-am: clean-generic clean-libtool clean-thirdpartylibLTLIBRARIES \
     575clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
    652576        mostlyclean-am
    653577
    … …  
    668592info-am:
    669593
    670 install-data-am: install-addlibsDATA install-pkgconfiglibDATA \
    671         install-thirdpartylibLTLIBRARIES
     594install-data-am:
    672595
    673596install-exec-am:
    … …  
    698621ps-am:
    699622
    700 uninstall-am: uninstall-addlibsDATA uninstall-info-am \
    701         uninstall-pkgconfiglibDATA uninstall-thirdpartylibLTLIBRARIES
     623uninstall-am: uninstall-info-am
    702624
    703625.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
    704         clean-generic clean-libtool clean-thirdpartylibLTLIBRARIES \
    705         ctags dist dist-all dist-bzip2 dist-gzip dist-shar dist-tarZ \
    706         dist-zip distcheck distclean distclean-compile \
    707         distclean-generic distclean-libtool distclean-tags \
    708         distcleancheck distdir distuninstallcheck dvi dvi-am html \
    709         html-am info info-am install install-addlibsDATA install-am \
    710         install-data install-data-am install-exec install-exec-am \
    711         install-info install-info-am install-man \
    712         install-pkgconfiglibDATA install-strip \
    713         install-thirdpartylibLTLIBRARIES installcheck installcheck-am \
    714         installdirs maintainer-clean maintainer-clean-generic \
    715         mostlyclean mostlyclean-compile mostlyclean-generic \
    716         mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
    717         uninstall-addlibsDATA uninstall-am uninstall-info-am \
    718         uninstall-pkgconfiglibDATA uninstall-thirdpartylibLTLIBRARIES
     626        clean-generic clean-libtool clean-noinstLTLIBRARIES ctags dist \
     627        dist-all dist-bzip2 dist-gzip dist-shar dist-tarZ dist-zip \
     628        distcheck distclean distclean-compile distclean-generic \
     629        distclean-libtool distclean-tags distcleancheck distdir \
     630        distuninstallcheck dvi dvi-am html html-am info info-am \
     631        install install-am install-data install-data-am install-exec \
     632        install-exec-am install-info install-info-am install-man \
     633        install-strip installcheck installcheck-am installdirs \
     634        maintainer-clean maintainer-clean-generic mostlyclean \
     635        mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
     636        pdf pdf-am ps ps-am tags uninstall uninstall-am \
     637        uninstall-info-am
    719638
    720639
Note: See TracChangeset for help on using the changeset viewer.