diff options
| author | David Tardon <dtardon@redhat.com> | 2011-05-30 18:48:02 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2011-06-18 11:31:16 +0200 |
| commit | b795ca330fe8d8927bc24f16df7f80612884c492 (patch) | |
| tree | c1c792f6f40edc3440d2c0a5f0d925ad7ccc26e7 | |
| parent | 185a80eb7191151ea0a2d619272a1c78e2d4a9c1 (diff) | |
remove all traces of offuh from makefiles
| -rw-r--r-- | starmath/CppunitTest_starmath_qa_cppunit.mk | 6 | ||||
| -rw-r--r-- | starmath/Library_sm.mk | 6 | ||||
| -rw-r--r-- | starmath/Library_smd.mk | 6 |
3 files changed, 15 insertions, 3 deletions
diff --git a/starmath/CppunitTest_starmath_qa_cppunit.mk b/starmath/CppunitTest_starmath_qa_cppunit.mk index 0f4606a2064e..5d22f83a668c 100644 --- a/starmath/CppunitTest_starmath_qa_cppunit.mk +++ b/starmath/CppunitTest_starmath_qa_cppunit.mk @@ -32,7 +32,11 @@ $(eval $(call gb_CppunitTest_set_include,starmath_qa_cppunit,\ -I$(realpath $(SRCDIR)/starmath/inc) \ -I$(realpath $(SRCDIR)/starmath/inc/pch) \ -I$(OUTDIR)/inc \ - -I$(OUTDIR)/inc/offuh \ +)) + +$(eval $(call gb_CppunitTest_add_api,starmath_qa_cppunit,\ + offapi \ + udkapi \ )) $(eval $(call gb_CppunitTest_set_defs,starmath_qa_cppunit,\ diff --git a/starmath/Library_sm.mk b/starmath/Library_sm.mk index bd492dfdc472..8bed8a508889 100644 --- a/starmath/Library_sm.mk +++ b/starmath/Library_sm.mk @@ -33,7 +33,6 @@ $(eval $(call gb_Library_set_include,sm,\ -I$(WORKDIR)/SdiTarget/starmath/sdi \ -I$(WORKDIR)/Misc/starmath/ \ $$(INCLUDE) \ - -I$(OUTDIR)/inc/offuh \ -I$(OUTDIR)/inc \ )) @@ -43,6 +42,11 @@ $(eval $(call gb_Library_set_defs,sm,\ -DSC_INFO_OSVERSION=\"$(OS)\" \ )) +$(eval $(call gb_Library_add_api,sm,\ + offapi \ + udkapi \ +)) + $(eval $(call gb_Library_add_linked_libs,sm,\ comphelper \ cppu \ diff --git a/starmath/Library_smd.mk b/starmath/Library_smd.mk index 538f92104d56..48894136604f 100644 --- a/starmath/Library_smd.mk +++ b/starmath/Library_smd.mk @@ -30,7 +30,6 @@ $(eval $(call gb_Library_set_include,smd,\ -I$(realpath $(SRCDIR)/starmath/inc) \ -I$(WORKDIR)/Misc/sm/ \ $$(INCLUDE) \ - -I$(OUTDIR)/inc/offuh \ -I$(OUTDIR)/inc \ )) @@ -38,6 +37,11 @@ $(eval $(call gb_Library_set_defs,smd,\ $$(DEFS) \ )) +$(eval $(call gb_Library_add_api,smd,\ + offapi \ + udkapi \ +)) + $(eval $(call gb_Library_add_linked_libs,smd,\ cppu \ cppuhelper \ |