diff options
| author | Hans-Joachim Lankenau <hjs@openoffice.org> | 2011-05-30 18:08:50 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2011-06-17 16:41:08 +0200 |
| commit | 246efa0d481c4b3bb55c1f53d954557cc027c008 (patch) | |
| tree | 76742dc66aaa690f9588450e590a6694f391ba00 /sfx2 | |
| parent | 3c822ccbf013b2c9129cbb4717890114bfdd06ee (diff) | |
ause130: #i117218# change .idl handling to gnu make
Diffstat (limited to 'sfx2')
| -rwxr-xr-x | sfx2/CppunitTest_sfx2_metadatable.mk | 6 | ||||
| -rwxr-xr-x | sfx2/Library_qstart.mk | 6 | ||||
| -rwxr-xr-x | sfx2/Library_sfx.mk | 6 |
3 files changed, 15 insertions, 3 deletions
diff --git a/sfx2/CppunitTest_sfx2_metadatable.mk b/sfx2/CppunitTest_sfx2_metadatable.mk index bf86f0a74e25..45a26819ba99 100755 --- a/sfx2/CppunitTest_sfx2_metadatable.mk +++ b/sfx2/CppunitTest_sfx2_metadatable.mk @@ -31,6 +31,11 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sfx2_metadatable, \ sfx2/qa/cppunit/test_metadatable \ )) +$(eval $(call gb_CppunitTest_add_api,sfx2_metadatable, \ + udkapi \ + offapi \ +)) + $(eval $(call gb_CppunitTest_add_linked_libs,sfx2_metadatable, \ sal \ sfx \ @@ -39,7 +44,6 @@ $(eval $(call gb_CppunitTest_add_linked_libs,sfx2_metadatable, \ $(eval $(call gb_CppunitTest_set_include,sfx2_metadatable,\ $$(INCLUDE) \ - -I$(OUTDIR)/inc/offuh \ -I$(OUTDIR)/inc \ )) diff --git a/sfx2/Library_qstart.mk b/sfx2/Library_qstart.mk index 0709f60ba5fa..3d6d6232bd7b 100755 --- a/sfx2/Library_qstart.mk +++ b/sfx2/Library_qstart.mk @@ -33,11 +33,15 @@ $(eval $(call gb_Library_set_include,qstart_gtk,\ -I$(SRCDIR)/sfx2/inc \ -I$(SRCDIR)/sfx2/inc/sfx2 \ -I$(SRCDIR)/sfx2/inc/pch \ - -I$(OUTDIR)/inc/offuh \ -I$(OUTDIR)/inc \ $(filter -I%,$(GTK_CFLAGS)) \ )) +$(eval $(call gb_Library_add_api,qstart_gtk,\ + udkapi \ + offapi \ +)) + $(eval $(call gb_Library_set_defs,qstart_gtk,\ $$(DEFS) \ -DDLL_NAME=$(notdir $(call gb_Library_get_target,sfx2)) \ diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk index c93efacab9f8..e6231c8a6efb 100755 --- a/sfx2/Library_sfx.mk +++ b/sfx2/Library_sfx.mk @@ -38,6 +38,11 @@ $(eval $(call gb_Library_add_sdi_headers,sfx,sfx2/sdi/sfxslots)) $(eval $(call gb_Library_set_componentfile,sfx,sfx2/util/sfx)) +$(eval $(call gb_Library_add_api,sfx,\ + udkapi \ + offapi \ +)) + $(eval $(call gb_Library_set_include,sfx,\ -I$(realpath $(SRCDIR)/sfx2/inc) \ -I$(realpath $(SRCDIR)/sfx2/inc/sfx2) \ @@ -46,7 +51,6 @@ $(eval $(call gb_Library_set_include,sfx,\ -I$(WORKDIR)/SdiTarget/sfx2/sdi \ -I$(WORKDIR)/inc/ \ $$(INCLUDE) \ - -I$(OUTDIR)/inc/offuh \ -I$(OUTDIR)/inc \ $(LIBXML_CFLAGS) \ )) |