diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2011-11-18 13:44:04 +0100 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2011-11-24 18:43:57 +0100 |
| commit | f333a9de04f3f52a068090db247c6872fd9014e6 (patch) | |
| tree | 237a16e17cf50acf04d951f5dfcb39d654860500 | |
| parent | 01d10fc1f1affc42e6cdc833b4544490a8ed9ce2 (diff) | |
clean up .mk files for oox generated files
one was unused, and keep similar things together
| -rw-r--r-- | oox/Package_generated.mk | 1 | ||||
| -rw-r--r-- | oox/Package_source.mk | 32 | ||||
| -rw-r--r-- | oox/Package_tokens.mk | 1 |
3 files changed, 1 insertions, 33 deletions
diff --git a/oox/Package_generated.mk b/oox/Package_generated.mk index 66f18e0f3919..9bd36d9de9de 100644 --- a/oox/Package_generated.mk +++ b/oox/Package_generated.mk @@ -28,7 +28,6 @@ $(eval $(call gb_Package_Package,oox_generated,$(WORKDIR)/oox)) -$(eval $(call gb_Package_add_file,oox_generated,inc/oox/namespaces.txt,misc/namespaces.txt)) $(eval $(call gb_Package_add_file,oox_generated,inc/oox/token/tokens.hxx,inc/oox/token/tokens.hxx)) # vim: set noet sw=4 ts=4: diff --git a/oox/Package_source.mk b/oox/Package_source.mk deleted file mode 100644 index 9a4e9613fd73..000000000000 --- a/oox/Package_source.mk +++ /dev/null @@ -1,32 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2011 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -$(eval $(call gb_Package_Package,oox_source,$(SRCDIR)/oox/source)) -$(eval $(call gb_Package_add_file,oox_source,inc/oox/tokens.txt,token/tokens.txt)) - -# vim: set noet sw=4 ts=4: diff --git a/oox/Package_tokens.mk b/oox/Package_tokens.mk index 5eb2073589dc..96eb52137928 100644 --- a/oox/Package_tokens.mk +++ b/oox/Package_tokens.mk @@ -29,5 +29,6 @@ $(eval $(call gb_Package_Package,oox_tokens,$(SRCDIR)/oox/source/token)) $(eval $(call gb_Package_add_file,oox_tokens,inc/oox/tokens.txt,tokens.txt)) +$(eval $(call gb_Package_add_file,oox_tokens,inc/oox/namespaces.txt,namespaces.txt)) # vim: set noet sw=4 ts=4: |