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

Diff for /JSOC/make_basic.mk between version 1.57 and 1.58

version 1.57, 2009/09/22 22:49:55 version 1.58, 2009/09/22 23:45:20
Line 7  _JSOCROOT_ = ..
Line 7  _JSOCROOT_ = ..
 # This optional file has custom definitions created by the configure script # This optional file has custom definitions created by the configure script
 -include $(SRCDIR)/custom.mk -include $(SRCDIR)/custom.mk
  
   # If MACH was set when the make command was issued (eg., make MACH='N02'), then
   # use its value for the output/obj directory and use the custom.mk variables
   # relevant to its value. Otherwise, use $(JSOC_MACHINE).
 ifeq ($(MACH),) ifeq ($(MACH),)
 MACH = $(JSOC_MACHINE) MACH = $(JSOC_MACHINE)
 endif endif
Line 292  endif
Line 295  endif
 FCOMP           = $(FCOMPILER) $(F_CF_ALL) $(FF_TGT) -o $@ -c $< FCOMP           = $(FCOMPILER) $(F_CF_ALL) $(FF_TGT) -o $@ -c $<
 FLINK           = $(FCOMPILER) $(F_LF_ALL) $(LF_TGT) -o $@ $^ $(LL_TGT) $(LL_ALL) FLINK           = $(FCOMPILER) $(F_LF_ALL) $(LF_TGT) -o $@ $^ $(LL_TGT) $(LL_ALL)
  
 SLBIN           = ln -sf ../../_$(JSOC_MACHINE)/$@ ../bin/$(JSOC_MACHINE)/  SLBIN           = ln -sf ../../_$(MACH)/$@ ../bin/$(MACH)/
 SLLIB           = ln -sf ../../_$(JSOC_MACHINE)/$@ ../lib/$(JSOC_MACHINE)/  SLLIB           = ln -sf ../../_$(MACH)/$@ ../lib/$(MACH)/
 #***********************************************************************************************# #***********************************************************************************************#
  
  


Legend:
Removed from v.1.57  
changed lines
  Added in v.1.58

Karen Tian
Powered by
ViewCVS 0.9.4