diff options
author | Bjoern Michaelsen <b_michaelsen@openoffice.org> | 2010-11-23 15:28:37 +0100 |
---|---|---|
committer | Bjoern Michaelsen <b_michaelsen@openoffice.org> | 2010-11-23 15:28:37 +0100 |
commit | e16777656a71ae48b0d9d9e87b035018ff1f20ee (patch) | |
tree | a8a70b0675de8a23d296e4b2f2e83c0110d88f49 /tools/StaticLibrary_ooopathutils.mk | |
parent | bc69cf5e450ba62a1067842673798320a3e99a97 (diff) |
gnumake2: fix for really ugly pathutils hack to register delivered object in for gb_deliver.log
Diffstat (limited to 'tools/StaticLibrary_ooopathutils.mk')
-rwxr-xr-x | tools/StaticLibrary_ooopathutils.mk | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tools/StaticLibrary_ooopathutils.mk b/tools/StaticLibrary_ooopathutils.mk index 5eac00c4193c..a5b12532c60b 100755 --- a/tools/StaticLibrary_ooopathutils.mk +++ b/tools/StaticLibrary_ooopathutils.mk @@ -35,11 +35,14 @@ $(eval $(call gb_StaticLibrary_add_exception_objects,ooopathutils,\ # HACK for now +# We really should fix the clients of this to link against the static library +# 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))) $(OUTDIR)/lib/$(1) : $(call gb_CxxObject_get_target,tools/source/misc/pathutils) - cp -f $$< $$@ + $$(call gb_Deliver_deliver,$$<,$$@) endef |