[Libreoffice-commits] .: sal/Library_sal.mk

[Libreoffice Gerrit user]

 sal/Library_sal.mk |    6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

New commits:
commit e3420747c2883b56375d9f4e9a1ab675450744a0
Author: Arnaud Versini <arnaud.versini at gmail.com>
Date:   Mon Dec 17 20:58:51 2012 +0100

    Revert part of 34e79c19babc0e6cc281025b40635b91dca444f3.
    
    undefined reference to `sal_detail_initialize'
    
    Change-Id: I92074e108dc405e1484503cb39c8c46b2cf50ce0

diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk
index cae8219..acec543 100644
--- a/sal/Library_sal.mk
+++ b/sal/Library_sal.mk
@@ -180,13 +180,9 @@ $(eval $(call gb_Library_add_exception_objects,sal,\
 	sal/osl/unx/module \
 	sal/osl/unx/process \
 	sal/osl/unx/process_impl \
+        $(if $(filter DESKTOP,$(BUILD_TYPE)), sal/osl/unx/salinit) \
 	sal/osl/unx/uunxapi \
 ))
-ifeq ($(filter-out DESKTOP,$(BUILD_TYPE)),)
-$(eval $(call gb_Library_add_exception_objects,sal,\
-	sal/osl/unx/salinit \
-))
-endif
 $(eval $(call gb_Library_add_cobjects,sal,\
 	sal/osl/unx/mutex \
 	sal/osl/unx/nlsupport \