[ooo-build-commit] patches/dev300

[Noel Power]

 patches/dev300/quiet-build-more.diff |   24 +++++++++++------------
 patches/dev300/store-install.diff    |   36 +++++++++++++++++------------------
 2 files changed, 30 insertions(+), 30 deletions(-)

New commits:
commit 4cee71d1daaec23c4e079ed4264de893a777a9f4
Author: Noel Power <npower at linux-h0uc.site>
Date:   Tue Jun 23 18:21:55 2009 +0100

    fix tch order issues ( patches appear to have been generated in wrong order )
    
    * patches/dev300/quiet-build-more.diff:
    * patches/dev300/store-install.diff:

diff --git a/patches/dev300/quiet-build-more.diff b/patches/dev300/quiet-build-more.diff
index 695ce0f..afc1a54 100644
--- a/patches/dev300/quiet-build-more.diff
+++ b/patches/dev300/quiet-build-more.diff
@@ -772,43 +772,43 @@ index 635da62..75b4802 100644
  $(LOCALDBTARGET) : $(URDFILES) $(DEPIDLFILES)
 -	$(IDLC) @$(mktmp $(IDLCFLAGS) $(UNOIDLDEFS) $(UNOIDLINCEXTRA) $(UNOIDLINC) -O$(OUT)$/ucr$/$(IDLPACKAGE) $(all_outdated_idl))
 -	-$(RM) $@
--	$(REGMERGE) $(REGMERGEFLAGS) $@ UCR @$(mktmp $(URDFILES))
+-	$(REGMERGE) $@ UCR @$(mktmp $(URDFILES))
 +	$(QUIET_BUILD) $(IDLC) @$(mktmp $(IDLCFLAGS) $(UNOIDLDEFS) $(UNOIDLINCEXTRA) $(UNOIDLINC) -O$(OUT)$/ucr$/$(IDLPACKAGE) $(all_outdated_idl))
 +	@-$(RM) $@
-+	$(QUIET_BUILD) $(REGMERGE) $(REGMERGEFLAGS) $@ UCR @$(mktmp $(URDFILES))
++	$(QUIET_BUILD) $(REGMERGE) $@ UCR @$(mktmp $(URDFILES))
  .ENDIF
  
  .IF "$(LOCALDOCDBTARGET)"!=""
  $(LOCALDOCDBTARGET) : $(URDDOCFILES) $(DEPIDLFILES)
 -	$(IDLC) @$(mktmp $(IDLCFLAGS) $(UNOIDLDEFS) $(UNOIDLINCEXTRA) $(UNOIDLINC) -C -O$(OUT)$/ucrdoc$/$(IDLPACKAGE) $(all_outdated_idl))
 -	-$(RM) $@
--	$(REGMERGE) $(REGMERGEFLAGS) $@ UCR @$(mktmp $(URDDOCFILES))
+-	$(REGMERGE) $@ UCR @$(mktmp $(URDDOCFILES))
 +	$(QUIET_BUILD) $(IDLC) @$(mktmp $(IDLCFLAGS) $(UNOIDLDEFS) $(UNOIDLINCEXTRA) $(UNOIDLINC) -C -O$(OUT)$/ucrdoc$/$(IDLPACKAGE) $(all_outdated_idl))
 +	@-$(RM) $@
-+	$(QUIET_BUILD) $(REGMERGE) $(REGMERGEFLAGS) $@ UCR @$(mktmp $(URDDOCFILES))
++	$(QUIET_BUILD) $(REGMERGE) $@ UCR @$(mktmp $(URDDOCFILES))
  .ENDIF
  
  .IF "$(UNOIDLDBTARGET)"!=""
  $(UNOIDLDBTARGET) : $(UNOIDLDBFILES) $(UNOIDLDBREGS)
 -	-$(RM) $@
--	$(REGMERGE) $(REGMERGEFLAGS) $@ / @$(mktmp $(UNOIDLDBFILES) $(UNOIDLDBREGS))
+-	$(REGMERGE) $@ / @$(mktmp $(UNOIDLDBFILES) $(UNOIDLDBREGS))
 +	@-$(RM) $@
