diff options
| author | David Tardon <dtardon@redhat.com> | 2011-05-30 18:47:52 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2011-06-18 11:25:30 +0200 |
| commit | 5e7d51d43897c3d6acd6951ccd2279a1ab358705 (patch) | |
| tree | 648582b1eeea10ef0b60f36826e175219be24de3 /sc | |
| parent | 5db7696114b4a91f5f3c2a1484f3deba6b780b2e (diff) | |
remove all traces of offuh from makefiles
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/CppunitTest_sc_ucalc.mk | 6 | ||||
| -rw-r--r-- | sc/Library_sc.mk | 6 | ||||
| -rw-r--r-- | sc/Library_scd.mk | 6 | ||||
| -rw-r--r-- | sc/Library_scfilt.mk | 6 | ||||
| -rw-r--r-- | sc/Library_scui.mk | 6 | ||||
| -rw-r--r-- | sc/Library_vbaobj.mk | 6 |
6 files changed, 30 insertions, 6 deletions
diff --git a/sc/CppunitTest_sc_ucalc.mk b/sc/CppunitTest_sc_ucalc.mk index ec8db65901f8..26b483bfb13a 100644 --- a/sc/CppunitTest_sc_ucalc.mk +++ b/sc/CppunitTest_sc_ucalc.mk @@ -71,10 +71,14 @@ $(eval $(call gb_CppunitTest_set_include,sc_ucalc,\ -I$(realpath $(SRCDIR)/sc/source/ui/inc) \ -I$(realpath $(SRCDIR)/sc/inc) \ $$(INCLUDE) \ - -I$(OUTDIR)/inc/offuh \ -I$(OUTDIR)/inc \ )) +$(eval $(call gb_CppunitTest_add_api,sc_ucalc,\ + offapi \ + udkapi \ +)) + $(eval $(call gb_CppunitTest_uses_ure,sc_ucalc)) $(eval $(call gb_CppunitTest_add_type_rdbs,sc_ucalc,\ diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk index 5e9375398d9e..3b82fd0a6856 100644 --- a/sc/Library_sc.mk +++ b/sc/Library_sc.mk @@ -36,7 +36,6 @@ $(eval $(call gb_Library_set_include,sc,\ -I$(WORKDIR)/SdiTarget/sc/sdi \ -I$(WORKDIR)/Misc/sc/ \ $$(INCLUDE) \ - -I$(OUTDIR)/inc/offuh \ )) $(eval $(call gb_Library_set_defs,sc,\ @@ -45,6 +44,11 @@ $(eval $(call gb_Library_set_defs,sc,\ -DSC_INFO_OSVERSION=\"$(OS)\" \ )) +$(eval $(call gb_Library_add_api,sc,\ + offapi \ + udkapi \ +)) + $(eval $(call gb_Library_add_linked_libs,sc,\ avmedia \ basegfx \ diff --git a/sc/Library_scd.mk b/sc/Library_scd.mk index 0331df2f9733..5b4aa8446190 100644 --- a/sc/Library_scd.mk +++ b/sc/Library_scd.mk @@ -30,13 +30,17 @@ $(eval $(call gb_Library_set_include,scd,\ -I$(realpath $(SRCDIR)/sc/inc) \ -I$(WORKDIR)/Misc/sc/ \ $$(INCLUDE) \ - -I$(OUTDIR)/inc/offuh \ )) $(eval $(call gb_Library_set_defs,scd,\ $$(DEFS) \ )) +$(eval $(call gb_Library_add_api,scd,\ + offapi \ + udkapi \ +)) + $(eval $(call gb_Library_add_linked_libs,scd,\ cppu \ cppuhelper \ diff --git a/sc/Library_scfilt.mk b/sc/Library_scfilt.mk index edcfd7ce11ad..04e6dba9eabe 100644 --- a/sc/Library_scfilt.mk +++ b/sc/Library_scfilt.mk @@ -33,7 +33,6 @@ $(eval $(call gb_Library_set_include,scfilt,\ -I$(realpath $(SRCDIR)/sc/inc/pch) \ -I$(WORKDIR)/Misc/sc/ \ $$(INCLUDE) \ - -I$(OUTDIR)/inc/offuh \ -I$(OUTDIR)/inc \ )) @@ -41,6 +40,11 @@ $(eval $(call gb_Library_set_defs,scfilt,\ $$(DEFS) \ )) +$(eval $(call gb_Library_add_api,scfilt,\ + offapi \ + udkapi \ +)) + $(eval $(call gb_Library_add_linked_libs,scfilt,\ basegfx \ comphelper \ diff --git a/sc/Library_scui.mk b/sc/Library_scui.mk index c85de9f15584..ce806b4ef74b 100644 --- a/sc/Library_scui.mk +++ b/sc/Library_scui.mk @@ -30,13 +30,17 @@ $(eval $(call gb_Library_set_include,scui,\ -I$(WORKDIR)/SdiTarget/sc/sdi \ -I$(WORKDIR)/Misc/sc \ $$(INCLUDE) \ - -I$(OUTDIR)/inc/offuh \ )) $(eval $(call gb_Library_set_defs,scui,\ $$(DEFS) \ )) +$(eval $(call gb_Library_add_api,scui,\ + offapi \ + udkapi \ +)) + $(eval $(call gb_Library_add_linked_libs,scui,\ comphelper \ cppu \ diff --git a/sc/Library_vbaobj.mk b/sc/Library_vbaobj.mk index 6ef54b386626..3c3b5414b541 100644 --- a/sc/Library_vbaobj.mk +++ b/sc/Library_vbaobj.mk @@ -29,7 +29,6 @@ $(eval $(call gb_Library_set_include,vbaobj,\ -I$(realpath $(SRCDIR)/sc/inc) \ -I$(WORKDIR)/Misc/sc/ \ $$(INCLUDE) \ - -I$(OUTDIR)/inc/offuh \ -I$(OUTDIR)/inc/ \ )) @@ -40,6 +39,11 @@ $(eval $(call gb_Library_set_defs,vbaobj,\ -DVBA_OOBUILD_HACK \ )) +$(eval $(call gb_Library_add_api,vbaobj,\ + offapi \ + udkapi \ +)) + $(eval $(call gb_Library_add_linked_libs,vbaobj,\ comphelper \ cppu \ |