diff options
| author | Hans-Joachim Lankenau <hjs@openoffice.org> | 2011-05-30 18:09:09 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2011-06-18 11:29:28 +0200 |
| commit | 0e6ab013f7def9891c2e982bec76458a64953c20 (patch) | |
| tree | 3fedca16aabacc61449c970a4da2756522605347 /tools | |
| parent | 190ae222e6933eabb7a9a016690619621bea07ad (diff) | |
ause130: #i117218# change .idl handling to gnu make
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Library_tl.mk | 6 | ||||
| -rw-r--r-- | tools/StaticLibrary_ooopathutils.mk | 2 | ||||
| -rw-r--r-- | tools/prj/build.lst | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk index da3e0276f521..ad3c9c4ec682 100644 --- a/tools/Library_tl.mk +++ b/tools/Library_tl.mk @@ -38,7 +38,6 @@ $(eval $(call gb_Library_set_include,tl,\ -I$(realpath $(SRCDIR)/tools/inc/pch) \ -I$(SRCDIR)/solenv/inc \ -I$(SRCDIR)/solenv/inc/Xp31 \ - -I$(OUTDIR)/inc/offuh \ -I$(WORKDIR)/CustomTarget/tools/source/reversemap \ )) @@ -48,6 +47,11 @@ $(eval $(call gb_Library_set_defs,tl,\ -DVCL \ )) +$(eval $(call gb_Library_add_api,tl,\ + udkapi \ + offapi \ +)) + $(eval $(call gb_Library_add_linked_libs,tl,\ basegfx \ comphelper \ diff --git a/tools/StaticLibrary_ooopathutils.mk b/tools/StaticLibrary_ooopathutils.mk index e58becb175d3..c5b2ea6ad846 100644 --- a/tools/StaticLibrary_ooopathutils.mk +++ b/tools/StaticLibrary_ooopathutils.mk @@ -39,7 +39,7 @@ $(eval $(call gb_StaticLibrary_add_exception_objects,ooopathutils,\ # Instead of this evil linking of an object from $(OUTDIR) define StaticLibrary_ooopathutils_hack $(call gb_StaticLibrary_get_target,ooopathutils) : $(OUTDIR)/lib/$(1) -$$(eval $$(call gb_Deliver_add_deliverable,$(OUTDIR)/lib/$(1),$(call gb_CxxObject_get_target,tools/source/misc/pathutils))) +$$(eval $$(call gb_Deliver_add_deliverable,$(OUTDIR)/lib/$(1),$(call gb_CxxObject_get_target,tools/source/misc/pathutils),$(1))) $(OUTDIR)/lib/$(1) : $(call gb_CxxObject_get_target,tools/source/misc/pathutils) $$(call gb_Deliver_deliver,$$<,$$@) diff --git a/tools/prj/build.lst b/tools/prj/build.lst index eeb470c384d6..ee6803567843 100644 --- a/tools/prj/build.lst +++ b/tools/prj/build.lst @@ -1,3 +1,3 @@ -tl tools : cppu external offuh ZLIB:zlib EXPAT:expat basegfx comphelper i18npool NULL +tl tools : cppu external offapi ZLIB:zlib EXPAT:expat basegfx comphelper i18npool NULL tl tools\prj nmake - all tl_prj NULL # tl tools\qa nmake - all tl_qa tl_utl NULL |