diff options
| author | Hans-Joachim Lankenau <hjs@openoffice.org> | 2011-05-30 18:14:44 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2011-06-18 11:31:16 +0200 |
| commit | 185a80eb7191151ea0a2d619272a1c78e2d4a9c1 (patch) | |
| tree | c8e1b02df51279b8fc23102df022874c6889a9d3 /sw | |
| parent | 64be4292eb919396c2f06544b9bbaa5568dddb2a (diff) | |
ause130: #i117218# change .idl handling to gnu make
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/Library_msword.mk | 6 | ||||
| -rw-r--r-- | sw/Library_sw.mk | 6 | ||||
| -rw-r--r-- | sw/Library_swd.mk | 6 | ||||
| -rw-r--r-- | sw/Library_swui.mk | 6 | ||||
| -rw-r--r-- | sw/Library_vbaswobj.mk | 7 |
5 files changed, 26 insertions, 5 deletions
diff --git a/sw/Library_msword.mk b/sw/Library_msword.mk index 9c41a56d9255..00870e3b9177 100644 --- a/sw/Library_msword.mk +++ b/sw/Library_msword.mk @@ -39,10 +39,14 @@ $(eval $(call gb_Library_set_include,msword,\ -I$(WORKDIR)/Misc/sw/ \ $$(INCLUDE) \ $(if $(filter YES,$(SYSTEM_LIBXML)),$(LIBXML_CFLAGS)) \ - -I$(OUTDIR)/inc/offuh \ -I$(OUTDIR)/inc/sw \ )) +$(eval $(call gb_Library_add_api,msword,\ + udkapi \ + offapi \ +)) + $(eval $(call gb_Library_set_defs,msword,\ $$(DEFS) \ )) diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk index f3e53715deb0..82ea9aa3b3c1 100644 --- a/sw/Library_sw.mk +++ b/sw/Library_sw.mk @@ -43,10 +43,14 @@ $(eval $(call gb_Library_set_include,sw,\ -I$(WORKDIR)/Misc/sw/ \ $$(INCLUDE) \ $(if $(filter YES,$(SYSTEM_LIBXML)),$(LIBXML_CFLAGS)) \ - -I$(OUTDIR)/inc/offuh \ -I$(OUTDIR)/inc \ )) +$(eval $(call gb_Library_add_api,sw,\ + udkapi \ + offapi \ +)) + $(eval $(call gb_Library_set_defs,sw,\ $$(DEFS) \ -DSW_DLLIMPLEMENTATION \ diff --git a/sw/Library_swd.mk b/sw/Library_swd.mk index 0b1ca39f642f..b1559833993c 100644 --- a/sw/Library_swd.mk +++ b/sw/Library_swd.mk @@ -38,7 +38,11 @@ $(eval $(call gb_Library_set_include,swd,\ -I$(realpath $(SRCDIR)/sw/source/core/inc) \ -I$(realpath $(SRCDIR)/sw/source/filter/inc) \ -I$(realpath $(SRCDIR)/sw/source/ui/inc) \ - -I$(OUTDIR)/inc/offuh \ +)) + +$(eval $(call gb_Library_add_api,swd,\ + udkapi \ + offapi \ )) $(eval $(call gb_Library_set_defs,swd,\ diff --git a/sw/Library_swui.mk b/sw/Library_swui.mk index 0b5c708b6a28..2cdf1b5562a9 100644 --- a/sw/Library_swui.mk +++ b/sw/Library_swui.mk @@ -36,13 +36,17 @@ $(eval $(call gb_Library_set_include,swui,\ -I$(WORKDIR)/SdiTarget/sw/sdi \ -I$(WORKDIR)/Misc/sw \ $$(INCLUDE) \ - -I$(OUTDIR)/inc/offuh \ )) $(eval $(call gb_Library_set_defs,swui,\ $$(DEFS) \ )) +$(eval $(call gb_Library_add_api,swui,\ + udkapi \ + offapi \ +)) + $(eval $(call gb_Library_add_linked_libs,swui,\ comphelper \ cppu \ diff --git a/sw/Library_vbaswobj.mk b/sw/Library_vbaswobj.mk index d76781e83395..70874ebed483 100644 --- a/sw/Library_vbaswobj.mk +++ b/sw/Library_vbaswobj.mk @@ -37,10 +37,15 @@ $(eval $(call gb_Library_set_include,vbaswobj,\ -I$(realpath $(SRCDIR)/sw/inc) \ -I$(WORKDIR)/Misc/sw/ \ $$(INCLUDE) \ - -I$(OUTDIR)/inc/offuh \ -I$(OUTDIR)/inc/ \ )) +$(eval $(call gb_Library_add_api,vbaswobj,\ + udkapi \ + offapi \ + oovbaapi \ +)) + $(eval $(call gb_Library_add_linked_libs,vbaswobj,\ comphelper \ cppu \ |