Print this page
*** NO COMMENTS ***

Split Close
Expand all
Collapse all
          --- old/usr/src/tools/Makefile.python
          +++ new/usr/src/tools/Makefile.python
↓ open down ↓ 55 lines elided ↑ open up ↑
  56   56  #    PYVERSOBJS  - The list of paths to compiled python build products,
  57   57  #                  including their subdirectory.
  58   58  #
  59   59  #    pyclobber   - A target on which 'clobber' should depend, which
  60   60  #                  removes the per-version python directories and the
  61   61  #                  output within them.
  62   62  #
  63   63  
  64   64  PYFILES = $(PYSRCS) $(PYOBJS)
  65   65  
  66      -ROOTPYDIR_24 = $(PYTOPDIR)/python2.4/$(PYMODDIR)
  67      -ROOTPYFILES_24 = $(PYFILES:%=$(ROOTPYDIR_24)/%)
  68      -
  69   66  ROOTPYDIR_26 = $(PYTOPDIR)/python2.6/$(PYMODDIR)
  70   67  ROOTPYFILES_26  = $(PYFILES:%=$(ROOTPYDIR_26)/%)
  71   68  
  72      -ROOTPYFILES = $(ROOTPYFILES_24) $(ROOTPYFILES_26)
       69 +ROOTPYFILES = $(ROOTPYFILES_26)
  73   70  $(ROOTPYFILES) := FILEMODE = 0444
  74   71  
  75      -PYVERSDIRS = python2.4 python2.6
       72 +PYVERSDIRS = python2.6
  76   73  
  77      -PY24OBJS = $(PYOBJS:%=python2.4/%)
  78      -$(PY24OBJS) := PYTHON = $(PYTHON_24)
  79      -
  80   74  PY26OBJS = $(PYOBJS:%=python2.6/%)
  81   75  $(PY26OBJS) := PYTHON = $(PYTHON_26)
  82   76  
  83      -PYVERSOBJS = $(PY24OBJS) $(PY26OBJS)
       77 +PYVERSOBJS = $(PY26OBJS)
  84   78  
  85   79  CLOBBERFILES += $(PYVERSOBJS)
  86   80  CLOBBERDIRS += $(PYVERSDIRS)
  87   81  
  88   82  .KEEP_STATE:
  89   83  
  90      -python2.4/%.pyc python2.6/%.pyc: %.py
       84 +python2.6/%.pyc: %.py
  91   85          @[ -d $(@D) ] || mkdir $(@D)
  92   86          $(RM) $@
  93   87          $(PYTHON) -mpy_compile $<
  94   88          $(MV) $(*).pyc $@
  95   89  
  96      -$(ROOTPYDIR_24)/%.pyc: python2.4/%.pyc
  97      -        $(INS.pyfile)
  98      -
  99   90  $(ROOTPYDIR_26)/%.pyc: python2.6/%.pyc
 100   91          $(INS.pyfile)
 101   92  
 102      -$(ROOTPYDIR_24)/%.py $(ROOTPYDIR_26)/%.py: %.py
       93 +$(ROOTPYDIR_26)/%.py: %.py
 103   94          $(INS.pyfile)
 104   95  
 105   96  pyclobber:
 106   97          $(RM) $(CLOBBERFILES)
 107   98          $(RM) -rf $(CLOBBERDIRS)
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX