[Libreoffice-commits] .: Repository.mk svx/Executable_gengal.bin.mk

[Caolán McNamara]

 Repository.mk                |    1 +
 svx/Executable_gengal.bin.mk |   23 +++++++++++++++--------
 2 files changed, 16 insertions(+), 8 deletions(-)

New commits:
commit 998e2a64971516a2a77d34c1246a98e859a3e223
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Feb 19 15:51:34 2012 +0000

    fix windows build, gengal.bin should be gengal.exe there according to scp2

diff --git a/Repository.mk b/Repository.mk
index 71697e1..35ded73 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -58,6 +58,7 @@ ifeq ($(OS),WNT)
 
 $(eval $(call gb_Helper_register_executables,OOO,\
 	crashrep_com \
+	gengal \
 	guiloader \
 	guistdio \
 	odbcconfig \
diff --git a/svx/Executable_gengal.bin.mk b/svx/Executable_gengal.bin.mk
index 36f7752..3143e5f 100644
--- a/svx/Executable_gengal.bin.mk
+++ b/svx/Executable_gengal.bin.mk
@@ -25,9 +25,16 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_Executable_Executable,gengal.bin))
+ifeq ($(OS),WNT)
+gengalbin := gengal
+else
+gengalbin := gengal.bin
+endif
+
+
+$(eval $(call gb_Executable_Executable,$(gengalbin)))
 
-$(eval $(call gb_Executable_set_include,gengal.bin,\
+$(eval $(call gb_Executable_set_include,$(gengalbin),\
     $$(INCLUDE) \
     -I$(SRCDIR)/svx/inc/ \
     -I$(SRCDIR)/svx/inc/pch \
@@ -36,11 +43,11 @@ $(eval $(call gb_Executable_set_include,gengal.bin,\
     -I$(OUTDIR)/inc/offapi \
 ))
 
-$(eval $(call gb_Executable_add_cxxflags,gengal.bin,\
+$(eval $(call gb_Executable_add_cxxflags,$(gengalbin),\
     $$(CXXFLAGS) \
 ))
 
-$(eval $(call gb_Executable_add_linked_libs,gengal.bin,\
+$(eval $(call gb_Executable_add_linked_libs,$(gengalbin),\
     sal \
     tl \
     svl \
@@ -52,16 +59,16 @@ $(eval $(call gb_Executable_add_linked_libs,gengal.bin,\
     svxcore \
 ))
 
-$(eval $(call gb_Executable_add_exception_objects,gengal.bin,\
+$(eval $(call gb_Executable_add_exception_objects,$(gengalbin),\
     svx/source/gengal/gengal \
 ))
 
-$(eval $(call gb_Executable_add_linked_static_libs,gengal.bin,\
+$(eval $(call gb_Executable_add_linked_static_libs,$(gengalbin),\
     vclmain \
 ))
 
 ifeq ($(OS),WNT)
-$(eval $(call gb_Executable_add_linked_libs,gengal.bin,\
+$(eval $(call gb_Executable_add_linked_libs,$(gengalbin),\
     kernel32 \
     msvcrt \
     oldnames \
@@ -71,7 +78,7 @@ $(eval $(call gb_Executable_add_linked_libs,gengal.bin,\
 endif
 
 ifeq ($(OS),LINUX)
-$(eval $(call gb_Executable_add_linked_libs,gengal.bin,\
+$(eval $(call gb_Executable_add_linked_libs,$(gengalbin),\
     dl \
     pthread \
 ))