(file) Return to make_basic.mk CVS log (file) (dir) Up to [Development] / JSOC

Diff for /JSOC/make_basic.mk between version 1.41 and 1.42

version 1.41, 2009/04/10 22:29:02 version 1.42, 2009/04/15 20:08:20
Line 276  MODLIBS_SOCK = $(LIBJSOC_MAIN_SOCK) $(LI
Line 276  MODLIBS_SOCK = $(LIBJSOC_MAIN_SOCK) $(LI
 # FMODLIBS: Libraries linked with DRMS Fortran modules # FMODLIBS: Libraries linked with DRMS Fortran modules
 FMODLIBS_SOCK = $(LIBJSOC_MAIN_SOCK_F) $(LIBINTHANDLESF) $(LIBDRMSCLIENT) $(LIBDEFSCLIENT) $(LIBDBCLIENT) $(FSRCLIBS) FMODLIBS_SOCK = $(LIBJSOC_MAIN_SOCK_F) $(LIBINTHANDLESF) $(LIBDRMSCLIENT) $(LIBDEFSCLIENT) $(LIBDBCLIENT) $(FSRCLIBS)
  
 MATHLIBS =  $(LIBLSQR) $(LIBBLAS) $(LIBLAPACK)  
   
 # Make rules that apply to all projects outside of the base DRMS/SUMS system # Make rules that apply to all projects outside of the base DRMS/SUMS system
 -include $(SRCDIR)/proj/make_basic.mk -include $(SRCDIR)/proj/make_basic.mk
  
Line 286  $(CEXE): %: %.o $(EXELIBS)
Line 284  $(CEXE): %: %.o $(EXELIBS)
                 $(LINK)                 $(LINK)
                 $(SLBIN)                 $(SLBIN)
  
 $(FEXE):        %:      %.o $(MATHLIBS)  $(FEXE):        %:      %.o $(FMATHLIBS)
                 $(FLINK)                 $(FLINK)
                 $(SLBIN)                 $(SLBIN)
  
Line 304  $(MODEXE_SOCK): LL_TGT := $(LL_TGT) $(CF
Line 302  $(MODEXE_SOCK): LL_TGT := $(LL_TGT) $(CF
 $(MODEXE_SOCK): %_sock: %.o $(MODLIBS_SOCK) $(MODEXE_SOCK): %_sock: %.o $(MODLIBS_SOCK)
                         $(LINK)                         $(LINK)
                         $(SLBIN)                         $(SLBIN)
 # FMODEXE contains all Fortran modules - the DoIt() function is defined inside a .f file.  # FMODEXE_SOCK contains all Fortran modules - the DoIt() function is defined inside a .f file.
 # These are socket-connect modules only. Assume they use third-party Fortran libraries # These are socket-connect modules only. Assume they use third-party Fortran libraries
 # (although this may not be the case). # (although this may not be the case).
 $(FMODEXE):     LL_TGT := $(LL_TGT) $(CFITSIOLIBS) $(FMATHLIBS)  $(FMODEXE_SOCK):        LL_TGT := $(LL_TGT) $(CFITSIOLIBS) $(FMATHLIBS)
 $(FMODEXE):     %_sock: %.o $(FMODLIBS_SOCK)  $(FMODEXE_SOCK):     %_sock:    %.o $(FMODLIBS_SOCK)
                         $(FLINK)                         $(FLINK)
                         $(SLBIN)                         $(SLBIN)
  


Legend:
Removed from v.1.41  
changed lines
  Added in v.1.42

Karen Tian
Powered by
ViewCVS 0.9.4