Changeset 2547 for ThirdParty


Ignore:
Timestamp:
Feb 16, 2012 5:54:09 AM (8 years ago)
Author:
stefan
Message:

adapt to updates in MA77 interface (build new hsl_ma77d_ciface.f90)

Location:
ThirdParty/HSL/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/HSL/trunk/Makefile.am

    r2542 r2547  
    4444
    4545if COIN_HAS_HSL_MA77
    46   libcoinhsl_la_SOURCES += coinhsl/hsl_ma77/hsl_ma77d.f90
    47   nodist_includecoin_HEADERS = hsl_ma77_double.mod
     46  libcoinhsl_la_SOURCES += coinhsl/hsl_ma77/hsl_ma77d.f90 coinhsl/hsl_ma77/C/hsl_ma77d_ciface.f90
     47  includecoin_HEADERS += coinhsl/hsl_ma77/C/hsl_ma77d.h
    4848endif
    4949
     
    6666
    6767# dependencies
     68hsl_ma77d_ciface.lo: hsl_ma77d.lo
    6869hsl_ma86d_ciface.lo: hsl_ma86d.lo
    6970hsl_ma97d_ciface.lo: hsl_ma97d.lo hsl_mc68i.lo
  • ThirdParty/HSL/trunk/Makefile.in

    r2542 r2547  
    6060@BUILD_COINHSL_TRUE@@COIN_HAS_HSL_MC68_TRUE@am__append_6 = coinhsl/hsl_mc68/hsl_mc68i.f90 coinhsl/hsl_mc68/C/hsl_mc68i_ciface.f90
    6161@BUILD_COINHSL_TRUE@@COIN_HAS_HSL_MC68_TRUE@am__append_7 = coinhsl/hsl_mc68/C/hsl_mc68i.h
    62 @BUILD_COINHSL_TRUE@@COIN_HAS_HSL_MA77_TRUE@am__append_8 = coinhsl/hsl_ma77/hsl_ma77d.f90
    63 @BUILD_COINHSL_TRUE@@COIN_HAS_HSL_MA86_TRUE@am__append_9 = coinhsl/hsl_ma86/hsl_ma86d.f90 coinhsl/hsl_ma86/C/hsl_ma86d_ciface.f90
    64 @BUILD_COINHSL_TRUE@@COIN_HAS_HSL_MA86_TRUE@am__append_10 = coinhsl/hsl_ma86/C/hsl_ma86d.h
    65 @BUILD_COINHSL_TRUE@@COIN_HAS_HSL_MA97_TRUE@am__append_11 = coinhsl/hsl_ma97/hsl_ma97d.f90 coinhsl/hsl_ma97/C/hsl_ma97d_ciface.f90
    66 @BUILD_COINHSL_TRUE@@COIN_HAS_HSL_MA97_TRUE@am__append_12 = coinhsl/hsl_ma97/C/hsl_ma97d.h
    67 @BUILD_COINHSL_TRUE@@COIN_HAS_METIS_FALSE@am__append_13 = metis_dummy.c
     62@BUILD_COINHSL_TRUE@@COIN_HAS_HSL_MA77_TRUE@am__append_8 = coinhsl/hsl_ma77/hsl_ma77d.f90 coinhsl/hsl_ma77/C/hsl_ma77d_ciface.f90
     63@BUILD_COINHSL_TRUE@@COIN_HAS_HSL_MA77_TRUE@am__append_9 = coinhsl/hsl_ma77/C/hsl_ma77d.h
     64@BUILD_COINHSL_TRUE@@COIN_HAS_HSL_MA86_TRUE@am__append_10 = coinhsl/hsl_ma86/hsl_ma86d.f90 coinhsl/hsl_ma86/C/hsl_ma86d_ciface.f90
     65@BUILD_COINHSL_TRUE@@COIN_HAS_HSL_MA86_TRUE@am__append_11 = coinhsl/hsl_ma86/C/hsl_ma86d.h
     66@BUILD_COINHSL_TRUE@@COIN_HAS_HSL_MA97_TRUE@am__append_12 = coinhsl/hsl_ma97/hsl_ma97d.f90 coinhsl/hsl_ma97/C/hsl_ma97d_ciface.f90
     67@BUILD_COINHSL_TRUE@@COIN_HAS_HSL_MA97_TRUE@am__append_13 = coinhsl/hsl_ma97/C/hsl_ma97d.h
     68@BUILD_COINHSL_TRUE@@COIN_HAS_METIS_FALSE@am__append_14 = metis_dummy.c
    6869DIST_COMMON = $(am__configure_deps) $(am__includecoin_HEADERS_DIST) \
    6970        $(srcdir)/BuildTools/Makemain.inc $(srcdir)/Makefile.am \
     
    7273        $(srcdir)/config_coinhsl.h.in $(top_srcdir)/configure \
    7374        config.guess config.sub depcomp install-sh ltmain.sh missing
    74 @HAVE_EXTERNALS_TRUE@am__append_14 = Dependencies
    75 @HAVE_EXTERNALS_TRUE@am__append_15 = .Dependencies-stamp
     75@HAVE_EXTERNALS_TRUE@am__append_15 = Dependencies
     76@HAVE_EXTERNALS_TRUE@am__append_16 = .Dependencies-stamp
    7677subdir = .
    7778ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
     
    9293am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
    9394am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfiglibdir)" \
    94         "$(DESTDIR)$(includecoindir)" "$(DESTDIR)$(includecoindir)"
     95        "$(DESTDIR)$(includecoindir)"
    9596libLTLIBRARIES_INSTALL = $(INSTALL)
    9697LTLIBRARIES = $(lib_LTLIBRARIES)
     
    101102        coinhsl/hsl_mc68/hsl_mc68i.f90 \
    102103        coinhsl/hsl_mc68/C/hsl_mc68i_ciface.f90 \
    103         coinhsl/hsl_ma77/hsl_ma77d.f90 coinhsl/hsl_ma86/hsl_ma86d.f90 \
     104        coinhsl/hsl_ma77/hsl_ma77d.f90 \
     105        coinhsl/hsl_ma77/C/hsl_ma77d_ciface.f90 \
     106        coinhsl/hsl_ma86/hsl_ma86d.f90 \
    104107        coinhsl/hsl_ma86/C/hsl_ma86d_ciface.f90 \
    105108        coinhsl/hsl_ma97/hsl_ma97d.f90 \
     
    114117@BUILD_COINHSL_TRUE@@COIN_HAS_HSL_MC68_TRUE@    hsl_mc68i_ciface.lo
    115118@BUILD_COINHSL_TRUE@@COIN_HAS_HSL_MA77_TRUE@am__objects_7 =  \
    116 @BUILD_COINHSL_TRUE@@COIN_HAS_HSL_MA77_TRUE@    hsl_ma77d.lo
     119@BUILD_COINHSL_TRUE@@COIN_HAS_HSL_MA77_TRUE@    hsl_ma77d.lo \
     120@BUILD_COINHSL_TRUE@@COIN_HAS_HSL_MA77_TRUE@    hsl_ma77d_ciface.lo
    117121@BUILD_COINHSL_TRUE@@COIN_HAS_HSL_MA86_TRUE@am__objects_8 =  \
    118122@BUILD_COINHSL_TRUE@@COIN_HAS_HSL_MA86_TRUE@    hsl_ma86d.lo \
     
    157161DATA = $(pkgconfiglib_DATA)
    158162am__includecoin_HEADERS_DIST = coinhsl/hsl_mc68/C/hsl_mc68i.h \
    159         coinhsl/hsl_ma86/C/hsl_ma86d.h coinhsl/hsl_ma97/C/hsl_ma97d.h
     163        coinhsl/hsl_ma77/C/hsl_ma77d.h coinhsl/hsl_ma86/C/hsl_ma86d.h \
     164        coinhsl/hsl_ma97/C/hsl_ma97d.h
    160165includecoinHEADERS_INSTALL = $(INSTALL_HEADER)
    161 nodist_includecoinHEADERS_INSTALL = $(INSTALL_HEADER)
    162 HEADERS = $(includecoin_HEADERS) $(nodist_includecoin_HEADERS)
     166HEADERS = $(includecoin_HEADERS)
    163167ETAGS = etags
    164168CTAGS = ctags
     
    375379target_alias = @target_alias@
    376380AUTOMAKE_OPTIONS = foreign
    377 EXTRA_DIST = INSTALL.HSL $(am__append_14)
     381EXTRA_DIST = INSTALL.HSL $(am__append_15)
    378382@BUILD_COINHSL_TRUE@includecoindir = $(includedir)/coin/ThirdParty
    379383@BUILD_COINHSL_TRUE@includecoin_HEADERS = $(am__append_7) \
    380 @BUILD_COINHSL_TRUE@    $(am__append_10) $(am__append_12)
     384@BUILD_COINHSL_TRUE@    $(am__append_9) $(am__append_11) \
     385@BUILD_COINHSL_TRUE@    $(am__append_13)
    381386@BUILD_COINHSL_TRUE@lib_LTLIBRARIES = libcoinhsl.la
    382387@BUILD_COINHSL_TRUE@libcoinhsl_la_SOURCES = coinhsl/common/deps.f \
     
    384389@BUILD_COINHSL_TRUE@    $(am__append_3) $(am__append_4) \
    385390@BUILD_COINHSL_TRUE@    $(am__append_5) $(am__append_6) \
    386 @BUILD_COINHSL_TRUE@    $(am__append_8) $(am__append_9) \
    387 @BUILD_COINHSL_TRUE@    $(am__append_11) $(am__append_13)
    388 @BUILD_COINHSL_TRUE@@COIN_HAS_HSL_MA77_TRUE@nodist_includecoin_HEADERS = hsl_ma77_double.mod
     391@BUILD_COINHSL_TRUE@    $(am__append_8) $(am__append_10) \
     392@BUILD_COINHSL_TRUE@    $(am__append_12) $(am__append_14)
    389393@BUILD_COINHSL_TRUE@libcoinhsl_la_LDFLAGS = $(LT_LDFLAGS)
    390394@BUILD_COINHSL_TRUE@pkgconfiglibdir = $(libdir)/pkgconfig
     
    401405
    402406# Files that are generated and should be cleaned with make distclean
    403 DISTCLEANFILES = $(am__append_15) $(VPATH_DISTCLEANFILES)
     407DISTCLEANFILES = $(am__append_16) $(VPATH_DISTCLEANFILES)
    404408DocFiles = README AUTHORS LICENSE
    405409DocInstallDir = $(datadir)/coin/doc/$(PACKAGE_NAME)
     
    577581        $(LIBTOOL) --mode=compile $(FC) $(AM_FCFLAGS) $(FCFLAGS) -c -o hsl_ma77d.lo `test -f 'coinhsl/hsl_ma77/hsl_ma77d.f90' || echo '$(srcdir)/'`coinhsl/hsl_ma77/hsl_ma77d.f90
    578582
     583@BUILD_COINHSL_FALSE@hsl_ma77d_ciface.lo: coinhsl/hsl_ma77/C/hsl_ma77d_ciface.f90
     584        $(LIBTOOL) --mode=compile $(FC) $(AM_FCFLAGS) $(FCFLAGS) -c -o hsl_ma77d_ciface.lo `test -f 'coinhsl/hsl_ma77/C/hsl_ma77d_ciface.f90' || echo '$(srcdir)/'`coinhsl/hsl_ma77/C/hsl_ma77d_ciface.f90
     585
    579586hsl_ma86d.lo: coinhsl/hsl_ma86/hsl_ma86d.f90
    580587        $(LIBTOOL) --mode=compile $(FC) $(AM_FCFLAGS) $(FCFLAGS) -c -o hsl_ma86d.lo `test -f 'coinhsl/hsl_ma86/hsl_ma86d.f90' || echo '$(srcdir)/'`coinhsl/hsl_ma86/hsl_ma86d.f90
     
    628635        @$(NORMAL_UNINSTALL)
    629636        @list='$(includecoin_HEADERS)'; for p in $$list; do \
    630           f=$(am__strip_dir) \
    631           echo " rm -f '$(DESTDIR)$(includecoindir)/$$f'"; \
    632           rm -f "$(DESTDIR)$(includecoindir)/$$f"; \
    633         done
    634 install-nodist_includecoinHEADERS: $(nodist_includecoin_HEADERS)
    635         @$(NORMAL_INSTALL)
    636         test -z "$(includecoindir)" || $(mkdir_p) "$(DESTDIR)$(includecoindir)"
    637         @list='$(nodist_includecoin_HEADERS)'; for p in $$list; do \
    638           if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
    639           f=$(am__strip_dir) \
    640           echo " $(nodist_includecoinHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includecoindir)/$$f'"; \
    641           $(nodist_includecoinHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includecoindir)/$$f"; \
    642         done
    643 
    644 uninstall-nodist_includecoinHEADERS:
    645         @$(NORMAL_UNINSTALL)
    646         @list='$(nodist_includecoin_HEADERS)'; for p in $$list; do \
    647637          f=$(am__strip_dir) \
    648638          echo " rm -f '$(DESTDIR)$(includecoindir)/$$f'"; \
     
    701691        $(am__remove_distdir)
    702692        mkdir $(distdir)
    703         $(mkdir_p) $(distdir)/. $(distdir)/BuildTools $(distdir)/coinhsl/hsl_ma86/C $(distdir)/coinhsl/hsl_ma97/C $(distdir)/coinhsl/hsl_mc68/C
     693        $(mkdir_p) $(distdir)/. $(distdir)/BuildTools $(distdir)/coinhsl/hsl_ma77/C $(distdir)/coinhsl/hsl_ma86/C $(distdir)/coinhsl/hsl_ma97/C $(distdir)/coinhsl/hsl_mc68/C
    704694        @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
    705695        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
     
    830820                config_coinhsl.h
    831821installdirs:
    832         for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfiglibdir)" "$(DESTDIR)$(includecoindir)" "$(DESTDIR)$(includecoindir)"; do \
     822        for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfiglibdir)" "$(DESTDIR)$(includecoindir)"; do \
    833823          test -z "$$dir" || $(mkdir_p) "$$dir"; \
    834824        done
     
    883873info-am:
    884874
    885 install-data-am: install-includecoinHEADERS \
    886         install-nodist_includecoinHEADERS install-pkgconfiglibDATA
     875install-data-am: install-includecoinHEADERS install-pkgconfiglibDATA
    887876
    888877install-exec-am: install-exec-local install-libLTLIBRARIES
     
    916905uninstall-am: uninstall-includecoinHEADERS uninstall-info-am \
    917906        uninstall-libLTLIBRARIES uninstall-local \
    918         uninstall-nodist_includecoinHEADERS uninstall-pkgconfiglibDATA
     907        uninstall-pkgconfiglibDATA
    919908
    920909.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
     
    927916        install-exec install-exec-am install-exec-local \
    928917        install-includecoinHEADERS install-info install-info-am \
    929         install-libLTLIBRARIES install-man \
    930         install-nodist_includecoinHEADERS install-pkgconfiglibDATA \
     918        install-libLTLIBRARIES install-man install-pkgconfiglibDATA \
    931919        install-strip installcheck installcheck-am installdirs \
    932920        maintainer-clean maintainer-clean-generic mostlyclean \
     
    935923        uninstall-includecoinHEADERS uninstall-info-am \
    936924        uninstall-libLTLIBRARIES uninstall-local \
    937         uninstall-nodist_includecoinHEADERS uninstall-pkgconfiglibDATA
     925        uninstall-pkgconfiglibDATA
    938926
    939927
    940928# dependencies
     929@BUILD_COINHSL_TRUE@hsl_ma77d_ciface.lo: hsl_ma77d.lo
    941930@BUILD_COINHSL_TRUE@hsl_ma86d_ciface.lo: hsl_ma86d.lo
    942931@BUILD_COINHSL_TRUE@hsl_ma97d_ciface.lo: hsl_ma97d.lo hsl_mc68i.lo
Note: See TracChangeset for help on using the changeset viewer.