[Libreoffice-commits] .: Repository.mk tools/Executable_rscdep.mk tools/Module_tools.mk tools/StaticLibrary_toolshelpers.mk

[Norbert Thiebaud]

 Repository.mk                       |    1 
 tools/Executable_rscdep.mk          |   13 ++++---
 tools/Module_tools.mk               |    1 
 tools/StaticLibrary_toolshelpers.mk |   65 ------------------------------------
 4 files changed, 8 insertions(+), 72 deletions(-)

New commits:
commit 5c5282bc5ce047279b942779eafea8568b2e1c21
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Tue Aug 16 11:47:20 2011 -0500

    nothing seems to be using toolshelpers.a but rscdep, fold it in rscep

diff --git a/Repository.mk b/Repository.mk
index dfad57d..8d9eb9c 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -229,7 +229,6 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
     ooopathutils \
 	sample \
     salcpprt \
-    toolshelpers \
 	vclmain \
 	writerperfect \
 ))
diff --git a/tools/Executable_rscdep.mk b/tools/Executable_rscdep.mk
index 61462c6..3b1d383 100644
--- a/tools/Executable_rscdep.mk
+++ b/tools/Executable_rscdep.mk
@@ -40,18 +40,21 @@ $(eval $(call gb_Executable_add_defs,rscdep,\
 ))
 
 $(eval $(call gb_Executable_add_linked_libs,rscdep,\
-    tl \
     comphelper \
     sal \
+    tl \
     $(gb_STDLIBS) \
 ))
 
-$(eval $(call gb_Executable_add_exception_objects,rscdep,\
-    tools/bootstrp/rscdep \
+$(eval $(call gb_Executable_add_api,rscdep,\
+    udkapi \
+    offapi \
 ))
 
-$(eval $(call gb_Executable_add_linked_static_libs,rscdep,\
-	toolshelpers \
+$(eval $(call gb_Executable_add_exception_objects,rscdep,\
+    tools/bootstrp/rscdep \
+    tools/bootstrp/cppdep \
+    tools/bootstrp/prj \
 ))
 
 ifeq ($(OS),WNT)
diff --git a/tools/Module_tools.mk b/tools/Module_tools.mk
index dc8fbbc..afd3366 100644
--- a/tools/Module_tools.mk
+++ b/tools/Module_tools.mk
@@ -34,7 +34,6 @@ $(eval $(call gb_Module_add_targets,tools,\
     Package_inc \
     Package_reversemap \
     StaticLibrary_ooopathutils \
-    StaticLibrary_toolshelpers \
 ))
 
 $(eval $(call gb_Module_add_check_targets,tools,\
diff --git a/tools/StaticLibrary_toolshelpers.mk b/tools/StaticLibrary_toolshelpers.mk
deleted file mode 100644
index 6c6b9ea..0000000
--- a/tools/StaticLibrary_toolshelpers.mk
+++ /dev/null
@@ -1,65 +0,0 @@
-# -*- Mode: makefile-gmake; 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.
-#
-# The Initial Developer of the Original Code is
-#       Bjoern Michaelsen, Canonical Ltd. <bjoern.michaelsen at canonical.com>
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
-# Major Contributor(s):
-#
-# 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.
-
-$(eval $(call gb_StaticLibrary_StaticLibrary,toolshelpers))
-
-$(eval $(call gb_StaticLibrary_set_include,toolshelpers,\
-    $$(INCLUDE) \
-    -I$(realpath $(SRCDIR)/tools/inc) \
-    -I$(realpath $(SRCDIR)/tools/inc/pch) \
-    -I$(realpath $(SRCDIR)/tools/bootstrp) \
-))
-
-$(eval $(call gb_StaticLibrary_add_api,toolshelpers,\
-    udkapi \
-    offapi \
-))
-
-$(eval $(call gb_StaticLibrary_add_cxxflags,toolshelpers,\
-    -D_TOOLS_STRINGLIST \
-))
-
-$(eval $(call gb_StaticLibrary_add_exception_objects,toolshelpers,\
-    tools/bootstrp/cppdep \
-    tools/bootstrp/prj \
-))
-
-ifeq ($(OS),WNT)
-ifeq ($(HAVE_GETOPT),YES)
-$(eval $(call gb_StaticLibrary_set_cxxflags,toolshelpers,\
-    $$(CXXFLAGS) \
-    -DHAVE_GETOPT \
-))
-else
-$(eval $(call gb_StaticLibrary_add_linked_libs,toolshelpers,\
-    gnu_getopt \
-))
-endif
-endif
-
-# vim: set noet sw=4 ts=4: