[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - 2 commits - onlineupdate/Executable_updater.mk

[Michael Stahl]

 onlineupdate/Executable_updater.mk |   17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

New commits:
commit aaa6410fbb07659c183331f52a88cd31eb080cc2
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Jan 6 21:49:05 2016 +0100

    onlineupdate: linking libpthread should work better than including it
    
    Change-Id: Ib19a5651f7e30108e8fbcdc6f7924c47cbeb4434
    (cherry picked from commit dd13ad84693e8d22672f4b5d588c0611ab1a0a50)

diff --git a/onlineupdate/Executable_updater.mk b/onlineupdate/Executable_updater.mk
index 5c56eda..fba7e3c 100644
--- a/onlineupdate/Executable_updater.mk
+++ b/onlineupdate/Executable_updater.mk
@@ -9,24 +9,13 @@
 
 $(eval $(call gb_Executable_Executable,updater))
 
-ifeq ($(OS),WNT)
-$(eval $(call gb_Executable_set_include,updater,\
-	-I$(SRCDIR)/onlineupdate/source/update/src \
-	-I$(SRCDIR)/onlineupdate/source/update/inc \
-	-I$(SRCDIR)/onlineupdate/source/update/common \
-	-I$(SRCDIR)/onlineupdate/source/update/updater/xpcom/glue \
-	$$(INCLUDE) \
-))
-else
 $(eval $(call gb_Executable_set_include,updater,\
 	-I$(SRCDIR)/onlineupdate/source/update/src \
 	-I$(SRCDIR)/onlineupdate/source/update/inc \
 	-I$(SRCDIR)/onlineupdate/source/update/common \
 	-I$(SRCDIR)/onlineupdate/source/update/updater/xpcom/glue \
-	-lpthread \
 	$$(INCLUDE) \
 ))
-endif
 
 ifeq ($(OS),WNT)
 $(eval $(call gb_Executable_add_libs,updater,\
@@ -43,6 +32,7 @@ $(eval $(call gb_Executable_add_libs,updater,\
 	-lXrender \
 	-lSM \
 	-lICE \
+	-lpthread \
 ))
 endif
 
commit c5dd2efe9d1ed467cfe7c601300b130d27b73139
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Jan 6 21:43:42 2016 +0100

    onlineupdate: Executable_updater should decide which GTK it wants to use
    
    Using both GTK2 and GTK3 sounds like a recipe for disaster, so use gtk2
    for now (since we get numerous deprecation warnings with gtk3).
    
    Change-Id: I32a27c3620503b6c5d7d81510137bfddc5abb05c
    (cherry picked from commit 08467b602e23c1b8059611717f3d82da8936e632)

diff --git a/onlineupdate/Executable_updater.mk b/onlineupdate/Executable_updater.mk
index eb94e8b..5c56eda 100644
--- a/onlineupdate/Executable_updater.mk
+++ b/onlineupdate/Executable_updater.mk
@@ -43,7 +43,6 @@ $(eval $(call gb_Executable_add_libs,updater,\
 	-lXrender \
 	-lSM \
 	-lICE \
-	$(GTK3_LIBS) \
 ))
 endif
 
@@ -51,10 +50,6 @@ ifeq ($(OS),WNT)
 $(eval $(call gb_Executable_add_cxxflags,updater,\
 	/Zc:wchar_t \
 ))
-else
-$(eval $(call gb_Executable_add_cxxflags,updater,\
-	$$(GTK3_CFLAGS) \
-))
 endif
 
 $(eval $(call gb_Executable_use_externals,updater,\