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

Diff for /JSOC/proj/globalhs/Rules.mk between version 1.14 and 1.15

version 1.14, 2015/02/15 05:10:32 version 1.15, 2015/05/20 19:17:10
Line 51  This option is FOR DEVELOPMENT ONLY!
Line 51  This option is FOR DEVELOPMENT ONLY!
  
 endef endef
  
   # commented lines below are to accomodate removal of globalhs from the default build
  
 ifeq ($(GLOBALHSTAGOVERRIDE),) ifeq ($(GLOBALHSTAGOVERRIDE),)
   ifeq ($(MAKECMDGOALS),)  #  ifeq ($(MAKECMDGOALS),)
     GLOBALHS_TAG := $(shell $(SRCDIR)/proj/globalhs/scripts/checkglobalhstags $(SRCDIR))  #    GLOBALHS_TAG := $(shell $(SRCDIR)/proj/globalhs/scripts/checkglobalhstags $(SRCDIR))
     ifeq ($(GLOBALHS_TAG),)  #    ifeq ($(GLOBALHS_TAG),)
       $(error $(GHSWARNING3))  #      $(error $(GHSWARNING3))
     endif  #    endif
     TAGCHECK := $(findstring globalhs,$(GLOBALHS_TAG))  #    TAGCHECK := $(findstring globalhs,$(GLOBALHS_TAG))
     ifeq ($(TAGCHECK),)  #    ifeq ($(TAGCHECK),)
       $(error $(GHSWARNING1))  #      $(error $(GHSWARNING1))
     endif  #    endif
   else  #  else
     GHSMODLIST_SOCK := $(GLOBALHSMODLIST:%=%_sock)     GHSMODLIST_SOCK := $(GLOBALHSMODLIST:%=%_sock)
     GHSTARGETLIST   := all universe targets globalhs $(GLOBALHSMODLIST) $(GHSMODLIST_SOCK) $(GHSLIBLIST)      GHSTARGETLIST   := globalhs $(GLOBALHSMODLIST) $(GHSMODLIST_SOCK) $(GHSLIBLIST)
   #   GHSTARGETLIST   := all universe targets globalhs $(GLOBALHSMODLIST) $(GHSMODLIST_SOCK) $(GHSLIBLIST)
 # if we added '%' before all the words in GLOBALHSMODLIST, the following would work even if someone specified the full path to the modules. # if we added '%' before all the words in GLOBALHSMODLIST, the following would work even if someone specified the full path to the modules.
 # if we added '%' after, it would also work if someone wanted to compile the .o files. # if we added '%' after, it would also work if someone wanted to compile the .o files.
 # i'm not doing so at this time because inserting literal %'s is too much hassle for functionality we don't even use. # i'm not doing so at this time because inserting literal %'s is too much hassle for functionality we don't even use.
Line 79  ifeq ($(GLOBALHSTAGOVERRIDE),)
Line 81  ifeq ($(GLOBALHSTAGOVERRIDE),)
         $(error $(GHSWARNING1))         $(error $(GHSWARNING1))
       endif       endif
     endif     endif
   endif  #  endif
 else else
   GLOBALHS_TAG := $(GLOBALHSTAGOVERRIDE)   GLOBALHS_TAG := $(GLOBALHSTAGOVERRIDE)
 #  TAGCHECK := $(findstring globalhs,$(GLOBALHS_TAG)) #  TAGCHECK := $(findstring globalhs,$(GLOBALHS_TAG))


Legend:
Removed from v.1.14  
changed lines
  Added in v.1.15

Karen Tian
Powered by
ViewCVS 0.9.4