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

17 files changed, 13 insertions, 50 deletions

diff --git a/Repository.mk b/Repository.mk
index 950a23983b63..175adbdccee5 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -361,7 +361,6 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
     libeay32 \
     ssleay32 \
     ooopathutils \
-	salmain \
 	sample \
     salcpprt \
 	vclmain \
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index aa37877cb047..16f1c8f0d546 100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -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))
diff --git a/automation/Executable_miniapp.mk b/automation/Executable_miniapp.mk
index 7ddd9d9b6733..e9ae6f1ef7d9 100644
--- a/automation/Executable_miniapp.mk
+++ b/automation/Executable_miniapp.mk
@@ -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,\
diff --git a/automation/Executable_testtool.mk b/automation/Executable_testtool.mk
index 8d9327c1b9be..0d782c7fb949 100644
--- a/automation/Executable_testtool.mk
+++ b/automation/Executable_testtool.mk
@@ -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 \
 ))
 
diff --git a/solenv/inc/_tg_app.mk b/solenv/inc/_tg_app.mk
index 4a98fae26ed7..b5a7956cf205 100644
--- a/solenv/inc/_tg_app.mk
+++ b/solenv/inc/_tg_app.mk
@@ -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
 
diff --git a/solenv/inc/tg_app.mk b/solenv/inc/tg_app.mk
index c49ee04b33b3..3e81367f9be4 100644
--- a/solenv/inc/tg_app.mk
+++ b/solenv/inc/tg_app.mk
@@ -61,7 +61,7 @@ APP$(TNR)STACKN=
 
 .IF "$(APP$(TNR)NOSAL)"==""
 .IF "$(TARGETTYPE)" == "GUI"
-APP$(TNR)OBJS+= $(STDOBJVCL)
+APP$(TNR)STDLIB+= -lvclmain
 .ENDIF
 .ENDIF
 
diff --git a/solenv/inc/unxgcc.mk b/solenv/inc/unxgcc.mk
index 752de80c7b36..f85c7dca53ad 100644
--- a/solenv/inc/unxgcc.mk
+++ b/solenv/inc/unxgcc.mk
@@ -206,7 +206,6 @@ SONAME_SWITCH=-Wl,-h
 STDLIBCPP=-lstdc++
 
 # default objectfilenames to link
-STDOBJVCL=$(L)$/salmain.o
 STDOBJGUI=
 STDSLOGUI=
 STDOBJCUI=
diff --git a/solenv/inc/unxiosr.mk b/solenv/inc/unxiosr.mk
index 8562e2f5f769..773457a0d786 100644
--- a/solenv/inc/unxiosr.mk
+++ b/solenv/inc/unxiosr.mk
@@ -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=
diff --git a/solenv/inc/unxmacx.mk b/solenv/inc/unxmacx.mk
index 31c4a8b27d47..5d4136eefcd2 100644
--- a/solenv/inc/unxmacx.mk
+++ b/solenv/inc/unxmacx.mk
@@ -226,7 +226,6 @@ SONAME_SWITCH=-Wl,-h
 
 STDLIBCPP=-lstdc++
 
-STDOBJVCL=$(L)/salmain.o
 STDOBJGUI=
 STDSLOGUI=
 STDOBJCUI=
diff --git a/solenv/inc/unxsogi.mk b/solenv/inc/unxsogi.mk
index 1991089709f9..2ebcbc468e42 100644
--- a/solenv/inc/unxsogi.mk
+++ b/solenv/inc/unxsogi.mk
@@ -98,7 +98,6 @@ CDEFS += -DHAVE_GCC_VISIBILITY_FEATURE
 
 STDLIBCPP=-lstdc++
 
-STDOBJVCL=$(L)/salmain.o
 STDOBJGUI=
 STDSLOGUI=
 STDOBJCUI=
diff --git a/solenv/inc/unxsogs.mk b/solenv/inc/unxsogs.mk
index 5400be270e9b..4f80b42c0a4a 100644
--- a/solenv/inc/unxsogs.mk
+++ b/solenv/inc/unxsogs.mk
@@ -97,7 +97,6 @@ CDEFS += -DHAVE_GCC_VISIBILITY_FEATURE
 
 STDLIBCPP=-lstdc++
 
-STDOBJVCL=$(L)/salmain.o
 STDOBJGUI=
 STDSLOGUI=
 STDOBJCUI=
diff --git a/solenv/inc/unxsoli4.mk b/solenv/inc/unxsoli4.mk
index a14da5da1a26..3c2bf5f38194 100644
--- a/solenv/inc/unxsoli4.mk
+++ b/solenv/inc/unxsoli4.mk
@@ -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
diff --git a/solenv/inc/unxsols4.mk b/solenv/inc/unxsols4.mk
index 11b6f15473aa..4728d595cc95 100644
--- a/solenv/inc/unxsols4.mk
+++ b/solenv/inc/unxsols4.mk
@@ -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
diff --git a/solenv/inc/unxsolu4.mk b/solenv/inc/unxsolu4.mk
index 76da3103880a..f0129ea645f0 100644
--- a/solenv/inc/unxsolu4.mk
+++ b/solenv/inc/unxsolu4.mk
@@ -113,8 +113,6 @@ CFLAGSWERRCXX=-xwe
 # settings.mk):
 MODULES_WITH_WARNINGS :=
 
-STDOBJVCL=$(L)/salmain.o
-
 THREADLIB=
 LINK=$(CXX)
 LINKC=$(CC)
diff --git a/solenv/inc/wntgcci.mk b/solenv/inc/wntgcci.mk
index 24b7e4e058c8..85b6a91b9a5c 100644
--- a/solenv/inc/wntgcci.mk
+++ b/solenv/inc/wntgcci.mk
@@ -131,7 +131,6 @@ MINGW_LIBGCC=-lgcc_eh -lgcc
 MINGW_LIBGCC=-lgcc
 .ENDIF
 .ENDIF
-STDOBJVCL=$(L)$/salmain.obj
 STDOBJGUI=
 STDSLOGUI=
 STDOBJCUI=
diff --git a/solenv/inc/wntmsc.mk b/solenv/inc/wntmsc.mk
index 41c1ea51c801..bf94a0f04fa9 100644
--- a/solenv/inc/wntmsc.mk
+++ b/solenv/inc/wntmsc.mk
@@ -298,7 +298,6 @@ LIBCPMT=libcpmt.lib
 .ENDIF # "$(USE_DEBUG_RUNTIME)" != ""
 .ENDIF # "$(DYNAMIC_CRT)"!=""
 
-STDOBJVCL=$(L)/salmain.obj
 STDOBJGUI=
 STDSLOGUI=
 STDOBJCUI=
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: