(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.12 and 1.13

version 1.12, 2014/06/12 11:07:54 version 1.13, 2014/10/09 07:02:41
Line 57  ifeq ($(GLOBALHSTAGOVERRIDE),)
Line 57  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),)
       $(warning $(GHSWARNING3))        $(error $(GHSWARNING3))
     endif     endif
     TAGCHECK := $(findstring globalhs,$(GLOBALHS_TAG))     TAGCHECK := $(findstring globalhs,$(GLOBALHS_TAG))
     ifeq ($(TAGCHECK),)     ifeq ($(TAGCHECK),)
       $(warning $(GHSWARNING1))        $(error $(GHSWARNING1))
     endif     endif
   else   else
     GHSMODLIST_SOCK := $(GLOBALHSMODLIST:%=%_sock)     GHSMODLIST_SOCK := $(GLOBALHSMODLIST:%=%_sock)
Line 73  ifeq ($(GLOBALHSTAGOVERRIDE),)
Line 73  ifeq ($(GLOBALHSTAGOVERRIDE),)
     ifneq ($(GHSTARGETTEST),)     ifneq ($(GHSTARGETTEST),)
       GLOBALHS_TAG := $(shell $(SRCDIR)/proj/globalhs/scripts/checkglobalhstags $(SRCDIR))       GLOBALHS_TAG := $(shell $(SRCDIR)/proj/globalhs/scripts/checkglobalhstags $(SRCDIR))
       ifeq ($(GLOBALHS_TAG),)       ifeq ($(GLOBALHS_TAG),)
         $(warning $(GHSWARNING3))          $(error $(GHSWARNING3))
       endif       endif
       TAGCHECK := $(findstring globalhs,$(GLOBALHS_TAG))       TAGCHECK := $(findstring globalhs,$(GLOBALHS_TAG))
       ifeq ($(TAGCHECK),)       ifeq ($(TAGCHECK),)
         $(warning $(GHSWARNING1))          $(error $(GHSWARNING1))
       endif       endif
     endif     endif
   endif   endif
Line 85  else
Line 85  else
   GLOBALHS_TAG := $(GLOBALHSTAGOVERRIDE)   GLOBALHS_TAG := $(GLOBALHSTAGOVERRIDE)
   TAGCHECK := $(findstring globalhs,$(GLOBALHS_TAG))   TAGCHECK := $(findstring globalhs,$(GLOBALHS_TAG))
   ifeq ($(TAGCHECK),)   ifeq ($(TAGCHECK),)
     $(warning $(GHSWARNING2))      $(error $(GHSWARNING2))
   endif   endif
 endif endif
  


Legend:
Removed from v.1.12  
changed lines
  Added in v.1.13

Karen Tian
Powered by
ViewCVS 0.9.4