[Libreoffice-commits] .: 2 commits - fpicker/AllLangResTarget_fps_office.mk fpicker/Library_fps_aqua.mk fpicker/Library_fps.mk vcl/Library_vclplug_kde4.mk vcl/Library_vclplug_kde.mk vcl/prj

[David Tardon]

 fpicker/AllLangResTarget_fps_office.mk |    6 +-----
 fpicker/Library_fps.mk                 |    5 ++---
 fpicker/Library_fps_aqua.mk            |    9 ++++-----
 vcl/Library_vclplug_kde.mk             |    4 ++++
 vcl/Library_vclplug_kde4.mk            |    4 ++++
 vcl/prj/build.lst                      |    2 +-
 6 files changed, 16 insertions(+), 14 deletions(-)

New commits:
commit 32f4c79f7a72fc312ae3eec02492d6bc1da7d86c
Author: David Tardon <dtardon at redhat.com>
Date:   Sat May 5 08:38:13 2012 +0200

    add dependency on fpicker
    
    Change-Id: I45348c7f5c811524c6c2e98f718b36a72b980687

diff --git a/vcl/Library_vclplug_kde.mk b/vcl/Library_vclplug_kde.mk
index fb0a0bd..1673945 100644
--- a/vcl/Library_vclplug_kde.mk
+++ b/vcl/Library_vclplug_kde.mk
@@ -28,6 +28,10 @@
 
 $(eval $(call gb_Library_Library,vclplug_kde))
 
+$(eval $(call gb_Library_use_packages,vclplug_kde,\
+	fpicker_inc \
+))
+
 $(eval $(call gb_Library_set_include,vclplug_kde,\
     $$(INCLUDE) \
     -I$(SRCDIR)/vcl/inc \
diff --git a/vcl/Library_vclplug_kde4.mk b/vcl/Library_vclplug_kde4.mk
index a529bf3..8d39a4d 100644
--- a/vcl/Library_vclplug_kde4.mk
+++ b/vcl/Library_vclplug_kde4.mk
@@ -28,6 +28,10 @@
 
 $(eval $(call gb_Library_Library,vclplug_kde4))
 
+$(eval $(call gb_Library_use_packages,vclplug_kde4,\
+	fpicker_inc \
+))
+
 $(eval $(call gb_Library_use_custom_headers,vclplug_kde4,vcl/unx/kde4))
 
 $(eval $(call gb_Library_set_include,vclplug_kde4,\
diff --git a/vcl/prj/build.lst b/vcl/prj/build.lst
index ec23ede..a44d6df 100644
--- a/vcl/prj/build.lst
+++ b/vcl/prj/build.lst
@@ -1,4 +1,4 @@
-vc	vcl	:	TRANSLATIONS:translations apple_remote BOOST:boost officecfg DESKTOP:rsc sot ucbhelper unotools ICU:icu GRAPHITE:graphite i18npool i18nutil unoil ridljar X11_EXTENSIONS:x11_extensions offapi basegfx basebmp tools DESKTOP:l10ntools icc cpputools svl LIBXSLT:libxslt CAIRO:cairo FREETYPE:freetype FONTCONFIG:fontconfig NULL
+vc	vcl	:	TRANSLATIONS:translations apple_remote BOOST:boost officecfg DESKTOP:rsc sot ucbhelper unotools ICU:icu GRAPHITE:graphite i18npool i18nutil unoil ridljar X11_EXTENSIONS:x11_extensions offapi basegfx basebmp tools DESKTOP:l10ntools icc cpputools svl LIBXSLT:libxslt CAIRO:cairo FREETYPE:freetype FONTCONFIG:fontconfig fpicker NULL
 vc	vcl										usr1	-	all	vc_mkout NULL
 vc	vcl\prj									nmake	-	all	vc_prj NULL
 
commit c2cc50ff3cf9defe210b85e454f1217e06770dae
Author: David Tardon <dtardon at redhat.com>
Date:   Sat May 5 08:17:51 2012 +0200

    use the packaged header
    
    Change-Id: I3a447ab2b7798922e1805d8ed379359fd9a8f216

diff --git a/fpicker/AllLangResTarget_fps_office.mk b/fpicker/AllLangResTarget_fps_office.mk
index 88c1b76..f8a8ccd 100644
--- a/fpicker/AllLangResTarget_fps_office.mk
+++ b/fpicker/AllLangResTarget_fps_office.mk
@@ -36,15 +36,11 @@ $(eval $(call gb_AllLangResTarget_add_srs,fps_office,\
 $(eval $(call gb_SrsTarget_SrsTarget,fps_office/res))
 
 $(eval $(call gb_SrsTarget_use_packages,fps_office/res,\
+	fpicker_inc \
     svl_inc \
 	svtools_inc \
 ))
 
-$(eval $(call gb_SrsTarget_set_include,fps_office/res,\
-    $$(INCLUDE) \
-    -I$(SRCDIR)/fpicker/inc \
-))
-
 $(eval $(call gb_SrsTarget_add_files,fps_office/res,\
 	fpicker/source/office/OfficeFilePicker.src \
 	fpicker/source/office/iodlg.src \
diff --git a/fpicker/Library_fps.mk b/fpicker/Library_fps.mk
index 637af5e..a4d3c64 100644
--- a/fpicker/Library_fps.mk
+++ b/fpicker/Library_fps.mk
@@ -31,9 +31,8 @@ $(eval $(call gb_Library_add_nativeres,fps,fps/src))
 
 $(eval $(call gb_Library_set_componentfile,fps,fpicker/source/win32/fps))
 
-$(eval $(call gb_Library_set_include,fps,\
-	$$(INCLUDE) \
-	-I$(SRCDIR)/fpicker/inc \
+$(eval $(call gb_Library_use_packages,fps,\
+	fpicker_inc \
 ))
 
 $(eval $(call gb_Library_use_api,fps,\
diff --git a/fpicker/Library_fps_aqua.mk b/fpicker/Library_fps_aqua.mk
index fb18d08..6cb9c18 100644
--- a/fpicker/Library_fps_aqua.mk
+++ b/fpicker/Library_fps_aqua.mk
@@ -29,16 +29,15 @@ $(eval $(call gb_Library_Library,fps_aqua))
 
 $(eval $(call gb_Library_set_componentfile,fps_aqua,fpicker/source/aqua/fps_aqua))
 
+$(eval $(call gb_Library_use_packages,fps_aqua,\
+	fpicker_inc \
+))
+
 $(eval $(call gb_Library_use_api,fps_aqua,\
 	offapi \
 	udkapi \
 ))
 
-$(eval $(call gb_Library_set_include,fps_aqua,\
-    $$(INCLUDE) \
-    -I$(SRCDIR)/fpicker/inc \
-))
-
 $(eval $(call gb_Library_add_libs,fps_aqua,\
     -framework Cocoa \
     -framework CoreFoundation \