fdo#50163 move definition of PLATFORMID into configure.in

Change-Id: Iea8385aa9213ccde7e6650cb934361597d508250

7 files changed, 5 insertions, 70 deletions

diff --git a/sdext/CustomTarget_presenter.mk b/sdext/CustomTarget_presenter.mk
index afecd49f763a..e559bde7167c 100644
--- a/sdext/CustomTarget_presenter.mk
+++ b/sdext/CustomTarget_presenter.mk
@@ -30,12 +30,10 @@ $(eval $(call gb_CustomTarget_CustomTarget,sdext/source/presenter/help/en-US/com
 $(call gb_CustomTarget_get_target,sdext/source/presenter/help/en-US/com.sun.PresenterScreen) : \
 	$(call gb_CustomTarget_get_workdir,sdext/source/presenter/help/en-US/com.sun.PresenterScreen)/presenter.xhp
 
-include $(SRCDIR)/sdext/platform.mk
-
 $(call gb_CustomTarget_get_workdir,sdext/source/presenter/help/en-US/com.sun.PresenterScreen)/presenter.xhp : \
 		$(SRCDIR)/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/presenter.xhp \
 		| $(call gb_CustomTarget_get_workdir,sdext/source/presenter/help/en-US/com.sun.PresenterScreen)/.dir
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),SED,1)
-	sed "s/PLATFORMID/$(sdext_PLATFORM)/" < $< > $@
+	sed "s/PLATFORMID/$(PLATFORMID)/" < $< > $@
 
 # vim:set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/sdext/Extension_minimizer.mk b/sdext/Extension_minimizer.mk
index 2e4d1ff27b86..17142fccf66b 100644
--- a/sdext/Extension_minimizer.mk
+++ b/sdext/Extension_minimizer.mk
@@ -25,12 +25,8 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-include $(dir $(realpath $(lastword $(MAKEFILE_LIST))))platform.mk
-
 $(eval $(call gb_Extension_Extension,presentation-minimizer,sdext/source/minimizer))
 
-$(eval $(call gb_Extension_set_platform,presentation-minimizer,$(sdext_PLATFORM)))
-
 $(eval $(call gb_Extension_add_libraries,presentation-minimizer,\
     SunPresentationMinimizer \
 ))
diff --git a/sdext/Extension_pdfimport.mk b/sdext/Extension_pdfimport.mk
index c5692dec763c..a97ddff3e13e 100644
--- a/sdext/Extension_pdfimport.mk
+++ b/sdext/Extension_pdfimport.mk
@@ -25,12 +25,8 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-include $(dir $(realpath $(lastword $(MAKEFILE_LIST))))platform.mk
-
 $(eval $(call gb_Extension_Extension,pdfimport,sdext/source/pdfimport))
 
