BuildSystem: added 'make pkg.clean'

git-svn-id: svn://localhost/HandBrake/trunk@2573 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/pkg/darwin/module.defs b/pkg/darwin/module.defs
index 8c88e7d..719c296 100644 (file)
--- a/pkg/darwin/module.defs
+++ b/pkg/darwin/module.defs
@@ -4,8 +4,8 @@ PKG.gui.dmg = $(PKG.out/)$(HB.name)-$(HB.version)-MacOSX.5_GUI_$(BUILD.machine).
 PKG.cli.tmp.dmg = $(PKG.out/)$(HB.name)-$(HB.version)-MacOSX.5_CLI_$(BUILD.machine).tmp.dmg
 PKG.gui.tmp.dmg = $(PKG.out/)$(HB.name)-$(HB.version)-MacOSX.5_GUI_$(BUILD.machine).tmp.dmg
 
-STAGE.cli/ = $(BUILD/)stage/cli/
-STAGE.gui/ = $(BUILD/)stage/gui/
+STAGE.out.cli/ = $(STAGE.out/)cli/
+STAGE.out.gui/ = $(STAGE.out/)gui/
 
 PKG.appcast = $(PKG.out/)$(notdir $(HB.url.appcast))
 

diff --git a/pkg/darwin/module.rules b/pkg/darwin/module.rules
index 7ddaf11..9091c07 100644 (file)
--- a/pkg/darwin/module.rules
+++ b/pkg/darwin/module.rules
@@ -11,17 +11,17 @@ $(PKG.appcast): $(PKG.in/)appcast.xml.m4
            $(PKG.in/)appcast.xml.m4 > $@
 
 $(PKG.cli.dmg): | $(dir $(PKG.cli.dmg))
-$(PKG.cli.dmg): | $(STAGE.cli/)
-       hdiutil create -srcfolder $(STAGE.cli/) -format UDRO -mode 755 \
+$(PKG.cli.dmg): | $(STAGE.out.cli/)
+       hdiutil create -srcfolder $(STAGE.out.cli/) -format UDRO -mode 755 \
            -volname $(basename $(notdir $@)) \
            -ov $(PKG.cli.tmp.dmg)
        hdiutil convert -format UDBZ -o $@ $(PKG.cli.tmp.dmg)
        $(RM.exe) $(PKG.cli.tmp.dmg)
 
 $(PKG.gui.dmg): | $(dir $(PKG.gui.dmg))
-$(PKG.gui.dmg): | $(STAGE.gui/)
+$(PKG.gui.dmg): | $(STAGE.out.gui/)
 ifeq (1-darwin,$(FEATURE.xcode)-$(BUILD.system))
-       hdiutil create -srcfolder $(STAGE.gui/) -format UDRO -mode 755 \
+       hdiutil create -srcfolder $(STAGE.out.gui/) -format UDRO -mode 755 \
            -volname $(basename $(notdir $@)) \
            -ov $(PKG.gui.tmp.dmg)
        hdiutil convert -format UDBZ -o $@ $(PKG.gui.tmp.dmg)
@@ -30,33 +30,25 @@ else
        $(TOUCH.exe) $@
 endif
 
-pkg.cli.clean:
-       $(RM.exe) -fr $(STAGE.cli/)
-       $(RM.exe) $(PKG.cli.dmg)
-
-pkg.gui.clean:
-       $(RM.exe) -fr $(STAGE.gui/)
-       $(RM.exe) $(PKG.gui.dmg)
-
-$(STAGE.cli/):
+$(STAGE.out.cli/):
        $(MKDIR.exe) -p $@
 ifeq (1-darwin,$(FEATURE.xcode)-$(BUILD.system))
-       $(CP.exe) $(BUILD/)HandBrakeCLI $(STAGE.cli/)
-       $(call STAGE.doc,$(STAGE.cli/))
+       $(CP.exe) $(BUILD/)HandBrakeCLI $(STAGE.out.cli/)
+       $(call STAGE.doc,$(STAGE.out.cli/))
 else
        $(CP.exe) $(TEST.exe) $(STAGE.cli/)
-       $(call STAGE.doc,$(STAGE.cli/))
+       $(call STAGE.doc,$(STAGE.out.cli/))
 endif
 
-$(STAGE.gui/):
+$(STAGE.out.gui/):
        $(MKDIR.exe) -p $@
 ifeq (1-darwin,$(FEATURE.xcode)-$(BUILD.system))
-       $(CP.exe) -R $(BUILD/)HandBrake.app $(STAGE.gui/)
+       $(CP.exe) -R $(BUILD/)HandBrake.app $(STAGE.out.gui/)
        $(LIPO.exe) -thin $(BUILD.arch) \
            $(SRC/)macosx/Growl.framework/Versions/A/Growl \
-           -output $(STAGE.gui/)HandBrake.app/Contents/Frameworks/Growl.framework/Versions/A/Growl
+           -output $(STAGE.out.gui/)HandBrake.app/Contents/Frameworks/Growl.framework/Versions/A/Growl
        $(LIPO.exe) -thin $(BUILD.arch) \
            $(SRC/)macosx/Sparkle.framework/Versions/A/Sparkle \
-           -output $(STAGE.gui/)HandBrake.app/Contents/Frameworks/Sparkle.framework/Versions/A/Sparkle
-       $(call STAGE.doc,$(STAGE.gui/))
+           -output $(STAGE.out.gui/)HandBrake.app/Contents/Frameworks/Sparkle.framework/Versions/A/Sparkle
+       $(call STAGE.doc,$(STAGE.out.gui/))
 endif

diff --git a/pkg/module.defs b/pkg/module.defs
index 6a22810..97020d9 100644 (file)
--- a/pkg/module.defs
+++ b/pkg/module.defs
@@ -5,7 +5,8 @@ PKG.out/ = $(BUILD/)pkg/
 
 PKG.src.tar.bz2 = $(PKG.out/)$(HB.name)-$(HB.version).tar.bz2
 
-STAGE.src/ = $(BUILD/)stage/src/
+STAGE.out/     = $(BUILD/)stage/
+STAGE.out.src/ = $(STAGE.out/)src/
 
 ###############################################################################
 

diff --git a/pkg/module.rules b/pkg/module.rules
index 6660d9f..90412eb 100644 (file)
--- a/pkg/module.rules
+++ b/pkg/module.rules
@@ -6,11 +6,15 @@ $(eval $(call import.MODULE.rules,PKG))
 
 pkg.create:: $(PKG.src.tar.bz2)
 
+pkg.clean:
+       $(RM.exe) -fr $(STAGE.out/)
+       $(RM.exe) -fr $(PKG.out/)
+
 $(PKG.src.tar.bz2): | $(dir $(PKG.src.tar.bz2))
-$(PKG.src.tar.bz2): | $(STAGE.src/)
-       $(TAR.exe) cjf $@ -C $(STAGE.src/) .
+$(PKG.src.tar.bz2): | $(STAGE.out.src/)
+       $(TAR.exe) cjf $@ -C $(STAGE.out.src/) .
 
-$(STAGE.src/):
+$(STAGE.out.src/):
        svn export -r$(HB.repo.rev) $(HB.repo.url) $@/$(HB.name)-$(HB.version)
 
 ###############################################################################