jpeg/StaticLibrary_jpeg.mk | 7 +++++--
libmariadb/StaticLibrary_mariadb.mk | 2 --
scp2/InstallModule_onlineupdate.mk | 2 +-
3 files changed, 6 insertions(+), 5 deletions(-)
New commits:
commit 8465cb8e98b9293090e116a8ddef99e0004902a4
Author: David Tardon <dtar...@redhat.com>
Date: Tue Jun 4 17:18:13 2013 +0200
there are no _inc packages anymore
Change-Id: Ib4142ce331abc2fd5bb1f2ecec7cb8100ce7c78d
diff --git a/jpeg/StaticLibrary_jpeg.mk b/jpeg/StaticLibrary_jpeg.mk
index d3430ba..c70f81c 100644
--- a/jpeg/StaticLibrary_jpeg.mk
+++ b/jpeg/StaticLibrary_jpeg.mk
@@ -11,10 +11,13 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,jpeg))
$(eval $(call gb_StaticLibrary_set_warnings_not_errors,jpeg))
-$(eval $(call gb_StaticLibrary_use_package,jpeg,jpeg_inc))
-
$(eval $(call gb_StaticLibrary_use_unpacked,jpeg,jpeg))
+$(eval $(call gb_StaticLibrary_set_include,jpeg,\
+ -I$(call gb_UnpackedTarball_get_dir,jpeg) \
+ $$(INCLUDE) \
+))
+
$(eval $(call gb_StaticLibrary_add_generated_cobjects,jpeg,\
UnpackedTarball/jpeg/jaricom \
UnpackedTarball/jpeg/jcapimin \
diff --git a/libmariadb/StaticLibrary_mariadb.mk
b/libmariadb/StaticLibrary_mariadb.mk
index 338701f..900c8df 100644
--- a/libmariadb/StaticLibrary_mariadb.mk
+++ b/libmariadb/StaticLibrary_mariadb.mk
@@ -13,8 +13,6 @@ $(eval $(call
gb_StaticLibrary_set_warnings_not_errors,mariadblib))
$(eval $(call gb_StaticLibrary_use_unpacked,mariadblib,mariadb))
-$(eval $(call gb_StaticLibrary_use_package,mariadblib,libmariadb_inc))
-
$(eval $(call gb_StaticLibrary_set_generated_c_suffix,mariadblib,c))
$(eval $(call gb_StaticLibrary_set_include,mariadblib,\
commit edc20ac89b753e6fdfbeae5cb0cbc0976a10e7f4
Author: David Tardon <dtar...@redhat.com>
Date: Tue Jun 4 17:12:14 2013 +0200
fix copypasta
Change-Id: I1c99ad469ff951d04689d782323e77f0f1618179
diff --git a/scp2/InstallModule_onlineupdate.mk
b/scp2/InstallModule_onlineupdate.mk
index fa9fe75..bcafd2f 100644
--- a/scp2/InstallModule_onlineupdate.mk
+++ b/scp2/InstallModule_onlineupdate.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_InstallModule_InstallModule,scp2/onlineupdate))
-$(eval $(call
gb_InstallModule_InstallModule_use_auto_install_libs,scp2/onlineupdate,onlineupdate))
+$(eval $(call
gb_InstallModule_use_auto_install_libs,scp2/onlineupdate,onlineupdate))
$(eval $(call gb_InstallModule_add_scpfiles,scp2/onlineupdate,\
scp2/source/onlineupdate/file_onlineupdate \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
