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

Diff for /JSOC/make_basic.mk between version 1.68 and 1.69

version 1.68, 2011/01/12 02:04:59 version 1.69, 2011/02/02 19:49:16
Line 35  endif
Line 35  endif
 # This optional file has custom definitions created by the configure script. # This optional file has custom definitions created by the configure script.
 # Do this after compiler selection since custom.mk might use $COMPILER or $FCOMPILER. # Do this after compiler selection since custom.mk might use $COMPILER or $FCOMPILER.
 # custom.mk might also set compiler (through moreconfigure.pl) # custom.mk might also set compiler (through moreconfigure.pl)
 -include $(LOCALIZATIONDIR)/custom.mk  -include $(SRCDIR)/$(LOCALIZATIONDIR)/custom.mk
 #***********************************************************************************************# #***********************************************************************************************#
  
 #***********************************************************************************************# #***********************************************************************************************#
Line 331  FMODLIBS_SOCK = $(LIBJSOC_MAIN_SOCK_F) $
Line 331  FMODLIBS_SOCK = $(LIBJSOC_MAIN_SOCK_F) $
 # PROJECT MAKE RULES # PROJECT MAKE RULES
 # #
 # 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)/$(LOCALIZATIONDIR)/make_basic.mk
 #***********************************************************************************************# #***********************************************************************************************#
  
  

Legend:
Removed from v.1.68  
changed lines
  Added in v.1.69
Karen Tian
 Powered by
ViewCVS 0.9.4