replace findsofficepath.obj by static lib

Change-Id: I652ac46aec72a92667995353efa637f0a2310672

Repository.mk

@@ -651,6 +651,7 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
     codemaker_java \
     cosv \
     dtobj \
+	findsofficepath \
     headless \
     libeay32 \
     npsoenv \

cppuhelper/Library_cppuhelper.mk

@@ -29,10 +29,6 @@ $(eval $(call gb_Library_Library,cppuhelper))
 
 $(eval $(call gb_Library_set_soversion_script,cppuhelper,3,$(SRCDIR)/cppuhelper/source/gcc3.map))
 
-$(eval $(call gb_Library_use_packages,cppuhelper,\
-	cppuhelper_inc \
-))
-
 $(eval $(call gb_Library_use_internal_comprehensive_api,cppuhelper,\
 	cppuhelper \
 	udkapi \
@@ -51,8 +47,8 @@ $(eval $(call gb_Library_use_libraries,cppuhelper,\
 	$(gb_UWINAPI) \
 ))
 
-$(eval $(call gb_Library_add_cobjects,cppuhelper,\
-	cppuhelper/source/findsofficepath \
+$(eval $(call gb_Library_use_static_libraries,cppuhelper,\
+	findsofficepath \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,cppuhelper,\

cppuhelper/Module_cppuhelper.mk

@@ -31,9 +31,9 @@ $(eval $(call gb_Module_add_targets,cppuhelper,\
 	CustomTarget_cppuhelper_allheaders \
 	InternalUnoApi_cppuhelper \
 	Library_cppuhelper \
-	Package_findsofficepath \
 	Package_inc \
 	Package_unorc \
+	StaticLibrary_findsofficepath \
 ))
 
 $(eval $(call gb_Module_add_check_targets,cppuhelper,\

cppuhelper/Package_findsofficepath.mk

-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
-#
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2011 Matúš Kukan <matus.kukan@gmail.com> (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-# UGLY HACK for odk/source/unoapploader/ where we need findsofficepath.o
-$(eval $(call gb_Package_Package,cppuhelper_findsofficepath,$(WORKDIR)/CObject/cppuhelper/source))
-
-$(eval $(call gb_Package_add_file,cppuhelper_findsofficepath,lib/findsofficepath.o,findsofficepath.o))
-$(eval $(call gb_Package_add_file,cppuhelper_findsofficepath,lib/findsofficepath.obj,findsofficepath.o))
-
-# vim: set noet sw=4 ts=4:

cppuhelper/StaticLibrary_findsofficepath.mk

+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_StaticLibrary_StaticLibrary,findsofficepath))
+
+$(eval $(call gb_StaticLibrary_use_packages,findsofficepath,\
+    cppuhelper_inc \
+    sal_inc \
+))
+
+$(eval $(call gb_StaticLibrary_add_cobjects,findsofficepath,\
+	cppuhelper/source/findsofficepath \
+))
+
+# vim: set noet sw=4 ts=4:

odk/source/unoapploader/unx/makefile.mk

@@ -53,7 +53,8 @@ APP1RPATH=NONE
 
 APP1TARGET= $(TARGET)
 
-APP1OBJS=   $(OBJ)$/unoapploader.obj $(SOLARLIBDIR)$/findsofficepath.obj
+APP1OBJS=   $(OBJ)$/unoapploader.obj
+APP1STDLIBS=-lfindsofficepath
 
 # --- Targets ------------------------------------------------------
 

odk/source/unoapploader/win/makefile.mk

@@ -38,7 +38,8 @@ APP1RPATH=NONE
 
 APP1TARGET= $(TARGET)
 
-APP1OBJS=   $(OBJ)$/unoapploader.obj $(SOLARLIBDIR)$/findsofficepath.obj
+APP1OBJS=   $(OBJ)$/unoapploader.obj
+APP1STDLIBS=findsofficepath.lib
 
 APP1STDLIBS=\
             $(ADVAPI32LIB)