[Libreoffice-commits] .: Branch 'feature/gbuild_ure' - 2 commits - cli_ure/Package_config.mk solenv/gbuild

[David Tardon]

 cli_ure/Package_config.mk   |    2 +-
 solenv/gbuild/CliLibrary.mk |    8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

New commits:
commit 3a17a4a170af54c3b457cb2950e49d2319ac42b5
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Mon Aug 6 10:51:43 2012 +0200

    add missing package name
    
    Change-Id: I0f561c41c4e0a447521aae90885f3a75b624d7cb

diff --git a/cli_ure/Package_config.mk b/cli_ure/Package_config.mk
index 820f25e..175fd33 100644
--- a/cli_ure/Package_config.mk
+++ b/cli_ure/Package_config.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Package_Package,cli_ure_cliuno,$(SRCDIR)/cli_ure/source))
 
-$(eval $(call gb_Package_add_files,bin,\
+$(eval $(call gb_Package_add_files,cli_ure_cliuno,bin,\
 	climaker/climaker.exe.config \
 	cliuno.snk \
 ))
commit 6be4b08aa2055ffb40f1727d3657f4a7634d33b9
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Mon Aug 6 10:50:51 2012 +0200

    fix make syntax
    
    Change-Id: I0cf922c1bccb554491ea8501c9f217af486088b6

diff --git a/solenv/gbuild/CliLibrary.mk b/solenv/gbuild/CliLibrary.mk
index 36352b7..62c9d78 100644
--- a/solenv/gbuild/CliLibrary.mk
+++ b/solenv/gbuild/CliLibrary.mk
@@ -20,17 +20,15 @@ gb_CliLibraryTarget_CSCFLAGS_DEBUG := \
 	-define:DEBUG \
 	-define:TRACE \
 
-define gb_CliLibraryTarget__get_csflags
 ifeq ($(strip $(debug)),)
 ifeq ($(strip $(PRODUCT)),)
-$(gb_CliLibraryTarget_CSCFLAGS) $(gb_CliLibraryTarget_CSCFLAGS_DEBUG)
+gb_CliLibraryTarget__get_csflags = $(gb_CliLibraryTarget_CSCFLAGS) $(gb_CliLibraryTarget_CSCFLAGS_DEBUG)
 else
-$(gb_CliLibraryTarget_CSCFLAGS) -o
+gb_CliLibraryTarget__get_csflags = $(gb_CliLibraryTarget_CSCFLAGS) -o
 endif
 else
-$(gb_CliLibraryTarget_CSCFLAGS) $(gb_CliLibraryTarget_CSCFLAGS_DEBUG) -debug+
+gb_CliLibraryTarget__get_csflags = $(gb_CliLibraryTarget_CSCFLAGS) $(gb_CliLibraryTarget_CSCFLAGS_DEBUG) -debug+
 endif
-endef
 
 gb_CliLibraryTarget__get_source = $(SRCDIR)/$(1).cs
 gb_CliLibraryTarget__get_generated_source = $(WORKDIR)/$(1).cs