-+	$(QUIET_BUILD) $(REGMERGE) $(REGMERGEFLAGS) $@ / @$(mktmp $(UNOIDLDBFILES) $(UNOIDLDBREGS))
++	$(QUIET_BUILD) $(REGMERGE) $@ / @$(mktmp $(UNOIDLDBFILES) $(UNOIDLDBREGS))
  .IF "$(LOCALREGDB)"!=""
--	$(REGMERGE) $(REGMERGEFLAGS) $(LOCALREGDB) / $@
-+	$(QUIET_BUILD) $(REGMERGE) $(REGMERGEFLAGS) $(LOCALREGDB) / $@
+-	$(REGMERGE) $(LOCALREGDB) / $@
++	$(QUIET_BUILD) $(REGMERGE) $(LOCALREGDB) / $@
  .ENDIF
  .ENDIF			# "$(UNOIDLDBTARGET)"!=""
  
  .IF "$(UNOIDLDBDOCTARGET)"!=""
  $(UNOIDLDBDOCTARGET) : $(UNOIDLDBDOCFILES) $(UNOIDLDBDOCREGS)
 -	-$(RM) $@
--	$(REGMERGE) $(REGMERGEFLAGS) $@ / @$(mktmp $(UNOIDLDBDOCFILES) $(UNOIDLDBDOCREGS))
+-	$(REGMERGE) $@ / @$(mktmp $(UNOIDLDBDOCFILES) $(UNOIDLDBDOCREGS))
 +	@-$(RM) $@
-+	$(QUIET_BUILD) $(REGMERGE) $(REGMERGEFLAGS) $@ / @$(mktmp $(UNOIDLDBDOCFILES) $(UNOIDLDBDOCREGS))
++	$(QUIET_BUILD) $(REGMERGE) $@ / @$(mktmp $(UNOIDLDBDOCFILES) $(UNOIDLDBDOCREGS))
  .IF "$(LOCALREGDB)"!=""
--	$(REGMERGE) $(REGMERGEFLAGS) $(LOCALREGDB) / $@
-+	$(QUIET_BUILD) $(REGMERGE) $(REGMERGEFLAGS) $(LOCALREGDB) / $@
+-	$(REGMERGE) $(LOCALREGDB) / $@
++	$(QUIET_BUILD) $(REGMERGE) $(LOCALREGDB) / $@
  .ENDIF
  .ENDIF			# "$(UNOIDLDBDOCTARGET)"!=""
  
diff --git a/patches/dev300/store-install.diff b/patches/dev300/store-install.diff
index 63e214c..5427f29 100644
--- a/patches/dev300/store-install.diff
+++ b/patches/dev300/store-install.diff
@@ -45,39 +45,39 @@
 +++ solenv/inc/target.mk	2009-04-06 16:42:11.000000000 +0000
 @@ -1402,31 +1402,31 @@ makedoc:
  $(LOCALDBTARGET) : $(URDFILES) $(DEPIDLFILES)
- 	$(IDLC) @$(mktmp $(IDLCFLAGS) $(UNOIDLDEFS) $(UNOIDLINCEXTRA) $(UNOIDLINC) -O$(OUT)$/ucr$/$(IDLPACKAGE) $(all_outdated_idl))
- 	-$(RM) $@
--	$(REGMERGE) $@ UCR @$(mktmp $(URDFILES))
-+	$(REGMERGE) $(REGMERGEFLAGS) $@ UCR @$(mktmp $(URDFILES))
+ 	$(QUIET_BUILD) $(IDLC) @$(mktmp $(IDLCFLAGS) $(UNOIDLDEFS) $(UNOIDLINCEXTRA) $(UNOIDLINC) -O$(OUT)$/ucr$/$(IDLPACKAGE) $(all_outdated_idl))
+ 	@-$(RM) $@
+-	$(QUIET_BUILD) $(REGMERGE) $@ UCR @$(mktmp $(URDFILES))
++	$(QUIET_BUILD) $(REGMERGE) $(REGMERGEFLAGS) $@ UCR @$(mktmp $(URDFILES))
  .ENDIF
  
  .IF "$(LOCALDOCDBTARGET)"!=""
  $(LOCALDOCDBTARGET) : $(URDDOCFILES) $(DEPIDLFILES)
- 	$(IDLC) @$(mktmp $(IDLCFLAGS) $(UNOIDLDEFS) $(UNOIDLINCEXTRA) $(UNOIDLINC) -C -O$(OUT)$/ucrdoc$/$(IDLPACKAGE) $(all_outdated_idl))
- 	-$(RM) $@
--	$(REGMERGE) $@ UCR @$(mktmp $(URDDOCFILES))
-+	$(REGMERGE) $(REGMERGEFLAGS) $@ UCR @$(mktmp $(URDDOCFILES))
+ 	$(QUIET_BUILD) $(IDLC) @$(mktmp $(IDLCFLAGS) $(UNOIDLDEFS) $(UNOIDLINCEXTRA) $(UNOIDLINC) -C -O$(OUT)$/ucrdoc$/$(IDLPACKAGE) $(all_outdated_idl))
+ 	@-$(RM) $@
+-	$(QUIET_BUILD) $(REGMERGE) $@ UCR @$(mktmp $(URDDOCFILES))
++	$(QUIET_BUILD) $(REGMERGE) $(REGMERGEFLAGS) $@ UCR @$(mktmp $(URDDOCFILES))
  .ENDIF
  
  .IF "$(UNOIDLDBTARGET)"!=""
  $(UNOIDLDBTARGET) : $(UNOIDLDBFILES) $(UNOIDLDBREGS)
- 	-$(RM) $@
--	$(REGMERGE) $@ / @$(mktmp $(UNOIDLDBFILES) $(UNOIDLDBREGS))
-+	$(REGMERGE) $(REGMERGEFLAGS) $@ / @$(mktmp $(UNOIDLDBFILES) $(UNOIDLDBREGS))
+ 	@-$(RM) $@
+-	$(QUIET_BUILD) $(REGMERGE) $@ / @$(mktmp $(UNOIDLDBFILES) $(UNOIDLDBREGS))
++	$(QUIET_BUILD) $(REGMERGE) $(REGMERGEFLAGS) $@ / @$(mktmp $(UNOIDLDBFILES) $(UNOIDLDBREGS))
  .IF "$(LOCALREGDB)"!=""
--	$(REGMERGE) $(LOCALREGDB) / $@
-+	$(REGMERGE) $(REGMERGEFLAGS) $(LOCALREGDB) / $@
+-	$(QUIET_BUILD) $(REGMERGE) $(LOCALREGDB) / $@
++	$(QUIET_BUILD) $(REGMERGE) $(REGMERGEFLAGS) $(LOCALREGDB) / $@
  .ENDIF
  .ENDIF			# "$(UNOIDLDBTARGET)"!=""
  
  .IF "$(UNOIDLDBDOCTARGET)"!=""
  $(UNOIDLDBDOCTARGET) : $(UNOIDLDBDOCFILES) $(UNOIDLDBDOCREGS)
- 	-$(RM) $@
--	$(REGMERGE) $@ / @$(mktmp $(UNOIDLDBDOCFILES) $(UNOIDLDBDOCREGS))
-+	$(REGMERGE) $(REGMERGEFLAGS) $@ / @$(mktmp $(UNOIDLDBDOCFILES) $(UNOIDLDBDOCREGS))
+ 	@-$(RM) $@
+-	$(QUIET_BUILD) $(REGMERGE) $@ / @$(mktmp $(UNOIDLDBDOCFILES) $(UNOIDLDBDOCREGS))
++	$(QUIET_BUILD) $(REGMERGE) $(REGMERGEFLAGS) $@ / @$(mktmp $(UNOIDLDBDOCFILES) $(UNOIDLDBDOCREGS))
  .IF "$(LOCALREGDB)"!=""
--	$(REGMERGE) $(LOCALREGDB) / $@
-+	$(REGMERGE) $(REGMERGEFLAGS) $(LOCALREGDB) / $@
+-	$(QUIET_BUILD) $(REGMERGE) $(LOCALREGDB) / $@
++	$(QUIET_BUILD) $(REGMERGE) $(REGMERGEFLAGS) $(LOCALREGDB) / $@
  .ENDIF
  .ENDIF			# "$(UNOIDLDBDOCTARGET)"!=""