diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-09-20 00:49:49 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-09-20 00:51:38 +0200 |
| commit | f62a449a53a73db81768082b89f3b9db466af460 (patch) | |
| tree | 3dc409667dd8406e4fc4828fa5e53226169b4903 /vcl | |
| parent | 3540bfb994de7dd0d0029713e14504d60027fd8d (diff) | |
Kill the explicit linking to salmain.o, use vclmain instead.
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/StaticLibrary_vclmain.mk | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/vcl/StaticLibrary_vclmain.mk b/vcl/StaticLibrary_vclmain.mk index 52dbf0034ea7..58cb5fb98ff4 100644 --- a/vcl/StaticLibrary_vclmain.mk +++ b/vcl/StaticLibrary_vclmain.mk @@ -51,22 +51,4 @@ $(eval $(call gb_StaticLibrary_add_exception_objects,vclmain,\ vcl/source/salmain/salmain \ )) -# 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_salmain_hack -$(call gb_StaticLibrary_get_target,vclmain) : $(OUTDIR)/lib/$(1) -$$(eval $$(call gb_Deliver_add_deliverable,$(OUTDIR)/lib/$(1),$(call gb_CxxObject_get_target,vcl/source/salmain/salmain),$(OUTDIR)/lib/$(1))) - -$(OUTDIR)/lib/$(1) : $(call gb_CxxObject_get_target,vcl/source/salmain/salmain) - $$(call gb_Deliver_deliver,$$<,$$@) - -endef - -ifeq ($(OS),WNT) -$(eval $(call StaticLibrary_salmain_hack,salmain.obj)) -else -$(eval $(call StaticLibrary_salmain_hack,salmain.o)) -endif - # vim: set noet sw=4 ts=4: |