Changeset 315201d


Ignore:
Timestamp:
03/05/09 08:58:30 (7 years ago)
Author:
konablend <kona8lend@…>
Branches:
master
Children:
10064df
Parents:
d9cbd469
Message:

BuildSystem?:

  • fixed race condition where bzip2,xvidcore may fail on missing contrib/{lib,include} dirs.
  • replaced literal command uses with var in bzip2,xvidcore .

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2224 b64f7644-9d1e-0410-96f1-a4d463321fa5

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • contrib/bzip2/module.defs

    rd9cbd469 r315201d  
    1414
    1515define BZIP2.INSTALL
    16     mkdir -p $(CONTRIB.build/)lib/ $(CONTRIB.build/)include/
    17     cp $(BZIP2.EXTRACT.dir/)libbz2.a $(CONTRIB.build/)lib/
    18     cp $(BZIP2.EXTRACT.dir/)bzlib.h $(CONTRIB.build/)include/
     16    $(CP.exe) $(BZIP2.EXTRACT.dir/)libbz2.a $(CONTRIB.build/)lib/
     17    $(CP.exe) $(BZIP2.EXTRACT.dir/)bzlib.h $(CONTRIB.build/)include/
    1918    $(TOUCH.exe) $@
    2019endef
    2120
    2221define BZIP2.UNINSTALL
    23     rm $(CONTRIB.build/)lib/libbz2.a
    24     rm $(CONTRIB.build/)include/bzlib.h
     22    $(RM.exe) $(CONTRIB.build/)lib/libbz2.a
     23    $(RM.exe) $(CONTRIB.build/)include/bzlib.h
    2524    $(RM.exe) -f $(BZIP2.INSTALL.target)
    2625endef
  • contrib/xvidcore/module.defs

    rd9cbd469 r315201d  
    1111
    1212define XVIDCORE.INSTALL
    13     cp $(XVIDCORE.EXTRACT.dir/)build/generic/=build/libxvidcore.a $(CONTRIB.build/)lib/
    14     cp $(XVIDCORE.EXTRACT.dir/)src/xvid.h $(CONTRIB.build/)include/
     13    $(CP.exe) $(XVIDCORE.EXTRACT.dir/)build/generic/=build/libxvidcore.a $(CONTRIB.build/)lib/
     14    $(CP.exe) $(XVIDCORE.EXTRACT.dir/)src/xvid.h $(CONTRIB.build/)include/
    1515    $(TOUCH.exe) $@
    1616endef
    1717
    1818define XVIDCORE.UNINSTALL
    19     rm $(CONTRIB.build/)lib/libxvidcore.a
    20     rm $(CONTRIB.build/)include/xvid.h
     19    $(RM.exe) $(CONTRIB.build/)lib/libxvidcore.a
     20    $(RM.exe) $(CONTRIB.build/)include/xvid.h
    2121    $(RM.exe) -f $(XVIDCORE.INSTALL.target)
    2222endef
  • make/include/contrib.defs

    rd9cbd469 r315201d  
    127127    $(1).INSTALL.args.dir = -C $$(1) install
    128128
     129    $(1).INSTALL.mkdirs = $$(CONTRIB.build/)lib/ $$(CONTRIB.build/)include/
    129130    $(1).INSTALL.target = $$($(1).build/).stamp.install
    130131    define $(1).INSTALL
     
    174175    $(1).out += $$($(1).CONFIGURE.target)
    175176    $(1).out += $$($(1).BUILD.target)
     177    $(1).out += $$($(1).INSTALL.mkdirs)
    176178    $(1).out += $$($(1).INSTALL.target)
    177179
     
    262264$($(1).name).install: $$($(1).INSTALL.target)
    263265
    264 $$($(1).INSTALL.target): | $$(dir $$($(1).INSTALL.target))
     266$$($(1).INSTALL.target): | $$(dir $$($(1).INSTALL.target)) $$($(1).INSTALL.mkdirs)
    265267$$($(1).INSTALL.target): $$($(1).BUILD.target)
    266268        $$($(1).INSTALL)
Note: See TracChangeset for help on using the changeset viewer.