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

Diff for /JSOC/make_basic.mk between version 1.1 and 1.2

version 1.1, 2007/10/02 00:12:19 version 1.2, 2007/10/12 21:47:51
Line 188  SERVERLIBS = $(LIBDRMS) $(LIBDB) $(LIBSU
Line 188  SERVERLIBS = $(LIBDRMS) $(LIBDB) $(LIBSU
 EXELIBS = $(LIBDRMSCLIENT) $(LIBDBCLIENT) $(SRCLIBS) EXELIBS = $(LIBDRMSCLIENT) $(LIBDBCLIENT) $(SRCLIBS)
  
 # MODLIBS: Libraries linked with DRMS modules. # MODLIBS: Libraries linked with DRMS modules.
 #MODLIBS = $(LIBJSOC_MAIN) $(LIBASTRO) $(SERVERLIBS)  
 MODLIBS = $(LIBJSOC_MAIN) $(SERVERLIBS) MODLIBS = $(LIBJSOC_MAIN) $(SERVERLIBS)
  
 # MODLIBS_SOCK: Libraries linked with DRMS modules with socket connection to a drms_server # MODLIBS_SOCK: Libraries linked with DRMS modules with socket connection to a drms_server
 #MODLIBS_SOCK = $(LIBJSOC_MAIN_SOCK) $(LIBASTRO) $(LIBDRMSCLIENT) $(LIBDBCLIENT) $(SRCLIBS)  
 MODLIBS_SOCK = $(LIBJSOC_MAIN_SOCK) $(LIBDRMSCLIENT) $(LIBDBCLIENT) $(SRCLIBS) MODLIBS_SOCK = $(LIBJSOC_MAIN_SOCK) $(LIBDRMSCLIENT) $(LIBDBCLIENT) $(SRCLIBS)
  
 # FMODLIBS: Libraries linked with DRMS Fortran modules # FMODLIBS: Libraries linked with DRMS Fortran modules
 #FMODLIBS_SOCK = $(LIBJSOC_MAIN_SOCK_F) $(LIBINTHANDLESF) $(LIBASTRO) $(LIBDRMSCLIENT) $(LIBDBCLIENT) $(FSRCLIBS)  
 FMODLIBS_SOCK = $(LIBJSOC_MAIN_SOCK_F) $(LIBINTHANDLESF) $(LIBDRMSCLIENT) $(LIBDBCLIENT) $(FSRCLIBS) FMODLIBS_SOCK = $(LIBJSOC_MAIN_SOCK_F) $(LIBINTHANDLESF) $(LIBDRMSCLIENT) $(LIBDBCLIENT) $(FSRCLIBS)
  
 #  
 MATHLIBS =  $(LIBLSQR) $(LIBBLAS) $(LIBLAPACK) 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
Line 231  $(MODEXE_SOCK): %_sock: %.o $(MODLIBS_SO
Line 227  $(MODEXE_SOCK): %_sock: %.o $(MODLIBS_SO
 $(FMODEXE):     %_sock: %.o $(FMODLIBS_SOCK) $(FMODEXE):     %_sock: %.o $(FMODLIBS_SOCK)
                         $(FLINK)                         $(FLINK)
                         $(SLBIN)                         $(SLBIN)
   
 # The metalibs depend on libs that span the entire src/base tree, not just  
 # utility libraries in src/base/libs.  If instead of defining those  
 # dependencies here, they are defined a the lower-level Rules.mk files,  
 # then a dependent library (eg., LIBDRMSCLIENT_FPIC) might not be defined  
 # at the time the lower-level Rules.mk uses it, which would be a problem.  
 # So, define depedencies on libs that could be anywhere in the src tree here.  
 $(METALIB_FPIC):        %.so:   %_aux.a $(ALL_LIBS_FPIC)  
                         $(LINK)  
                         $(SLLIB)  


Legend:
Removed from v.1.1  
changed lines
  Added in v.1.2

Karen Tian
Powered by
ViewCVS 0.9.4