let gb_Extension do the necessary manifest updates

6 files changed, 4 insertions, 127 deletions

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"