X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=pkg%2Fdarwin%2Fmodule.rules;h=9091c070401eb352578c43b9297b8e08ac8ea869;hb=d7389faafa327bb1be3340c34c30f353a8f52960;hp=28abb0520da7b24eeda4b6434e1288a9ff71af6c;hpb=a151ce45b9f87b3137de7547d29874341a795c38;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/pkg/darwin/module.rules b/pkg/darwin/module.rules
index 28abb052..9091c070 100644
--- a/pkg/darwin/module.rules
+++ b/pkg/darwin/module.rules
@@ -2,6 +2,7 @@ pkg.create:: $(PKG.appcast) $(PKG.cli.dmg) $(PKG.gui.dmg)
 
 
 $(PKG.appcast): | $(dir $(PKG.appcast))
+$(PKG.appcast): $(PKG.gui.dmg)
 $(PKG.appcast): $(BUILD/)project/handbrake.m4
 $(PKG.appcast): $(PKG.in/)appcast.xml.m4
 	$(M4.exe) -I$(BUILD/)project \
@@ -10,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)
@@ -29,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