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

    r1388 r1411  
    1515@SET_MAKE@
    1616
    17 # Copyright (C) 2003, 2008, 2009 International Business Machines and others
     17# Copyright (C) 2003, 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 
    3130
    3231srcdir = @srcdir@
     
    5857@COIN_HAS_MA28_TRUE@    mc21ad.f mc22ad.f mc23ad.f mc24ad.f
    5958
    60 DIST_COMMON = README $(am__configure_deps) \
     59@EXTRA_SHARED_COMMAND_FALSE@@INSTALL_LOADABLE_LIBRARY_TRUE@am__append_5 = libhsl.la
     60DIST_COMMON = $(am__configure_deps) \
    6161        $(srcdir)/../../BuildTools/Makemain.inc $(srcdir)/Makefile.am \
    62         $(srcdir)/Makefile.in $(srcdir)/hsl_addlibs.txt.in \
    63         $(top_srcdir)/configure config.guess config.sub depcomp \
    64         install-sh ltmain.sh missing
    65 @HAVE_EXTERNALS_TRUE@am__append_5 = Externals
    66 @HAVE_EXTERNALS_TRUE@am__append_6 = .Externals-stamp
     62        $(srcdir)/Makefile.in $(top_srcdir)/configure config.guess \
     63        config.sub depcomp install-sh ltmain.sh missing
     64@HAVE_EXTERNALS_TRUE@am__append_6 = Externals
     65@HAVE_EXTERNALS_TRUE@am__append_7 = .Externals-stamp
    6766subdir = .
    6867ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
     
    7473 configure.lineno configure.status.lineno
    7574mkinstalldirs = $(install_sh) -d
    76 CONFIG_CLEAN_FILES = hsl_addlibs.txt
     75CONFIG_CLEAN_FILES =
    7776am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
    7877am__vpath_adj = case $$p in \
     
    8180  esac;
    8281am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
    83 am__installdirs = "$(DESTDIR)$(thirdpartylibdir)" \
    84         "$(DESTDIR)$(addlibsdir)"
    85 thirdpartylibLTLIBRARIES_INSTALL = $(INSTALL)
    86 LTLIBRARIES = $(thirdpartylib_LTLIBRARIES)
     82am__installdirs = "$(DESTDIR)$(libdir)"
     83libLTLIBRARIES_INSTALL = $(INSTALL)
     84LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES)
    8785libcoinhsl_la_LIBADD =
    88 am__libcoinhsl_la_SOURCES_DIST = dummy.c ma27ad.f ma57ad.f mc19ad.f \
    89         ma28ad.f ma30ad.f mc13dd.f mc20ad.f mc21ad.f mc22ad.f mc23ad.f \
    90         mc24ad.f
    9186@COIN_HAS_MA27_TRUE@am__objects_1 = ma27ad.lo
    9287@COIN_HAS_MA57_TRUE@am__objects_2 = ma57ad.lo
     
    9590@COIN_HAS_MA28_TRUE@    mc20ad.lo mc21ad.lo mc22ad.lo mc23ad.lo \
    9691@COIN_HAS_MA28_TRUE@    mc24ad.lo
    97 am_libcoinhsl_la_OBJECTS = dummy.lo $(am__objects_1) $(am__objects_2) \
     92nodist_libcoinhsl_la_OBJECTS = dummy.lo $(am__objects_1) \
     93        $(am__objects_2) $(am__objects_3) $(am__objects_4)
     94libcoinhsl_la_OBJECTS = $(nodist_libcoinhsl_la_OBJECTS)
     95libhsl_la_LIBADD =
     96am__libhsl_la_SOURCES_DIST = dummy.c ma27ad.f ma57ad.f mc19ad.f \
     97        ma28ad.f ma30ad.f mc13dd.f mc20ad.f mc21ad.f mc22ad.f mc23ad.f \
     98        mc24ad.f
     99am__objects_5 = dummy.lo $(am__objects_1) $(am__objects_2) \
    98100        $(am__objects_3) $(am__objects_4)
    99 libcoinhsl_la_OBJECTS = $(am_libcoinhsl_la_OBJECTS)
     101@EXTRA_SHARED_COMMAND_FALSE@@INSTALL_LOADABLE_LIBRARY_TRUE@am_libhsl_la_OBJECTS = $(am__objects_5)
     102libhsl_la_OBJECTS = $(am_libhsl_la_OBJECTS)
     103@EXTRA_SHARED_COMMAND_FALSE@@INSTALL_LOADABLE_LIBRARY_TRUE@am_libhsl_la_rpath = -rpath \
     104@EXTRA_SHARED_COMMAND_FALSE@@INSTALL_LOADABLE_LIBRARY_TRUE@     $(libdir)
    100105DEFAULT_INCLUDES = -I. -I$(srcdir)
    101106depcomp = $(SHELL) $(top_srcdir)/depcomp
     
    115120F77LINK = $(LIBTOOL) --tag=F77 --mode=link $(F77LD) $(AM_FFLAGS) \
    116121        $(FFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
    117 SOURCES = $(libcoinhsl_la_SOURCES)
    118 DIST_SOURCES = $(am__libcoinhsl_la_SOURCES_DIST)
    119 addlibsDATA_INSTALL = $(INSTALL_DATA)
    120 DATA = $(addlibs_DATA)
     122SOURCES = $(nodist_libcoinhsl_la_SOURCES) $(libhsl_la_SOURCES)
     123DIST_SOURCES = $(am__libhsl_la_SOURCES_DIST)
    121124ETAGS = etags
    122125CTAGS = ctags
     
    283286target_alias = @target_alias@
    284287AUTOMAKE_OPTIONS = foreign
    285 EXTRA_DIST = INSTALL.HSL $(am__append_5)
    286 thirdpartylibdir = $(prefix)/lib/ThirdParty
    287 thirdpartylib_LTLIBRARIES = libcoinhsl.la
    288 libcoinhsl_la_SOURCES = dummy.c $(am__append_1) $(am__append_2) \
     288EXTRA_DIST = INSTALL.HSL $(am__append_6)
     289noinst_LTLIBRARIES = libcoinhsl.la
     290nodist_libcoinhsl_la_SOURCES = dummy.c $(am__append_1) $(am__append_2) \
    289291        $(am__append_3) $(am__append_4)
     292lib_LTLIBRARIES = $(am__append_5)
     293@EXTRA_SHARED_COMMAND_FALSE@@INSTALL_LOADABLE_LIBRARY_TRUE@libhsl_la_SOURCES = $(nodist_libcoinhsl_la_SOURCES)
    290294libcoinhsl_la_LDFLAGS = $(LT_LDFLAGS)
    291295@EXTRA_SHARED_COMMAND_TRUE@CLEANFILES = $(HSL_SHARED_LIB) $(DEFFILE)
    292 addlibsdir = $(prefix)/share/doc/coin/ThirdParty/HSL
    293 addlibs_DATA = hsl_addlibs.txt README
    294296
    295297########################################################################
     
    298300
    299301# Files that are generated and should be cleaned with make distclean
    300 DISTCLEANFILES = $(am__append_6) $(VPATH_DISTCLEANFILES)
     302DISTCLEANFILES = $(am__append_7) $(VPATH_DISTCLEANFILES)
    301303DocFiles = README AUTHORS LICENSE
    302304DocInstallDir = $(prefix)/share/doc/coin/$(PACKAGE_NAME)
     
    338340$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
    339341        cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
    340 hsl_addlibs.txt: $(top_builddir)/config.status $(srcdir)/hsl_addlibs.txt.in
    341         cd $(top_builddir) && $(SHELL) ./config.status $@
    342 install-thirdpartylibLTLIBRARIES: $(thirdpartylib_LTLIBRARIES)
     342install-libLTLIBRARIES: $(lib_LTLIBRARIES)
    343343        @$(NORMAL_INSTALL)
    344         test -z "$(thirdpartylibdir)" || $(mkdir_p) "$(DESTDIR)$(thirdpartylibdir)"
    345         @list='$(thirdpartylib_LTLIBRARIES)'; for p in $$list; do \
     344        test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
     345        @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
    346346          if test -f $$p; then \
    347347            f=$(am__strip_dir) \
    348             echo " $(LIBTOOL) --mode=install $(thirdpartylibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(thirdpartylibdir)/$$f'"; \
    349             $(LIBTOOL) --mode=install $(thirdpartylibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(thirdpartylibdir)/$$f"; \
     348            echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
     349            $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
    350350          else :; fi; \
    351351        done
    352352
    353 uninstall-thirdpartylibLTLIBRARIES:
     353uninstall-libLTLIBRARIES:
    354354        @$(NORMAL_UNINSTALL)
    355         @set -x; list='$(thirdpartylib_LTLIBRARIES)'; for p in $$list; do \
     355        @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
    356356          p=$(am__strip_dir) \
    357           echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(thirdpartylibdir)/$$p'"; \
    358           $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(thirdpartylibdir)/$$p"; \
     357          echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
     358          $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
    359359        done
    360360
    361 clean-thirdpartylibLTLIBRARIES:
    362         -test -z "$(thirdpartylib_LTLIBRARIES)" || rm -f $(thirdpartylib_LTLIBRARIES)
    363         @list='$(thirdpartylib_LTLIBRARIES)'; for p in $$list; do \
     361clean-libLTLIBRARIES:
     362        -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
     363        @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
     364          dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
     365          test "$$dir" != "$$p" || dir=.; \
     366          echo "rm -f \"$${dir}/so_locations\""; \
     367          rm -f "$${dir}/so_locations"; \
     368        done
     369
     370clean-noinstLTLIBRARIES:
     371        -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
     372        @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
    364373          dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
    365374          test "$$dir" != "$$p" || dir=.; \
     
    368377        done
    369378libcoinhsl.la: $(libcoinhsl_la_OBJECTS) $(libcoinhsl_la_DEPENDENCIES)
    370         $(F77LINK) -rpath $(thirdpartylibdir) $(libcoinhsl_la_LDFLAGS) $(libcoinhsl_la_OBJECTS) $(libcoinhsl_la_LIBADD) $(LIBS)
     379        $(F77LINK)  $(libcoinhsl_la_LDFLAGS) $(libcoinhsl_la_OBJECTS) $(libcoinhsl_la_LIBADD) $(LIBS)
     380libhsl.la: $(libhsl_la_OBJECTS) $(libhsl_la_DEPENDENCIES)
     381        $(F77LINK) $(am_libhsl_la_rpath) $(libhsl_la_LDFLAGS) $(libhsl_la_OBJECTS) $(libhsl_la_LIBADD) $(LIBS)
    371382
    372383mostlyclean-compile:
     
    417428        -rm -f libtool
    418429uninstall-info-am:
    419 install-addlibsDATA: $(addlibs_DATA)
    420         @$(NORMAL_INSTALL)
    421         test -z "$(addlibsdir)" || $(mkdir_p) "$(DESTDIR)$(addlibsdir)"
    422         @list='$(addlibs_DATA)'; for p in $$list; do \
    423           if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
    424           f=$(am__strip_dir) \
    425           echo " $(addlibsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(addlibsdir)/$$f'"; \
    426           $(addlibsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(addlibsdir)/$$f"; \
    427         done
    428 
    429 uninstall-addlibsDATA:
    430         @$(NORMAL_UNINSTALL)
    431         @list='$(addlibs_DATA)'; for p in $$list; do \
    432           f=$(am__strip_dir) \
    433           echo " rm -f '$(DESTDIR)$(addlibsdir)/$$f'"; \
    434           rm -f "$(DESTDIR)$(addlibsdir)/$$f"; \
    435         done
    436430
    437431ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
     
    486480        $(am__remove_distdir)
    487481        mkdir $(distdir)
    488         $(mkdir_p) $(distdir)/. $(distdir)/../../BuildTools
     482        $(mkdir_p) $(distdir)/../../BuildTools
    489483        @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
    490484        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
     
    612606check-am: all-am
    613607check: check-am
    614 all-am: Makefile $(LTLIBRARIES) $(DATA)
     608all-am: Makefile $(LTLIBRARIES)
    615609installdirs:
    616         for dir in "$(DESTDIR)$(thirdpartylibdir)" "$(DESTDIR)$(addlibsdir)"; do \
     610        for dir in "$(DESTDIR)$(libdir)"; do \
    617611          test -z "$$dir" || $(mkdir_p) "$$dir"; \
    618612        done
     
    647641clean: clean-am
    648642
    649 clean-am: clean-generic clean-libtool clean-thirdpartylibLTLIBRARIES \
    650         mostlyclean-am
     643clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
     644        clean-noinstLTLIBRARIES mostlyclean-am
    651645
    652646distclean: distclean-am
     
    667661info-am:
    668662
    669 install-data-am: install-addlibsDATA install-thirdpartylibLTLIBRARIES
    670 
    671 install-exec-am: install-exec-local
     663install-data-am:
     664
     665install-exec-am: install-exec-local install-libLTLIBRARIES
    672666
    673667install-info: install-info-am
     
    697691ps-am:
    698692
    699 uninstall-am: uninstall-addlibsDATA uninstall-info-am uninstall-local \
    700         uninstall-thirdpartylibLTLIBRARIES
     693uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \
     694        uninstall-local
    701695
    702696.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
    703         clean-generic clean-libtool clean-thirdpartylibLTLIBRARIES \
    704         ctags dist dist-all dist-bzip2 dist-gzip dist-shar dist-tarZ \
    705         dist-zip distcheck distclean distclean-compile \
    706         distclean-generic distclean-libtool distclean-tags \
    707         distcleancheck distdir distuninstallcheck dvi dvi-am html \
    708         html-am info info-am install install-addlibsDATA install-am \
     697        clean-generic clean-libLTLIBRARIES clean-libtool \
     698        clean-noinstLTLIBRARIES ctags dist dist-all dist-bzip2 \
     699        dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \
     700        distclean-compile distclean-generic distclean-libtool \
     701        distclean-tags distcleancheck distdir distuninstallcheck dvi \
     702        dvi-am html html-am info info-am install install-am \
    709703        install-data install-data-am install-exec install-exec-am \
    710         install-exec-local install-info install-info-am install-man \
    711         install-strip install-thirdpartylibLTLIBRARIES installcheck \
     704        install-exec-local install-info install-info-am \
     705        install-libLTLIBRARIES install-man install-strip installcheck \
    712706        installcheck-am installdirs maintainer-clean \
    713707        maintainer-clean-generic mostlyclean mostlyclean-compile \
    714708        mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
    715         tags uninstall uninstall-addlibsDATA uninstall-am \
    716         uninstall-info-am uninstall-local \
    717         uninstall-thirdpartylibLTLIBRARIES
     709        tags uninstall uninstall-am uninstall-info-am \
     710        uninstall-libLTLIBRARIES uninstall-local
    718711
    719712
     
    721714#  Generating a shared library for delay loading
    722715
    723 @EXTRA_SHARED_COMMAND_TRUE@$(HSL_SHARED_LIB): $(thirdpartylib_LTLIBRARIES) $(DEFFILE)
     716@EXTRA_SHARED_COMMAND_TRUE@$(HSL_SHARED_LIB): $(noinst_LTLIBRARIES) $(DEFFILE)
    724717@EXTRA_SHARED_COMMAND_TRUE@     bla=; \
    725718@EXTRA_SHARED_COMMAND_TRUE@     for i in $(nodist_libcoinhsl_la_SOURCES); do \
     
    745738
    746739@EXTRA_SHARED_COMMAND_TRUE@install-exec-local: $(HSL_SHARED_LIB)
    747 @EXTRA_SHARED_COMMAND_TRUE@     test -z "$(DESTDIR)$(libdir)/ThirdParty" || $(mkdir_p) "$(DESTDIR)$(libdir)/ThirdParty"
    748 @EXTRA_SHARED_COMMAND_TRUE@     $(libLTLIBRARIES_INSTALL) $(HSL_SHARED_LIB) "$(DESTDIR)$(libdir)/ThirdParty/$(HSL_SHARED_LIB)"
     740@EXTRA_SHARED_COMMAND_TRUE@     test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
     741@EXTRA_SHARED_COMMAND_TRUE@     $(libLTLIBRARIES_INSTALL) $(HSL_SHARED_LIB) "$(DESTDIR)$(libdir)/$(HSL_SHARED_LIB)"
    749742
    750743@EXTRA_SHARED_COMMAND_TRUE@uninstall-local:
    751 @EXTRA_SHARED_COMMAND_TRUE@     rm -f "$(DESTDIR)$(libdir)/ThirdParty/$(HSL_SHARED_LIB)"
     744@EXTRA_SHARED_COMMAND_TRUE@     rm -f "$(DESTDIR)$(libdir)/$(HSL_SHARED_LIB)"
    752745
    753746install-doc: $(DocFiles)
Note: See TracChangeset for help on using the changeset viewer.