-$(eval $(call gb_Extension_set_platform,pdfimport,$(sdext_PLATFORM)))
-
 $(eval $(call gb_Extension_add_file,pdfimport,components.rdb,$(call gb_Rdb_get_target,pdfimport)))
 
 $(eval $(call gb_Extension_add_libraries,pdfimport,\
diff --git a/sdext/Extension_presenter.mk b/sdext/Extension_presenter.mk
index 66f93a8f2a81..bdd584f0cc12 100644
--- a/sdext/Extension_presenter.mk
+++ b/sdext/Extension_presenter.mk
@@ -25,12 +25,8 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-include $(dir $(realpath $(lastword $(MAKEFILE_LIST))))platform.mk
-
 $(eval $(call gb_Extension_Extension,presenter-screen,sdext/source/presenter))
 
-$(eval $(call gb_Extension_set_platform,presenter-screen,$(sdext_PLATFORM)))
-
 $(eval $(call gb_Extension_add_libraries,presenter-screen,\
     PresenterScreen \
 ))
@@ -141,9 +137,9 @@ $(eval $(call gb_Extension_add_files,presenter-screen,registry/data/org/openoffi
     $(call gb_XcuDataTarget_get_target,sdext/source/presenter/registry/data/org/openoffice/Office/ProtocolHandler.xcu) \
 ))
 
-$(eval $(call gb_Extension_add_helpfile,presenter-screen,$(WORKDIR)/CustomTarget/sdext/source/presenter/help/en-US,com.sun.PresenterScreen-$(sdext_PLATFORM)/presenter.xhp,com.sun.PresenterScreen/presenter.xhp))
+$(eval $(call gb_Extension_add_helpfile,presenter-screen,$(WORKDIR)/CustomTarget/sdext/source/presenter/help/en-US,com.sun.PresenterScreen-$(PLATFORMID)/presenter.xhp,com.sun.PresenterScreen/presenter.xhp))
 
-$(eval $(call gb_Extension_add_helptreefile,presenter-screen,$(SRCDIR)/sdext/source/presenter/help/en-US,/help.tree,com.sun.PresenterScreen/help.tree,com.sun.PresenterScreen-$(sdext_PLATFORM)))
+$(eval $(call gb_Extension_add_helptreefile,presenter-screen,$(SRCDIR)/sdext/source/presenter/help/en-US,/help.tree,com.sun.PresenterScreen/help.tree,com.sun.PresenterScreen-$(PLATFORMID)))
 
 
 
diff --git a/sdext/Library_presenter.mk b/sdext/Library_presenter.mk
index ca404ca9f33d..7dcb3fd1551a 100644
--- a/sdext/Library_presenter.mk
+++ b/sdext/Library_presenter.mk
@@ -32,7 +32,7 @@ $(eval $(call gb_Library_set_componentfile,PresenterScreen,sdext/source/presente
 $(eval $(call gb_Library_use_sdk_api,PresenterScreen))
 
 $(eval $(call gb_Library_add_defs,PresenterScreen,\
-    -DPRESENTER_IMPL_IDENTIFIER=\"com.sun.PresenterScreen-$(sdext_PLATFORM)\" \
+    -DPRESENTER_IMPL_IDENTIFIER=\"com.sun.PresenterScreen-$(PLATFORMID)\" \
 ))
 
 $(eval $(call gb_Library_use_libraries,PresenterScreen,\
diff --git a/sdext/StaticLibrary_pdfimport_s.mk b/sdext/StaticLibrary_pdfimport_s.mk
index bf49da31070b..7e648abf8abf 100644
--- a/sdext/StaticLibrary_pdfimport_s.mk
+++ b/sdext/StaticLibrary_pdfimport_s.mk
@@ -25,8 +25,6 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-include $(dir $(realpath $(lastword $(MAKEFILE_LIST))))platform.mk
-
 $(eval $(call gb_StaticLibrary_StaticLibrary,pdfimport_s))
 
 $(eval $(call gb_StaticLibrary_use_packages,pdfimport_s,\
@@ -56,7 +54,7 @@ $(eval $(call gb_StaticLibrary_set_include,pdfimport_s,\
 
 $(eval $(call gb_StaticLibrary_add_defs,pdfimport_s,\
     -DBOOST_SPIRIT_USE_OLD_NAMESPACE \
-    -DPDFI_IMPL_IDENTIFIER=\"com.sun.star.PDFImport-$(sdext_PLATFORM)\" \
+    -DPDFI_IMPL_IDENTIFIER=\"com.sun.star.PDFImport-$(PLATFORMID)\" \
 ))
 
 $(eval $(call gb_StaticLibrary_add_exception_objects,pdfimport_s,\
diff --git a/sdext/platform.mk b/sdext/platform.mk
deleted file mode 100644
index 2c818c8e179d..000000000000
--- a/sdext/platform.mk
+++ /dev/null
@@ -1,49 +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.
-
-# TODO
-# https://bugs.freedesktop.org/show_bug.cgi?id=50163
-# move definition of PLATFORMID into configure.in
-#
-
-sdext__LOWERCASE_TABLE := A-a B-b C-c D-d E-e F-f G-g H-h I-i J-j K-k L-l M-m N-n O-o P-p R-r S-s T-t U-u V-v W-w X-x Y-y Z-z
-
-define sdext__lcase_impl
-$(if $(3),$(call sdext__lcase,$(firstword $(3)),$(3),$(subst $(1),$(2),$(4))),$(subst $(1),$(2),$(4)))
-endef
-
-define sdext__lcase
-$(call sdext__lcase_impl,$(firstword  $(subst -, ,$(1))),$(lastword $(subst -, ,$(1))),$(wordlist 2,$(words $(2)),$(2)),$(3))
-endef
-
-define sdext__lowercase
-$(call sdext__lcase,$(firstword $(sdext__LOWERCASE_TABLE)),$(sdext__LOWERCASE_TABLE),$(1))
-endef
-
-sdext_PLATFORM := $(call sdext__lowercase,$(RTL_OS)_$(RTL_ARCH))
-
-# vim:set shiftwidth=4 softtabstop=4 expandtab: