Ignore:
Timestamp:
Jun 19, 2011 10:38:54 AM (9 years ago)
Author:
stefan
Message:

sync with trunk rev2312

Location:
ThirdParty/Mumps/stable/1.4
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/Mumps/stable/1.4

  • ThirdParty/Mumps/stable/1.4/Makefile.am

    r2008 r2315  
    3131        $(MUMPSDIR)/src/dmumps_part8.F \
    3232        $(MUMPSDIR)/src/mumps_part9.F \
     33        $(MUMPSDIR)/src/mumps_sol_es.F \
    3334        $(MUMPSDIR)/src/mumps_c.c \
    3435        $(MUMPSDIR)/src/mumps_common.c\
     
    7879dmumps_part5.lo dmumps_ooc.lo: mumps_static_mapping.lo
    7980
    80 dmumps_part2.lo dmumps_part5.lo dmumps_part8.lo: tools_common_mod.lo
     81dmumps_part2.lo dmumps_part5.lo dmumps_part8.lo: tools_common_mod.lo mumps_sol_es.lo
     82
     83# actually only dmumps_part8.lo depends on mumps_sol_es.lo, but having only one target
     84# on the left side makes automake think that we provide a rule how to build this target
     85dmumps_part2.lo dmumps_part8.lo: mumps_sol_es.lo
    8186
    8287# Module files that need to be deleted
     
    99104pkgconfiglib_DATA = coinmumps.pc
    100105
    101 if COIN_HAS_PKGCONFIG
    102 addlibsdir = $(DESTDIR)$(datadir)/coin/doc/ThirdParty/Mumps
    103        
    104 install-data-hook:
    105         @$(mkdir_p) "$(addlibsdir)"
    106         PKG_CONFIG_PATH=@COIN_PKG_CONFIG_PATH@ \
    107         $(PKG_CONFIG) --libs coinmumps > $(addlibsdir)/mumps_addlibs.txt
    108 
    109 uninstall-hook:
    110         rm -f $(addlibsdir)/mumps_addlibs.txt
    111 endif
    112 
    113 test: $(libampl)
     106test:
    114107        @echo "No test available for Mumps."
    115108
Note: See TracChangeset for help on using the changeset viewer.