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

Diff for /JSOC/target.mk between version 1.7 and 1.15

version 1.7, 2008/04/18 21:31:05 version 1.15, 2009/09/27 06:28:45
Line 10  ifndef JSOC_MACHINE
Line 10  ifndef JSOC_MACHINE
   export JSOC_MACHINE   export JSOC_MACHINE
 endif endif
  
 OBJDIR          := _$(JSOC_MACHINE)  ifeq ($(MACH),)
   MACH = $(JSOC_MACHINE)
   endif
   
   OBJDIR          := _$(MACH)
 PROJOBJDIR      := $(OBJDIR)/proj PROJOBJDIR      := $(OBJDIR)/proj
  
 all:    $(PROJOBJDIR) $(OBJDIR) all:    $(PROJOBJDIR) $(OBJDIR)
Line 18  all: $(PROJOBJDIR) $(OBJDIR)
Line 22  all: $(PROJOBJDIR) $(OBJDIR)
 # Define the rules to build in the target subdirectories. # Define the rules to build in the target subdirectories.
 # #
 MAKETARGET = $(MAKE) --no-print-directory -C $@ -f $(CURDIR)/Makefile \ MAKETARGET = $(MAKE) --no-print-directory -C $@ -f $(CURDIR)/Makefile \
                 SRCDIR=$(CURDIR) $(MAKECMDGOALS)                  SRCDIR=$(WORKINGDIR) $(MAKECMDGOALS)
  
 .PHONY: $(PROJOBJDIR) $(OBJDIR) .PHONY: $(PROJOBJDIR) $(OBJDIR)
  
Line 26  MAKETARGET = $(MAKE) --no-print-director
Line 30  MAKETARGET = $(MAKE) --no-print-director
 -include $(CURDIR)/proj/target.mk -include $(CURDIR)/proj/target.mk
  
 $(OBJDIR): $(OBJDIR):
         +@[ -d bin/$(JSOC_MACHINE) ] || mkdir -p bin/$(JSOC_MACHINE)          +@[ -d bin/$(MACH) ] || mkdir -p bin/$(MACH)
         +@[ -d lib/$(JSOC_MACHINE) ] || mkdir -p lib/$(JSOC_MACHINE)          +@[ -d lib/$(MACH) ] || mkdir -p lib/$(MACH)
         +@[ -d $@ ] || mkdir -p $@         +@[ -d $@ ] || mkdir -p $@
         +@[ -d $@/base/drms/apps ] || mkdir -p $@/base/drms/apps         +@[ -d $@/base/drms/apps ] || mkdir -p $@/base/drms/apps
         +@[ -d $@/base/drms/libs/api/client ] || mkdir -p $@/base/drms/libs/api/client         +@[ -d $@/base/drms/libs/api/client ] || mkdir -p $@/base/drms/libs/api/client
Line 41  $(OBJDIR):
Line 45  $(OBJDIR):
         +@[ -d $@/base/libs/db/client ] || mkdir -p $@/base/libs/db/client         +@[ -d $@/base/libs/db/client ] || mkdir -p $@/base/libs/db/client
         +@[ -d $@/base/libs/db/client_fpic ] || mkdir -p $@/base/libs/db/client_fpic         +@[ -d $@/base/libs/db/client_fpic ] || mkdir -p $@/base/libs/db/client_fpic
         +@[ -d $@/base/libs/db/server ] || mkdir -p $@/base/libs/db/server         +@[ -d $@/base/libs/db/server ] || mkdir -p $@/base/libs/db/server
           +@[ -d $@/base/libs/defs/fpic ] || mkdir -p $@/base/libs/defs/fpic
         +@[ -d $@/base/libs/dstruct/fpic ] || mkdir -p $@/base/libs/dstruct/fpic         +@[ -d $@/base/libs/dstruct/fpic ] || mkdir -p $@/base/libs/dstruct/fpic
         +@[ -d $@/base/libs/ricecomp/fpic ] || mkdir -p $@/base/libs/ricecomp/fpic         +@[ -d $@/base/libs/ricecomp/fpic ] || mkdir -p $@/base/libs/ricecomp/fpic
         +@[ -d $@/base/libs/inthandles ] || mkdir -p $@/base/libs/inthandles         +@[ -d $@/base/libs/inthandles ] || mkdir -p $@/base/libs/inthandles
Line 48  $(OBJDIR):
Line 53  $(OBJDIR):
         +@[ -d $@/base/libs/timeio/fpic ] || mkdir -p $@/base/libs/timeio/fpic         +@[ -d $@/base/libs/timeio/fpic ] || mkdir -p $@/base/libs/timeio/fpic
         +@[ -d $@/base/libs/misc/fpic ] || mkdir -p $@/base/libs/misc/fpic         +@[ -d $@/base/libs/misc/fpic ] || mkdir -p $@/base/libs/misc/fpic
         +@[ -d $@/base/libs/fitsrw/fpic ] || mkdir -p $@/base/libs/fitsrw/fpic         +@[ -d $@/base/libs/fitsrw/fpic ] || mkdir -p $@/base/libs/fitsrw/fpic
           +@[ -d $@/base/libs/errlog ] || mkdir -p $@/base/libs/errlog
         +@[ -d $@/base/local/libs/dsds ] || mkdir -p $@/base/local/libs/dsds         +@[ -d $@/base/local/libs/dsds ] || mkdir -p $@/base/local/libs/dsds
         +@[ -d $@/base/local/libs/soi ] || mkdir -p $@/base/local/libs/soi         +@[ -d $@/base/local/libs/soi ] || mkdir -p $@/base/local/libs/soi
         +@[ -d $@/base/sums/apps ] || mkdir -p $@/base/sums/apps         +@[ -d $@/base/sums/apps ] || mkdir -p $@/base/sums/apps
Line 82  Makefile : ;
Line 88  Makefile : ;
 # #
 .PHONY: clean .PHONY: clean
 clean: clean:
         rm -rf $(OBJDIR); rm -rf bin/$(JSOC_MACHINE); rm -rf lib/$(JSOC_MACHINE)          rm -rf $(OBJDIR); rm -rf bin/$(MACH); rm -rf lib/$(MACH)
  


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

Karen Tian
Powered by
ViewCVS 0.9.4