let gb_Extension do the necessary manifest updates

13 files changed, 4 insertions, 248 deletions

diff --git a/sdext/Extension_minimizer.mk b/sdext/Extension_minimizer.mk
index 2954d46388f7..547a63ae2fab 100644
--- a/sdext/Extension_minimizer.mk
+++ b/sdext/Extension_minimizer.mk
@@ -31,10 +31,6 @@ $(eval $(call gb_Extension_Extension,presentation-minimizer,sdext/source/minimiz
 
 $(eval $(call gb_Extension_set_platform,presentation-minimizer,$(sdext_PLATFORM)))
 
-$(eval $(call gb_Extension_add_package_dependencies,presentation-minimizer,\
-    sdext_minimizer_manifest \
-))
-
 $(eval $(call gb_Extension_add_file,presentation-minimizer,$(call gb_Library_get_dllname,SunPresentationMinimizer),$(call gb_Library_get_target,SunPresentationMinimizer)))
 
 $(eval $(call gb_Extension_add_files,presentation-minimizer,bitmaps,\
diff --git a/sdext/Extension_pdfimport.mk b/sdext/Extension_pdfimport.mk
index 2cba816c93aa..724c00ea455e 100644
--- a/sdext/Extension_pdfimport.mk
+++ b/sdext/Extension_pdfimport.mk
@@ -31,11 +31,8 @@ $(eval $(call gb_Extension_Extension,pdfimport,sdext/source/pdfimport))
 
 $(eval $(call gb_Extension_set_platform,pdfimport,$(sdext_PLATFORM)))
 
-$(eval $(call gb_Extension_set_manifest,pdfimport,$(WORKDIR)/CustomTarget/sdext/source/pdfimport/config/manifest.xml))
-
 $(eval $(call gb_Extension_add_package_dependencies,pdfimport,\
     sdext_pdfimport_keywords \
-    sdext_pdfimport_manifest \
 ))
 
 $(eval $(call gb_Extension_add_files,pdfimport,.,\
diff --git a/sdext/Extension_presenter.mk b/sdext/Extension_presenter.mk
index 0f47585e881b..ee31f444985f 100644
--- a/sdext/Extension_presenter.mk
+++ b/sdext/Extension_presenter.mk
@@ -31,11 +31,8 @@ $(eval $(call gb_Extension_Extension,presenter-screen,sdext/source/presenter))
 
 $(eval $(call gb_Extension_set_platform,presenter-screen,$(sdext_PLATFORM)))
 
-$(eval $(call gb_Extension_set_manifest,presenter-screen,$(WORKDIR)/CustomTarget/sdext/source/presenter/manifest.xml))
-
 $(eval $(call gb_Extension_add_package_dependencies,presenter-screen,\
     sdext_presenter_help \
-    sdext_presenter_manifest \
 ))
 
 $(eval $(call gb_Extension_add_files,presenter-screen,,\
diff --git a/sdext/Module_sdext.mk b/sdext/Module_sdext.mk
index 10a7643a860c..a8fef26590e4 100644
--- a/sdext/Module_sdext.mk
+++ b/sdext/Module_sdext.mk
@@ -32,7 +32,6 @@ $(eval $(call gb_Module_add_targets,sdext,\
     Configuration_minimizer \
     Extension_minimizer \
     Library_minimizer \
-    Package_minimizer_manifest \
     Zip_minimizer \
 ))
 endif
@@ -45,7 +44,6 @@ $(eval $(call gb_Module_add_targets,sdext,\
     Extension_pdfimport \
     Library_pdfimport \
     Package_pdfimport_keywords \
-    Package_pdfimport_manifest \
 ))
 endif
 
@@ -55,7 +53,6 @@ $(eval $(call gb_Module_add_targets,sdext,\
     Extension_presenter \
     Library_presenter \
     Package_presenter_help \
-    Package_presenter_manifest \
     Zip_presenter \
 ))
 endif
diff --git a/sdext/Package_minimizer_manifest.mk b/sdext/Package_minimizer_manifest.mk
deleted file mode 100644
index dd4fe591b303..000000000000
--- a/sdext/Package_minimizer_manifest.mk
+++ /dev/null
@@ -1,36 +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 <dtardon@redhat.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.
-
-$(eval $(call gb_Package_Package,sdext_minimizer_manifest,$(WORKDIR)/CustomTarget/sdext/source/minimizer))
-
-$(eval $(call gb_Package_add_customtarget,sdext_minimizer_manifest,sdext/source/minimizer))
-
-$(eval $(call gb_CustomTarget_add_dependencies,sdext/source/minimizer,\
-    sdext/source/minimizer/manifest.xml \
-))
-
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/sdext/Package_pdfimport_manifest.mk b/sdext/Package_pdfimport_manifest.mk
deleted file mode 100644
index 91e5644da2f4..000000000000
--- a/sdext/Package_pdfimport_manifest.mk
+++ /dev/null
@@ -1,36 +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 <dtardon@redhat.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.
-
-$(eval $(call gb_Package_Package,sdext_pdfimport_manifest,$(WORKDIR)/CustomTarget/sdext/source/pdfimport/config))
-
-$(eval $(call gb_Package_add_customtarget,sdext_pdfimport_manifest,sdext/source/pdfimport/config))
-
-$(eval $(call gb_CustomTarget_add_dependencies,sdext/source/pdfimport/config,\
-    sdext/source/pdfimport/config/manifest.xml \
-))
-
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/sdext/Package_presenter_manifest.mk b/sdext/Package_presenter_manifest.mk
deleted file mode 100644
index 43c1a5e1fce1..000000000000
--- a/sdext/Package_presenter_manifest.mk
+++ /dev/null
@@ -1,36 +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 <dtardon@redhat.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.
-
-$(eval $(call gb_Package_Package,sdext_presenter_manifest,$(WORKDIR)/CustomTarget/sdext/source/presenter))
-
-$(eval $(call gb_Package_add_customtarget,sdext_presenter_manifest,sdext/source/presenter))
-
-$(eval $(call gb_CustomTarget_add_dependencies,sdext/source/presenter,\
-    sdext/source/presenter/manifest.xml \
-))
-
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/sdext/source/minimizer/Makefile b/sdext/source/minimizer/Makefile
deleted file mode 100644
index 2f7171a3fef1..000000000000
--- a/sdext/source/minimizer/Makefile
+++ /dev/null
@@ -1,40 +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 <dtardon@redhat.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.
-
-PARTIAL_BUILD := T
-SOURCEDIR := $(dir $(realpath $(lastword $(MAKEFILE_LIST))))
-
-include $(GBUILDDIR)/gbuild_simple.mk
-
-manifest.xml :
-	sed "s/SHARED_EXTENSION/$(gb_Library_DLLEXT)/" $(SOURCEDIR)manifest.xml > $@
-
-.DEFAULT_GOAL := all
-.PHONY : all
-all : manifest.xml
-
-# vim:set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/sdext/source/minimizer/manifest.xml b/sdext/source/minimizer/manifest.xml
index 5f86b4d1c16f..4b55ddd22f0d 100644
--- a/sdext/source/minimizer/manifest.xml
+++ b/sdext/source/minimizer/manifest.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE manifest:manifest PUBLIC "-//OpenOffice.org//DTD Manifest 1.0//EN" "Manifest.dtd">
 <manifest:manifest xmlns:manifest="http://openoffice.org/2001/manifest">
   <manifest:file-entry manifest:media-type="application/vnd.sun.star.uno-component;type=native"
-                       manifest:full-path="SunPresentationMinimizer.unoSHARED_EXTENSION"/>
+                       manifest:full-path="SunPresentationMinimizer.uno@SHARED_EXTENSION@"/>
   <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-schema"
                        manifest:full-path="registry/schema/org/openoffice/Office/extension/SunPresentationMinimizer.xcs"/>
   <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
diff --git a/sdext/source/pdfimport/config/Makefile b/sdext/source/pdfimport/config/Makefile
deleted file mode 100644
index 8fa754bdf5bd..000000000000
--- a/sdext/source/pdfimport/config/Makefile
+++ /dev/null
@@ -1,43 +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 <dtardon@redhat.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.
-
-PARTIAL_BUILD := T
-SOURCEDIR := $(dir $(realpath $(lastword $(MAKEFILE_LIST))))
-
-include $(GBUILDDIR)/gbuild_simple.mk
-
-manifest.xml :
-	sed \
-		-e "s/EXEC_EXTENSION/$(gb_Executable_EXT)/" \
-		-e "s/SHARED_EXTENSION/$(gb_Library_DLLEXT)/" \
-	   	$(SOURCEDIR)manifest.xml > $@
-
-.DEFAULT_GOAL := all
-.PHONY : all
-all : manifest.xml
-
-# vim:set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/sdext/source/pdfimport/config/manifest.xml b/sdext/source/pdfimport/manifest.xml
index 834526d86ae7..5a0aaa5e96ac 100644
--- a/sdext/source/pdfimport/config/manifest.xml
+++ b/sdext/source/pdfimport/manifest.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE manifest:manifest PUBLIC "-//OpenOffice.org//DTD Manifest 1.0//EN" "Manifest.dtd">
 <manifest:manifest xmlns:manifest="http://openoffice.org/2001/manifest">
   <manifest:file-entry manifest:media-type="application/vnd.sun.star.uno-component;type=native"
-                       manifest:full-path="pdfimport.unoSHARED_EXTENSION"/>
+                       manifest:full-path="pdfimport.uno@SHARED_EXTENSION@"/>
   <manifest:file-entry manifest:media-type="application/vnd.sun.star.executable"
-                       manifest:full-path="xpdfimportEXEC_EXTENSION"/>
+                       manifest:full-path="xpdfimport@EXEC_EXTENSION@"/>
   <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
                        manifest:full-path="pdf_import_filter.xcu"/>
   <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
diff --git a/sdext/source/presenter/Makefile b/sdext/source/presenter/Makefile
deleted file mode 100644
index 2f7171a3fef1..000000000000
--- a/sdext/source/presenter/Makefile
+++ /dev/null
@@ -1,40 +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 <dtardon@redhat.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.
-
-PARTIAL_BUILD := T
-SOURCEDIR := $(dir $(realpath $(lastword $(MAKEFILE_LIST))))
-
-include $(GBUILDDIR)/gbuild_simple.mk
-
-manifest.xml :
-	sed "s/SHARED_EXTENSION/$(gb_Library_DLLEXT)/" $(SOURCEDIR)manifest.xml > $@
-
-.DEFAULT_GOAL := all
-.PHONY : all
-all : manifest.xml
-
-# vim:set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/sdext/source/presenter/manifest.xml b/sdext/source/presenter/manifest.xml
index bb79f9e8ea3c..e1d1e2bde90f 100644
--- a/sdext/source/presenter/manifest.xml
+++ b/sdext/source/presenter/manifest.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE manifest:manifest PUBLIC "-//OpenOffice.org//DTD Manifest 1.0//EN" "Manifest.dtd">
 <manifest:manifest xmlns:manifest="http://openoffice.org/2001/manifest">
   <manifest:file-entry manifest:media-type="application/vnd.sun.star.uno-component;type=native"
-    manifest:full-path="PresenterScreen.unoSHARED_EXTENSION"/>
+    manifest:full-path="PresenterScreen.uno@SHARED_EXTENSION@"/>
   <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
     manifest:full-path="registry/data/org/openoffice/Office/Jobs.xcu"/>
   <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"