Changeset 2574


Ignore:
Timestamp:
Jun 18, 2012 1:54:04 PM (8 years ago)
Author:
stefan
Message:

sync with trunk r2573

Location:
ThirdParty/HSL/stable/1.4
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/HSL/stable/1.4

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

    r2571 r2574  
    6666
    6767# dependencies
    68 #  the following attempt to specify additional dependencies does not work
    69 #  it's not clear yet how to specify F90 module dependencies nicely
    70 #  until then, parallel make builds may fail
    71 #hsl_ma77d_ciface.lo: hsl_ma77d.lo
    72 #hsl_ma86d_ciface.lo: hsl_ma86d.lo
    73 #hsl_ma97d_ciface.lo: hsl_ma97d.lo hsl_mc68i.lo
    74 #hsl_mc68i_ciface.lo: deps90.lo
     68#  need to define dependencies in terms of variables, since automake does not allow multiple rules for the same target
     69ma77=hsl_ma77d
     70ma86=hsl_ma86d
     71ma97=hsl_ma97d
     72mc68=hsl_mc68i
     73$(ma77).lo: deps90.lo
     74$(ma86).lo: deps90.lo
     75$(ma97).lo: deps90.lo $(mc68).lo
     76$(mc68).lo: deps90.lo
     77$(ma77)_ciface.lo: $(ma77).lo
     78$(ma86)_ciface.lo: $(ma86).lo
     79$(ma97)_ciface.lo: $(ma97).lo
     80$(mc68)_ciface.lo: $(mc68).lo
    7581
    7682#############################################################################
  • ThirdParty/HSL/stable/1.4/Makefile.in

    r2571 r2574  
    392392@BUILD_COINHSL_TRUE@    $(am__append_12) $(am__append_14)
    393393@BUILD_COINHSL_TRUE@libcoinhsl_la_LDFLAGS = $(LT_LDFLAGS)
     394
     395# dependencies
     396#  need to define dependencies in terms of variables, since automake does not allow multiple rules for the same target
     397@BUILD_COINHSL_TRUE@ma77 = hsl_ma77d
     398@BUILD_COINHSL_TRUE@ma86 = hsl_ma86d
     399@BUILD_COINHSL_TRUE@ma97 = hsl_ma97d
     400@BUILD_COINHSL_TRUE@mc68 = hsl_mc68i
    394401@BUILD_COINHSL_TRUE@pkgconfiglibdir = $(libdir)/pkgconfig
    395402@BUILD_COINHSL_TRUE@pkgconfiglib_DATA = coinhsl.pc
     
    925932        uninstall-pkgconfiglibDATA
    926933
    927 
    928 # dependencies
    929 #  the following attempt to specify additional dependencies does not work
    930 #  it's not clear yet how to specify F90 module dependencies nicely
    931 #  until then, parallel make builds may fail
    932 #hsl_ma77d_ciface.lo: hsl_ma77d.lo
    933 #hsl_ma86d_ciface.lo: hsl_ma86d.lo
    934 #hsl_ma97d_ciface.lo: hsl_ma97d.lo hsl_mc68i.lo
    935 #hsl_mc68i_ciface.lo: deps90.lo
     934@BUILD_COINHSL_TRUE@$(ma77).lo: deps90.lo
     935@BUILD_COINHSL_TRUE@$(ma86).lo: deps90.lo
     936@BUILD_COINHSL_TRUE@$(ma97).lo: deps90.lo $(mc68).lo
     937@BUILD_COINHSL_TRUE@$(mc68).lo: deps90.lo
     938@BUILD_COINHSL_TRUE@$(ma77)_ciface.lo: $(ma77).lo
     939@BUILD_COINHSL_TRUE@$(ma86)_ciface.lo: $(ma86).lo
     940@BUILD_COINHSL_TRUE@$(ma97)_ciface.lo: $(ma97).lo
     941@BUILD_COINHSL_TRUE@$(mc68)_ciface.lo: $(mc68).lo
    936942
    937943#############################################################################
Note: See TracChangeset for help on using the changeset viewer.