diff options
| author | Bjoern Michaelsen <b_michaelsen@openoffice.org> | 2010-11-24 22:53:36 +0100 |
|---|---|---|
| committer | Bjoern Michaelsen <b_michaelsen@openoffice.org> | 2010-11-24 22:53:36 +0100 |
| commit | 5eb5c7221cc97416bc66c336f42b3afebf3b0995 (patch) | |
| tree | 1ea67ac0604a76f353693f889f318b2235910a64 /tools | |
| parent | 7c153ad4212964199f431c90ab521c3a8b550614 (diff) | |
| parent | e16777656a71ae48b0d9d9e87b035018ff1f20ee (diff) | |
gnumake2: merging minibranches
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/StaticLibrary_ooopathutils.mk | 5 | ||||
| -rw-r--r-- | tools/prj/makefile.mk | 2 |
2 files changed, 5 insertions, 2 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 diff --git a/tools/prj/makefile.mk b/tools/prj/makefile.mk index 3b1b54d4357f..c73a3d944bbf 100644 --- a/tools/prj/makefile.mk +++ b/tools/prj/makefile.mk @@ -37,4 +37,4 @@ VERBOSEFLAG := -s .ENDIF all: - cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) |