diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2013-05-26 13:52:02 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2013-10-02 22:07:16 +0200 |
| commit | 04496cb8697d7b68d4705148efaa7cf7d908a852 (patch) | |
| tree | 8d7746fbb53202a02e9e122d3bef57f361350bda | |
| parent | aac04a7f3c7f7c1bc8d75e8caa5e67eb38743afe (diff) | |
sdext: kill Package_pdfimport_xcu.mk
Change-Id: I88a402bf26852e8e216de11d71cbd42edb0aff23
| -rw-r--r-- | postprocess/CustomTarget_registry.mk | 4 | ||||
| -rw-r--r-- | sdext/Module_sdext.mk | 1 | ||||
| -rw-r--r-- | sdext/Package_pdfimport_xcu.mk | 15 | ||||
| -rw-r--r-- | sdext/source/pdfimport/config/pdf_types.xcu | 2 |
4 files changed, 3 insertions, 19 deletions
diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk index 068601943a14..cdb129b69e66 100644 --- a/postprocess/CustomTarget_registry.mk +++ b/postprocess/CustomTarget_registry.mk @@ -475,8 +475,8 @@ postprocess_OPTDEPS_pdfimport := calc draw impress math writer # impress, math, web, writer), add optional dependencies on those XCDS that # include those fcfg_X_types.xcu postprocess_FILES_pdfimport := \ - $(OUTDIR)/xml/pdfimport/pdf_import_filter.xcu \ - $(OUTDIR)/xml/pdfimport/pdf_types.xcu + $(SRCDIR)/sdext/source/pdfimport/config/pdf_import_filter.xcu \ + $(SRCDIR)/sdext/source/pdfimport/config/pdf_types.xcu endif ifeq (WNT,$(OS)) diff --git a/sdext/Module_sdext.mk b/sdext/Module_sdext.mk index c6e48d6d38a3..506bb1a4103b 100644 --- a/sdext/Module_sdext.mk +++ b/sdext/Module_sdext.mk @@ -27,7 +27,6 @@ $(eval $(call gb_Module_add_targets,sdext,\ CustomTarget_pdfimport \ Executable_xpdfimport \ Library_pdfimport \ - Package_pdfimport_xcu \ Package_pdfimport_xpdfimport \ StaticLibrary_pdfimport_s \ )) diff --git a/sdext/Package_pdfimport_xcu.mk b/sdext/Package_pdfimport_xcu.mk deleted file mode 100644 index cbc09710be69..000000000000 --- a/sdext/Package_pdfimport_xcu.mk +++ /dev/null @@ -1,15 +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/. -# - -$(eval $(call gb_Package_Package,pdfimport_xcu,$(SRCDIR)/sdext)) - -$(eval $(call gb_Package_add_file,pdfimport_xcu,xml/pdfimport/pdf_import_filter.xcu,source/pdfimport/config/pdf_import_filter.xcu)) -$(eval $(call gb_Package_add_file,pdfimport_xcu,xml/pdfimport/pdf_types.xcu,source/pdfimport/config/pdf_types.xcu)) - -# vim: set noet sw=4 ts=4: diff --git a/sdext/source/pdfimport/config/pdf_types.xcu b/sdext/source/pdfimport/config/pdf_types.xcu index 66ed8a8b7de6..d8128741ec03 100644 --- a/sdext/source/pdfimport/config/pdf_types.xcu +++ b/sdext/source/pdfimport/config/pdf_types.xcu @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE oor:component-data SYSTEM "../registry/component-update.dtd"> +<!DOCTYPE oor:component-data SYSTEM "../../../../officecfg/registry/component-update.dtd"> <!-- * This file is part of the LibreOffice project. * |