diff options
author | David Tardon <dtardon@redhat.com> | 2011-05-30 18:47:50 +0200 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2011-06-17 14:32:44 +0200 |
commit | d40a3fdbcbf14b74837cb3f16dc937e7ad6fb65e (patch) | |
tree | 9260794798b378f59a9e473829b3a320fd2c2810 /reportdesign | |
parent | Merge remote-tracking branch 'origin/libreoffice-3-4' (diff) | |
download | core-d40a3fdbcbf14b74837cb3f16dc937e7ad6fb65e.tar.gz core-d40a3fdbcbf14b74837cb3f16dc937e7ad6fb65e.zip |
remove all traces of offuh from makefiles
Diffstat (limited to 'reportdesign')
-rw-r--r-- | reportdesign/Library_rpt.mk | 6 | ||||
-rw-r--r-- | reportdesign/Library_rptui.mk | 6 | ||||
-rw-r--r-- | reportdesign/Library_rptxml.mk | 6 |
3 files changed, 15 insertions, 3 deletions
diff --git a/reportdesign/Library_rpt.mk b/reportdesign/Library_rpt.mk index 430f9d220962..93e1adb5a442 100644 --- a/reportdesign/Library_rpt.mk +++ b/reportdesign/Library_rpt.mk @@ -36,7 +36,6 @@ $(eval $(call gb_Library_set_include,rpt,\ -I$(realpath $(SRCDIR)/reportdesign/source/inc) \ -I$(realpath $(SRCDIR)/reportdesign/source/core/inc) \ -I$(OUTDIR)/inc \ - -I$(OUTDIR)/inc/offuh \ )) $(eval $(call gb_Library_set_defs,rpt,\ @@ -44,6 +43,11 @@ $(eval $(call gb_Library_set_defs,rpt,\ -DREPORTDESIGN_DLLIMPLEMENTATION \ )) +$(eval $(call gb_Library_add_api,rpt,\ + offapi \ + udkapi \ +)) + $(eval $(call gb_Library_add_linked_libs,rpt,\ comphelper \ cppu \ diff --git a/reportdesign/Library_rptui.mk b/reportdesign/Library_rptui.mk index c532117ce9a7..7aee950fa723 100644 --- a/reportdesign/Library_rptui.mk +++ b/reportdesign/Library_rptui.mk @@ -36,7 +36,11 @@ $(eval $(call gb_Library_set_include,rptui,\ -I$(realpath $(SRCDIR)/reportdesign/source/inc) \ -I$(realpath $(SRCDIR)/reportdesign/source/ui/inc) \ -I$(OUTDIR)/inc \ - -I$(OUTDIR)/inc/offuh \ +)) + +$(eval $(call gb_Library_add_api,rptui,\ + offapi \ + udkapi \ )) $(eval $(call gb_Library_add_linked_libs,rptui,\ diff --git a/reportdesign/Library_rptxml.mk b/reportdesign/Library_rptxml.mk index 8a0b6864c8d4..ff9eb4436ccb 100644 --- a/reportdesign/Library_rptxml.mk +++ b/reportdesign/Library_rptxml.mk @@ -35,13 +35,17 @@ $(eval $(call gb_Library_set_include,rptxml,\ -I$(realpath $(SRCDIR)/reportdesign/inc/pch) \ -I$(realpath $(SRCDIR)/reportdesign/source/inc) \ -I$(OUTDIR)/inc \ - -I$(OUTDIR)/inc/offuh \ )) $(eval $(call gb_Library_set_defs,rptxml,\ $$(DEFS) \ )) +$(eval $(call gb_Library_add_api,rptxml,\ + offapi \ + udkapi \ +)) + $(eval $(call gb_Library_add_linked_libs,rptxml,\ comphelper \ cppu \ |