[Libreoffice-commits] .: solenv/gbuild

[Libreoffice Gerrit user]

 solenv/gbuild/UnoApiTarget.mk |   19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

New commits:
commit b7afe94667d4acd1979fb0aff32b8b55d617dfbc
Author: Tor Lillqvist <tml at iki.fi>
Date:   Thu Aug 30 10:18:28 2012 +0300

    Make verbose make output more informative for cppumaker commands
    
    Put only the presumably not so interesting long list of input files
    into the response file, have options (which might be what one wants to
    see if using verbose=t) on the command line as such.
    
    Change-Id: Ia73614744f4fba65bc47dc463197941e65eae78f

diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk
index 87fd57b..7e44d06 100644
--- a/solenv/gbuild/UnoApiTarget.mk
+++ b/solenv/gbuild/UnoApiTarget.mk
@@ -56,11 +56,12 @@ define gb_UnoApiPartTarget__command
 	$(call gb_Output_announce,$(2),$(true),IDL,2)
 	mkdir -p $(call gb_UnoApiPartTarget_get_target,$(dir $(2))) && \
 	RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),500,\
+		$(sort $(patsubst $(call gb_UnoApiPartTarget_get_target,%.urd),$(SRCDIR)/%.idl,$(3)))) && \
+	$(gb_UnoApiPartTarget_IDLCCOMMAND) \
 		$(INCLUDE) \
 		-M $(basename $(call gb_UnoApiPartTarget_get_dep_target,$(dir $(2)))) \
 		-O $(call gb_UnoApiPartTarget_get_target,$(dir $(2))) -verbose \
-		$(sort $(patsubst $(call gb_UnoApiPartTarget_get_target,%.urd),$(SRCDIR)/%.idl,$(3)))) && \
-	$(gb_UnoApiPartTarget_IDLCCOMMAND) @$${RESPONSEFILE} > /dev/null && \
+		@$${RESPONSEFILE} > /dev/null && \
 	rm -f $${RESPONSEFILE} && \
 	touch $(1)
 
@@ -276,12 +277,14 @@ gb_UnoApiHeadersTarget_CPPUMAKERTARGET := $(call gb_Executable_get_target_for_bu
 gb_UnoApiHeadersTarget_CPPUMAKERCOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_UnoApiHeadersTarget_CPPUMAKERTARGET)
 
 define gb_UnoApiHeadersTarget__command
-RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),100,\
-	-Gc $(4) -BUCR \
-	-O$(3) $(call gb_UnoApiTarget_get_target,$(2)) $(UNOAPI_DEPS)) && \
-$(gb_UnoApiHeadersTarget_CPPUMAKERCOMMAND) @$${RESPONSEFILE} && \
-rm -f $${RESPONSEFILE} && \
-touch $(1)
+	RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),100,\
+		$(UNOAPI_DEPS)) && \
+	$(gb_UnoApiHeadersTarget_CPPUMAKERCOMMAND) \
+		-Gc $(4) -BUCR \
+		-O$(3) $(call gb_UnoApiTarget_get_target,$(2)) \
+		@$${RESPONSEFILE} && \
+	rm -f $${RESPONSEFILE} && \
+	touch $(1)
 
 endef