From 869b3a614c889a75c87e30afd180df7417cb47a8 Mon Sep 17 00:00:00 2001 From: Peter Foley Date: Sun, 14 Apr 2013 12:05:27 -0400 Subject: make file names match library names Change-Id: Id9b7decbf2f3cfc89e76e7c86a801904375971be --- sdext/Library_PresenterScreen.mk | 83 ++++++++++++++++++++++++++++++++++++++++ sdext/Library_presenter.mk | 83 ---------------------------------------- sdext/Module_sdext.mk | 2 +- sfx2/Library_qstart.mk | 69 --------------------------------- sfx2/Library_qstart_gtk.mk | 69 +++++++++++++++++++++++++++++++++ sfx2/Module_sfx2.mk | 2 +- 6 files changed, 154 insertions(+), 154 deletions(-) create mode 100644 sdext/Library_PresenterScreen.mk delete mode 100644 sdext/Library_presenter.mk delete mode 100644 sfx2/Library_qstart.mk create mode 100644 sfx2/Library_qstart_gtk.mk diff --git a/sdext/Library_PresenterScreen.mk b/sdext/Library_PresenterScreen.mk new file mode 100644 index 000000000000..63479c64d77d --- /dev/null +++ b/sdext/Library_PresenterScreen.mk @@ -0,0 +1,83 @@ +# -*- 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. +# +# Major Contributor(s): +# Copyright (C) 2012 Red Hat, Inc., David Tardon +# (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. + +$(eval $(call gb_Library_Library,PresenterScreen)) + +$(eval $(call gb_Library_set_componentfile,PresenterScreen,sdext/source/presenter/presenter)) + +$(eval $(call gb_Library_use_externals,PresenterScreen,\ + boost_headers \ +)) + +$(eval $(call gb_Library_use_sdk_api,PresenterScreen)) + +$(eval $(call gb_Library_use_libraries,PresenterScreen,\ + cppu \ + cppuhelper \ + sal \ + vcl \ +)) + +$(eval $(call gb_Library_add_exception_objects,PresenterScreen,\ + sdext/source/presenter/PresenterAccessibility \ + sdext/source/presenter/PresenterBitmapContainer \ + sdext/source/presenter/PresenterButton \ + sdext/source/presenter/PresenterCanvasHelper \ + sdext/source/presenter/PresenterComponent \ + sdext/source/presenter/PresenterConfigurationAccess \ + sdext/source/presenter/PresenterController \ + sdext/source/presenter/PresenterCurrentSlideObserver \ + sdext/source/presenter/PresenterFrameworkObserver \ + sdext/source/presenter/PresenterGeometryHelper \ + sdext/source/presenter/PresenterHelpView \ + sdext/source/presenter/PresenterHelper \ + sdext/source/presenter/PresenterNotesView \ + sdext/source/presenter/PresenterPaintManager \ + sdext/source/presenter/PresenterPane \ + sdext/source/presenter/PresenterPaneBase \ + sdext/source/presenter/PresenterPaneBorderManager \ + sdext/source/presenter/PresenterPaneBorderPainter \ + sdext/source/presenter/PresenterPaneContainer \ + sdext/source/presenter/PresenterPaneFactory \ + sdext/source/presenter/PresenterProtocolHandler \ + sdext/source/presenter/PresenterScreen \ + sdext/source/presenter/PresenterScrollBar \ + sdext/source/presenter/PresenterSlidePreview \ + sdext/source/presenter/PresenterSlideShowView \ + sdext/source/presenter/PresenterSlideSorter \ + sdext/source/presenter/PresenterSprite \ + sdext/source/presenter/PresenterSpritePane \ + sdext/source/presenter/PresenterTextView \ + sdext/source/presenter/PresenterTheme \ + sdext/source/presenter/PresenterTimer \ + sdext/source/presenter/PresenterToolBar \ + sdext/source/presenter/PresenterUIPainter \ + sdext/source/presenter/PresenterViewFactory \ + sdext/source/presenter/PresenterWindowManager \ +)) + +# vim:set noet sw=4 ts=4: diff --git a/sdext/Library_presenter.mk b/sdext/Library_presenter.mk deleted file mode 100644 index 63479c64d77d..000000000000 --- a/sdext/Library_presenter.mk +++ /dev/null @@ -1,83 +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. -# -# Major Contributor(s): -# Copyright (C) 2012 Red Hat, Inc., David Tardon -# (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. - -$(eval $(call gb_Library_Library,PresenterScreen)) - -$(eval $(call gb_Library_set_componentfile,PresenterScreen,sdext/source/presenter/presenter)) - -$(eval $(call gb_Library_use_externals,PresenterScreen,\ - boost_headers \ -)) - -$(eval $(call gb_Library_use_sdk_api,PresenterScreen)) - -$(eval $(call gb_Library_use_libraries,PresenterScreen,\ - cppu \ - cppuhelper \ - sal \ - vcl \ -)) - -$(eval $(call gb_Library_add_exception_objects,PresenterScreen,\ - sdext/source/presenter/PresenterAccessibility \ - sdext/source/presenter/PresenterBitmapContainer \ - sdext/source/presenter/PresenterButton \ - sdext/source/presenter/PresenterCanvasHelper \ - sdext/source/presenter/PresenterComponent \ - sdext/source/presenter/PresenterConfigurationAccess \ - sdext/source/presenter/PresenterController \ - sdext/source/presenter/PresenterCurrentSlideObserver \ - sdext/source/presenter/PresenterFrameworkObserver \ - sdext/source/presenter/PresenterGeometryHelper \ - sdext/source/presenter/PresenterHelpView \ - sdext/source/presenter/PresenterHelper \ - sdext/source/presenter/PresenterNotesView \ - sdext/source/presenter/PresenterPaintManager \ - sdext/source/presenter/PresenterPane \ - sdext/source/presenter/PresenterPaneBase \ - sdext/source/presenter/PresenterPaneBorderManager \ - sdext/source/presenter/PresenterPaneBorderPainter \ - sdext/source/presenter/PresenterPaneContainer \ - sdext/source/presenter/PresenterPaneFactory \ - sdext/source/presenter/PresenterProtocolHandler \ - sdext/source/presenter/PresenterScreen \ - sdext/source/presenter/PresenterScrollBar \ - sdext/source/presenter/PresenterSlidePreview \ - sdext/source/presenter/PresenterSlideShowView \ - sdext/source/presenter/PresenterSlideSorter \ - sdext/source/presenter/PresenterSprite \ - sdext/source/presenter/PresenterSpritePane \ - sdext/source/presenter/PresenterTextView \ - sdext/source/presenter/PresenterTheme \ - sdext/source/presenter/PresenterTimer \ - sdext/source/presenter/PresenterToolBar \ - sdext/source/presenter/PresenterUIPainter \ - sdext/source/presenter/PresenterViewFactory \ - sdext/source/presenter/PresenterWindowManager \ -)) - -# vim:set noet sw=4 ts=4: diff --git a/sdext/Module_sdext.mk b/sdext/Module_sdext.mk index 50b14ff8978e..efe1bb5b8611 100644 --- a/sdext/Module_sdext.mk +++ b/sdext/Module_sdext.mk @@ -28,7 +28,7 @@ $(eval $(call gb_Module_Module,sdext)) $(eval $(call gb_Module_add_targets,sdext,\ - Library_presenter \ + Library_PresenterScreen \ )) ifeq ($(ENABLE_MINIMIZER),YES) diff --git a/sfx2/Library_qstart.mk b/sfx2/Library_qstart.mk deleted file mode 100644 index bce79e495938..000000000000 --- a/sfx2/Library_qstart.mk +++ /dev/null @@ -1,69 +0,0 @@ -# -*- 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/. -# -# This file incorporates work covered by the following license notice: -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed -# with this work for additional information regarding copyright -# ownership. The ASF licenses this file to you under the Apache -# License, Version 2.0 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.apache.org/licenses/LICENSE-2.0 . -# - - -$(eval $(call gb_Library_Library,qstart_gtk)) - -$(eval $(call gb_Library_set_include,qstart_gtk,\ - $$(INCLUDE) \ - -I$(SRCDIR)/sfx2/inc \ - -I$(SRCDIR)/sfx2/inc/sfx2 \ -)) - -$(eval $(call gb_Library_use_sdk_api,qstart_gtk)) - -$(eval $(call gb_Library_add_defs,qstart_gtk,-DENABLE_QUICKSTART_APPLET)) - -ifeq ($(ENABLE_SYSTRAY_GTK),TRUE) -$(eval $(call gb_Library_add_defs,qstart_gtk,-DENABLE_SYSTRAY_GTK)) -endif - -$(eval $(call gb_Library_use_libraries,qstart_gtk,\ - comphelper \ - cppu \ - cppuhelper \ - fwe \ - i18nlangtag \ - sal \ - sax \ - sb \ - sot \ - svl \ - svt \ - tk \ - tl \ - ucbhelper \ - utl \ - vcl \ - sfx \ - $(gb_UWINAPI) \ -)) - -$(eval $(call gb_Library_use_externals,qstart_gtk,\ - boost_headers \ - gio \ - gtk \ - libxml2 \ -)) - -$(eval $(call gb_Library_add_exception_objects,qstart_gtk,\ - sfx2/source/appl/shutdowniconunx \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/sfx2/Library_qstart_gtk.mk b/sfx2/Library_qstart_gtk.mk new file mode 100644 index 000000000000..bce79e495938 --- /dev/null +++ b/sfx2/Library_qstart_gtk.mk @@ -0,0 +1,69 @@ +# -*- 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/. +# +# This file incorporates work covered by the following license notice: +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed +# with this work for additional information regarding copyright +# ownership. The ASF licenses this file to you under the Apache +# License, Version 2.0 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.apache.org/licenses/LICENSE-2.0 . +# + + +$(eval $(call gb_Library_Library,qstart_gtk)) + +$(eval $(call gb_Library_set_include,qstart_gtk,\ + $$(INCLUDE) \ + -I$(SRCDIR)/sfx2/inc \ + -I$(SRCDIR)/sfx2/inc/sfx2 \ +)) + +$(eval $(call gb_Library_use_sdk_api,qstart_gtk)) + +$(eval $(call gb_Library_add_defs,qstart_gtk,-DENABLE_QUICKSTART_APPLET)) + +ifeq ($(ENABLE_SYSTRAY_GTK),TRUE) +$(eval $(call gb_Library_add_defs,qstart_gtk,-DENABLE_SYSTRAY_GTK)) +endif + +$(eval $(call gb_Library_use_libraries,qstart_gtk,\ + comphelper \ + cppu \ + cppuhelper \ + fwe \ + i18nlangtag \ + sal \ + sax \ + sb \ + sot \ + svl \ + svt \ + tk \ + tl \ + ucbhelper \ + utl \ + vcl \ + sfx \ + $(gb_UWINAPI) \ +)) + +$(eval $(call gb_Library_use_externals,qstart_gtk,\ + boost_headers \ + gio \ + gtk \ + libxml2 \ +)) + +$(eval $(call gb_Library_add_exception_objects,qstart_gtk,\ + sfx2/source/appl/shutdowniconunx \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/sfx2/Module_sfx2.mk b/sfx2/Module_sfx2.mk index 4c852b7c1564..b50bcfc67429 100644 --- a/sfx2/Module_sfx2.mk +++ b/sfx2/Module_sfx2.mk @@ -41,7 +41,7 @@ endif ifneq (,$(filter LINUX DRAGONFLY OPENBSD FREEBSD NETBSD SOLARIS, $(OS))) ifeq ($(ENABLE_SYSTRAY_GTK),TRUE) $(eval $(call gb_Module_add_targets,sfx2,\ - Library_qstart \ + Library_qstart_gtk \ )) endif endif -- cgit