diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2012-07-02 14:57:54 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2012-07-17 16:40:20 +0200 |
| commit | 347caf6e02cacc81b2e8296949b094b7213c29a9 (patch) | |
| tree | 05d4672ae4a873257239fd887931f8c5b6afaf92 | |
| parent | tubes: correctly set pDocFunc (diff) | |
| download | core-347caf6e02cacc81b2e8296949b094b7213c29a9.tar.gz core-347caf6e02cacc81b2e8296949b094b7213c29a9.zip | |
tubes: fix makefiles after rebase
Change-Id: I99a0dd6765d57c4a1d842b25d600d760930704fa
| -rw-r--r-- | Makefile.top | 1 | ||||
| -rw-r--r-- | sc/CppunitTest_sc_ucalc.mk | 2 | ||||
| -rw-r--r-- | sc/Library_sc.mk | 4 | ||||
| -rw-r--r-- | tubes/Library_tubes.mk | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/Makefile.top b/Makefile.top index d652b64df41e..e4bab16046c4 100644 --- a/Makefile.top +++ b/Makefile.top @@ -133,6 +133,7 @@ toolkit\ tools\ touch\ translations\ +tubes\ twain\ ucb\ ucbhelper\ diff --git a/sc/CppunitTest_sc_ucalc.mk b/sc/CppunitTest_sc_ucalc.mk index 4f996fd6ec95..83014162bb84 100644 --- a/sc/CppunitTest_sc_ucalc.mk +++ b/sc/CppunitTest_sc_ucalc.mk @@ -45,7 +45,7 @@ $(call gb_CxxObject_get_target,sc/qa/unit/ucalc): \ ifeq ($(ENABLE_TELEPATHY),TRUE) -$(eval $(call gb_CppunitTest_add_linked_libs,sc_ucalc,\ +$(eval $(call gb_CppunitTest_use_libraries,sc_ucalc,\ tubes \ )) diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk index f387b2b9ab38..998ca600484d 100644 --- a/sc/Library_sc.mk +++ b/sc/Library_sc.mk @@ -44,11 +44,11 @@ $(eval $(call gb_Library_use_sdk_api,sc)) ifeq ($(ENABLE_TELEPATHY),TRUE) -$(eval $(call gb_Library_add_linked_libs,sc,\ +$(eval $(call gb_Library_use_libraries,sc,\ tubes \ )) -$(eval $(call gb_Library_add_cxxflags,sc,\ +$(eval $(call gb_Library_add_defs,sc,\ -DENABLE_TELEPATHY \ )) diff --git a/tubes/Library_tubes.mk b/tubes/Library_tubes.mk index 98b1766d2e40..2c385d3bfd58 100644 --- a/tubes/Library_tubes.mk +++ b/tubes/Library_tubes.mk @@ -36,7 +36,7 @@ $(eval $(call gb_Library_add_defs,tubes,\ -DTUBES_DLLIMPLEMENTATION \ )) -$(eval $(call gb_Library_add_linked_libs,tubes,\ +$(eval $(call gb_Library_use_libraries,tubes,\ $(gb_STDLIBS) \ sal \ salhelper \ |