ooo-build r14173 - in branches/ooo-build-3-0: . patches/dev300

[thorstenb svn gnome org]

Author: thorstenb
Date: Wed Oct  1 14:34:59 2008
New Revision: 14173
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14173&view=rev

Log:
    * patches/dev300/apply:
    * patches/dev300/solenv-silent-mac-build.diff:
    Make mac build silent also on objective c files



Added:
   branches/ooo-build-3-0/patches/dev300/solenv-silent-mac-build.diff
Modified:
   branches/ooo-build-3-0/ChangeLog
   branches/ooo-build-3-0/patches/dev300/apply

Modified: branches/ooo-build-3-0/patches/dev300/apply
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/apply	(original)
+++ branches/ooo-build-3-0/patches/dev300/apply	Wed Oct  1 14:34:59 2008
@@ -2662,6 +2662,7 @@
 vcl-fix-gtk-fullscreen-crash.diff, i#93805, dtardon
 timely-canvas-disposing.diff, i#94007, thorsten
 jurt-jnilib-deliver.diff, i#93516, thorsten
+solenv-silent-mac-build.diff, thorsten
 
 [ Fixes < dev300-m30 < ooo300-m3 ]
 pdfimport-system-poppler-m29.diff, i#92920, cmc

Added: branches/ooo-build-3-0/patches/dev300/solenv-silent-mac-build.diff
==============================================================================
--- (empty file)
+++ branches/ooo-build-3-0/patches/dev300/solenv-silent-mac-build.diff	Wed Oct  1 14:34:59 2008
@@ -0,0 +1,22 @@
+--- solenv/inc/rules.mk
++++ solenv/inc/rules.mk
+@@ -459,15 +459,17 @@ not_existing$/o_%.dpcc : %.c;@noop $(assign all_local_obj+:=$<)
+ 
+ # Objective-C++ files
+ $(OBJ)$/%.obj : %.mm
++.IF "$(QUIET_BUILD)"==""
+ 	@echo ------------------------------
++.ENDIF
+ 	@echo Making: $@
+ .IF "$(OS)"=="MACOSX"
+ .IF "$(TEST)"!=""
+ 	$(objcpp) $(CFLAGS) $(INCLUDE) $(CFLAGSCC) $(OBJCXXFLAGS) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $*.mm
+ .ELSE
+ 	@$(RM) $@ $(@:s/.obj/.o/)
+-	$(objcpp) $(CFLAGS) $(INCLUDE) $(CFLAGSCC) $(OBJCXXFLAGS) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $*.mm
+-	$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
++	$(QUIET_BUILD) $(objcpp) $(CFLAGS) $(INCLUDE) $(CFLAGSCC) $(OBJCXXFLAGS) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $*.mm
++	$(QUIET_BUILD) $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
+ .ENDIF
+ .IF "$(nodep)"==""
+ 	$(MAKEDEPEND) @$(mktmp -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< ) > $(MISC)$/o_$(@:f:s/.obj/.dpcc/)