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

2012-01-16 Thread Norbert Thiebaud
 sal/StaticLibrary_salcpprt.mk |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit a56cf2216105065b7576ff695cf376bc58b12346
Author: Norbert Thiebaud nthieb...@gmail.com
Date:   Mon Jan 16 17:11:05 2012 -0600

try to solve tml_'s detected dependencies issue with salcpprt

diff --git a/sal/StaticLibrary_salcpprt.mk b/sal/StaticLibrary_salcpprt.mk
index 79583a6..65bd100 100644
--- a/sal/StaticLibrary_salcpprt.mk
+++ b/sal/StaticLibrary_salcpprt.mk
@@ -33,6 +33,12 @@ $(eval $(call gb_StaticLibrary_add_defs,salcpprt, \
$(LFS_CFLAGS) \
 ))
 
+$(eval $(call gb_StaticLibrary_set_include,salcpprt,\
+$$(INCLUDE) \
+-I$(realpath $(SRCDIR)/sal/inc) \
+))
+
+
 $(eval $(call gb_StaticLibrary_add_exception_objects,salcpprt, \
sal/cpprt/operators_new_delete \
 ))
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2012-01-16 Thread David Tardon
 sal/StaticLibrary_salcpprt.mk |6 --
 1 file changed, 6 deletions(-)

New commits:
commit 750f32c6ccd4c5dcf0036b0aa421bedea4e686f5
Author: David Tardon dtar...@redhat.com
Date:   Tue Jan 17 07:23:40 2012 +0100

Revert try to solve tml_'s detected dependencies issue with salcpprt

Bjoern fixed it by adding proper package deps

This reverts commit a56cf2216105065b7576ff695cf376bc58b12346.

diff --git a/sal/StaticLibrary_salcpprt.mk b/sal/StaticLibrary_salcpprt.mk
index 2286e6c..b56d4a8 100644
--- a/sal/StaticLibrary_salcpprt.mk
+++ b/sal/StaticLibrary_salcpprt.mk
@@ -36,12 +36,6 @@ $(eval $(call gb_StaticLibrary_add_defs,salcpprt, \
$(LFS_CFLAGS) \
 ))
 
-$(eval $(call gb_StaticLibrary_set_include,salcpprt,\
-$$(INCLUDE) \
--I$(realpath $(SRCDIR)/sal/inc) \
-))
-
-
 $(eval $(call gb_StaticLibrary_add_exception_objects,salcpprt, \
sal/cpprt/operators_new_delete \
 ))
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits