mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Kill the explicit linking to salmain.o, use vclmain instead.

Browse Source
This commit is contained in:
Jan Holesovsky 2011-09-20 00:49:49 +02:00
parent 3540bfb994
commit f62a449a53
17 changed files with 13 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Repository.mk
View File

@ -361,7 +361,6 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
libeay32 \
ssleay32 \
ooopathutils \
salmain \
sample \
salcpprt \
vclmain \

4
RepositoryFixes.mk
View File

@ -39,9 +39,6 @@ gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salh
gb_Library_FILENAMES := $(patsubst ucbhelper:libucbhelper%,ucbhelper:libucbhelper4%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst ucb:libucb%,ucb:libucb1%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst ucpfile:libucpfile%,ucpfile:libucpfile1%,$(gb_Library_FILENAMES))
# TODO: this is a hack; we should really build salmain as a regular static library
gb_StaticLibrary_FILENAMES := $(subst salmain:libsalmain.a,salmain:salmain.o,$(gb_StaticLibrary_FILENAMES))
endif
ifeq ($(OS),WNT)
@ -59,7 +56,6 @@ gb_Library_FILENAMES := $(patsubst tl:itl%,tl:itools%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst vbahelper:ivbahelper%,vbahelper:vbahelper%,$(gb_Library_FILENAMES))
gb_StaticLibrary_FILENAMES := $(patsubst graphite:graphite%,graphite:graphite_dll%,$(gb_StaticLibrary_FILENAMES))
gb_StaticLibrary_FILENAMES := $(subst salmain:salmain.lib,salmain:salmain.obj,$(gb_StaticLibrary_FILENAMES))
ifeq ($(COM),GCC)
gb_Library_FILENAMES := $(patsubst crypto:icrypto%,crypto:crypto%,$(gb_Library_FILENAMES))

2
automation/Executable_miniapp.mk
View File

@ -54,7 +54,7 @@ $(eval $(call gb_Executable_add_linked_libs,miniapp,\
))
$(eval $(call gb_Executable_add_linked_static_libs,miniapp,\
salmain \
vclmain \
))
$(eval $(call gb_Executable_add_exception_objects,miniapp,\

2
automation/Executable_testtool.mk
View File

@ -69,7 +69,7 @@ $(eval $(call gb_Executable_add_linked_libs,testtool,\
$(eval $(call gb_Executable_add_linked_static_libs,testtool,\
app \
salmain \
vclmain \
sample \
))

20
solenv/inc/_tg_app.mk
View File

@ -32,7 +32,7 @@ APP1STACKN=
.IF "$(APP1NOSAL)"==""
.IF "$(TARGETTYPE)" == "GUI"
APP1OBJS+= $(STDOBJVCL)
APP1STDLIB+= -lvclmain
.ENDIF
.ENDIF
@ -242,7 +242,7 @@ APP2STACKN=
.IF "$(APP2NOSAL)"==""
.IF "$(TARGETTYPE)" == "GUI"
APP2OBJS+= $(STDOBJVCL)
APP2STDLIB+= -lvclmain
.ENDIF
.ENDIF
@ -452,7 +452,7 @@ APP3STACKN=
.IF "$(APP3NOSAL)"==""
.IF "$(TARGETTYPE)" == "GUI"
APP3OBJS+= $(STDOBJVCL)
APP3STDLIB+= -lvclmain
.ENDIF
.ENDIF
@ -662,7 +662,7 @@ APP4STACKN=
.IF "$(APP4NOSAL)"==""
.IF "$(TARGETTYPE)" == "GUI"
APP4OBJS+= $(STDOBJVCL)
APP4STDLIB+= -lvclmain
.ENDIF
.ENDIF
@ -872,7 +872,7 @@ APP5STACKN=
.IF "$(APP5NOSAL)"==""
.IF "$(TARGETTYPE)" == "GUI"
APP5OBJS+= $(STDOBJVCL)
APP5STDLIB+= -lvclmain
.ENDIF
.ENDIF
@ -1082,7 +1082,7 @@ APP6STACKN=
.IF "$(APP6NOSAL)"==""
.IF "$(TARGETTYPE)" == "GUI"
APP6OBJS+= $(STDOBJVCL)
APP6STDLIB+= -lvclmain
.ENDIF
.ENDIF
@ -1292,7 +1292,7 @@ APP7STACKN=
.IF "$(APP7NOSAL)"==""
.IF "$(TARGETTYPE)" == "GUI"
APP7OBJS+= $(STDOBJVCL)
APP7STDLIB+= -lvclmain
.ENDIF
.ENDIF
@ -1502,7 +1502,7 @@ APP8STACKN=
.IF "$(APP8NOSAL)"==""
.IF "$(TARGETTYPE)" == "GUI"
APP8OBJS+= $(STDOBJVCL)
APP8STDLIB+= -lvclmain
.ENDIF
.ENDIF
@ -1712,7 +1712,7 @@ APP9STACKN=
.IF "$(APP9NOSAL)"==""
.IF "$(TARGETTYPE)" == "GUI"
APP9OBJS+= $(STDOBJVCL)
APP9STDLIB+= -lvclmain
.ENDIF
.ENDIF
@ -1922,7 +1922,7 @@ APP10STACKN=
.IF "$(APP10NOSAL)"==""
.IF "$(TARGETTYPE)" == "GUI"
APP10OBJS+= $(STDOBJVCL)
APP10STDLIB+= -lvclmain
.ENDIF
.ENDIF

2
solenv/inc/tg_app.mk
View File

@ -61,7 +61,7 @@ APP$(TNR)STACKN=
.IF "$(APP$(TNR)NOSAL)"==""
.IF "$(TARGETTYPE)" == "GUI"
APP$(TNR)OBJS+= $(STDOBJVCL)
APP$(TNR)STDLIB+= -lvclmain
.ENDIF
.ENDIF

1
solenv/inc/unxgcc.mk
View File

@ -206,7 +206,6 @@ SONAME_SWITCH=-Wl,-h
STDLIBCPP=-lstdc++
# default objectfilenames to link
STDOBJVCL=$(L)$/salmain.o
STDOBJGUI=
STDSLOGUI=
STDOBJCUI=

2
solenv/inc/unxiosr.mk
View File

@ -109,8 +109,6 @@ DLLPOST=.a
# Precompiled header file extension
PCHPOST=.gch
STDOBJVCL=$(L)/salmain.o
STDLIBCUIMT=-framework UIKit -framework Foundation -framework CoreText -framework CoreGraphics -framework CoreFoundation -Xlinker -objc_abi_version -Xlinker 2
STDLIBGUIMT=$(STDLIBCUIMT)
STDSHLCUIMT=

1
solenv/inc/unxmacx.mk
View File

@ -226,7 +226,6 @@ SONAME_SWITCH=-Wl,-h
STDLIBCPP=-lstdc++
STDOBJVCL=$(L)/salmain.o
STDOBJGUI=
STDSLOGUI=
STDOBJCUI=

1
solenv/inc/unxsogi.mk
View File

@ -98,7 +98,6 @@ CDEFS += -DHAVE_GCC_VISIBILITY_FEATURE
STDLIBCPP=-lstdc++
STDOBJVCL=$(L)/salmain.o
STDOBJGUI=
STDSLOGUI=
STDOBJCUI=

1
solenv/inc/unxsogs.mk
View File

@ -97,7 +97,6 @@ CDEFS += -DHAVE_GCC_VISIBILITY_FEATURE
STDLIBCPP=-lstdc++
STDOBJVCL=$(L)/salmain.o
STDOBJGUI=
STDSLOGUI=
STDOBJCUI=

2
solenv/inc/unxsoli4.mk
View File

@ -108,8 +108,6 @@ CFLAGSWERRCXX=-xwe
# settings.mk):
MODULES_WITH_WARNINGS :=
STDOBJVCL=$(L)/salmain.o
THREADLIB=
.IF "$(PURIFY)"!=""
LINK=/usr/local/purify-4.2-solaris2/purify CC

2
solenv/inc/unxsols4.mk
View File

@ -114,8 +114,6 @@ CFLAGSWERRCXX=-xwe
# settings.mk):
MODULES_WITH_WARNINGS :=
STDOBJVCL=$(L)/salmain.o
THREADLIB=
.IF "$(PURIFY)"!=""
LINK=/usr/local/purify-4.2-solaris2/purify CC

2
solenv/inc/unxsolu4.mk
View File

@ -113,8 +113,6 @@ CFLAGSWERRCXX=-xwe
# settings.mk):
MODULES_WITH_WARNINGS :=
STDOBJVCL=$(L)/salmain.o
THREADLIB=
LINK=$(CXX)
LINKC=$(CC)

1
solenv/inc/wntgcci.mk
View File

@ -131,7 +131,6 @@ MINGW_LIBGCC=-lgcc_eh -lgcc
MINGW_LIBGCC=-lgcc
.ENDIF
.ENDIF
STDOBJVCL=$(L)$/salmain.obj
STDOBJGUI=
STDSLOGUI=
STDOBJCUI=

1
solenv/inc/wntmsc.mk
View File

@ -298,7 +298,6 @@ LIBCPMT=libcpmt.lib
.ENDIF # "$(USE_DEBUG_RUNTIME)" != ""
.ENDIF # "$(DYNAMIC_CRT)"!=""
STDOBJVCL=$(L)/salmain.obj
STDOBJGUI=
STDSLOGUI=
STDOBJCUI=

18
vcl/StaticLibrary_vclmain.mk
View File

@ -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: