summaryrefslogtreecommitdiff
path: root/sdext
diff options
context:
space:
mode:
authorMatúš Kukan <matus.kukan@gmail.com>2012-03-30 19:57:06 +0200
committerMatúš Kukan <matus.kukan@gmail.com>2012-04-04 11:31:58 +0200
commitbe3c5c7c56673337c634c097cca0e1eaf2895891 (patch)
tree4c751808df27dcc97405c3c0577e479598dd6fc8 /sdext
parentb635ee568cba6dc828084cdbd9e9b9995ddf7a68 (diff)
sdext: use CustomTarget makefiles
Diffstat (limited to 'sdext')
-rw-r--r--sdext/CustomTarget_pdfimport.mk (renamed from sdext/source/pdfimport/wrapper/Makefile)14
-rw-r--r--sdext/CustomTarget_presenter.mk (renamed from sdext/source/presenter/help/en-US/com.sun.PresenterScreen/Makefile)19
-rw-r--r--sdext/Extension_pdfimport.mk4
-rw-r--r--sdext/Extension_presenter.mk8
-rw-r--r--sdext/Library_pdfimport.mk1
-rw-r--r--sdext/Module_sdext.mk4
-rw-r--r--sdext/Package_pdfimport_keywords.mk36
-rw-r--r--sdext/Package_presenter_help.mk36
-rw-r--r--sdext/StaticLibrary_pdfimport_s.mk5
9 files changed, 22 insertions, 105 deletions
diff --git a/sdext/source/pdfimport/wrapper/Makefile b/sdext/CustomTarget_pdfimport.mk
index 868182ba7023..3e57b3d7e5aa 100644
--- a/sdext/source/pdfimport/wrapper/Makefile
+++ b/sdext/CustomTarget_pdfimport.mk
@@ -25,13 +25,15 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-gb_PARTIALBUILD := T
+$(eval $(call gb_CustomTarget_CustomTarget,sdext/pdfimport,new_style))
-hash.cxx : $(SRCDIR)/sdext/source/pdfimport/wrapper/keyword_list
- $(GPERF) -C -t -l -L C++ -m 20 -Z PdfKeywordHash -k'4-5,$$' $< > $@
+SEPI := $(call gb_CustomTarget_get_workdir,sdext/pdfimport)
+
+$(call gb_CustomTarget_get_target,sdext/pdfimport) : $(SEPI)/hash.cxx
-.DEFAULT_GOAL := all
-.PHONY : all
-all : hash.cxx
+$(SEPI)/hash.cxx : $(SRCDIR)/sdext/source/pdfimport/wrapper/keyword_list \
+ | $(SEPI)/.dir
+ $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),GPF,1)
+ $(GPERF) -C -t -l -L C++ -m 20 -Z PdfKeywordHash -k'4-5,$$' $< > $@
# vim:set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/Makefile b/sdext/CustomTarget_presenter.mk
index ecef202a71d1..fee465c5917a 100644
--- a/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/Makefile
+++ b/sdext/CustomTarget_presenter.mk
@@ -25,16 +25,19 @@
# 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))))
+$(eval $(call gb_CustomTarget_CustomTarget,sdext/source/presenter/help/en-US/com.sun.PresenterScreen,new_style))
-include $(SRCDIR)/sdext/platform.mk
+SEPR := $(call gb_CustomTarget_get_workdir,sdext/source/presenter/help/en-US/com.sun.PresenterScreen)
+
+$(call gb_CustomTarget_get_target,sdext/source/presenter/help/en-US/com.sun.PresenterScreen) : \
+ $(SEPR)/presenter.xhp
-presenter.xhp :
- sed "s/PLATFORMID/$(sdext_PLATFORM)/" < $(SOURCEDIR)/presenter.xhp > $@
+include $(SRCDIR)/sdext/platform.mk
-.DEFAULT_GOAL := all
-.PHONY : all
-all : presenter.xhp
+$(SEPR)/presenter.xhp : \
+ $(SRCDIR)/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/presenter.xhp \
+ | $(SEPR)/.dir
+ $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),SED,1)
+ sed "s/PLATFORMID/$(sdext_PLATFORM)/" < $< > $@
# vim:set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/sdext/Extension_pdfimport.mk b/sdext/Extension_pdfimport.mk
index 2e32699ffd0d..b2a7786ec69f 100644
--- a/sdext/Extension_pdfimport.mk
+++ b/sdext/Extension_pdfimport.mk
@@ -31,10 +31,6 @@ $(eval $(call gb_Extension_Extension,pdfimport,sdext/source/pdfimport))
$(eval $(call gb_Extension_set_platform,pdfimport,$(sdext_PLATFORM)))
-$(eval $(call gb_Extension_add_package_dependencies,pdfimport,\
- sdext_pdfimport_keywords \
-))
-
$(eval $(call gb_Extension_add_files,pdfimport,,\
$(call gb_Executable_get_target,xpdfimport) \
$(call gb_Library_get_target,pdfimport) \
diff --git a/sdext/Extension_presenter.mk b/sdext/Extension_presenter.mk
index 3fa9806b61e4..a0932f91d8c8 100644
--- a/sdext/Extension_presenter.mk
+++ b/sdext/Extension_presenter.mk
@@ -31,10 +31,6 @@ $(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_package_dependencies,presenter-screen,\
- sdext_presenter_help \
-))
-
$(eval $(call gb_Extension_add_files,presenter-screen,,\
$(call gb_Library_get_target,PresenterScreen) \
))
@@ -149,8 +145,4 @@ $(eval $(call gb_Extension_add_files,presenter-screen,help/en-US/com.sun.Present
$(eval $(call gb_Extension_localize_help,presenter-screen,help/lang/com.sun.PresenterScreen-$(sdext_PLATFORM)/presenter.xhp,$(WORKDIR)/CustomTarget/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/presenter.xhp))
-# this file is created by a custom target, but we depend on it: ensure
-# make knows about it
-$(WORKDIR)/CustomTarget/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/presenter.xhp :| $(call gb_Package_get_target,sdext_presenter_help)
-
# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/sdext/Library_pdfimport.mk b/sdext/Library_pdfimport.mk
index f8e47ad83392..43fd1938ef3c 100644
--- a/sdext/Library_pdfimport.mk
+++ b/sdext/Library_pdfimport.mk
@@ -33,7 +33,6 @@ $(eval $(call gb_Library_add_api,pdfimport,\
))
$(eval $(call gb_Library_set_include,pdfimport,\
- -I$(WORKDIR)/CustomTarget/sdext/source/pdfimport/wrapper \
-I$(SRCDIR)/sdext/source/pdfimport/inc \
$$(INCLUDE) \
))
diff --git a/sdext/Module_sdext.mk b/sdext/Module_sdext.mk
index 7827633f1fc8..2d8b6fcc8183 100644
--- a/sdext/Module_sdext.mk
+++ b/sdext/Module_sdext.mk
@@ -38,13 +38,13 @@ endif
ifeq ($(ENABLE_PDFIMPORT),YES)
$(eval $(call gb_Module_add_targets,sdext,\
+ CustomTarget_pdfimport \
Executable_pdf2xml \
Executable_pdfunzip \
Executable_xpdfimport \
Extension_pdfimport \
Library_pdfimport \
StaticLibrary_pdfimport_s \
- Package_pdfimport_keywords \
))
$(eval $(call gb_Module_add_check_targets,sdext,\
@@ -55,9 +55,9 @@ endif
ifeq ($(ENABLE_PRESENTER_SCREEN),YES)
$(eval $(call gb_Module_add_targets,sdext,\
Configuration_presenter \
+ CustomTarget_presenter \
Extension_presenter \
Library_presenter \
- Package_presenter_help \
Zip_presenter \
))
endif
diff --git a/sdext/Package_pdfimport_keywords.mk b/sdext/Package_pdfimport_keywords.mk
deleted file mode 100644
index 0edb3fd0c714..000000000000
--- a/sdext/Package_pdfimport_keywords.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_keywords,$(WORKDIR)/CustomTarget/sdext/source/pdfimport/wrapper))
-
-$(eval $(call gb_Package_add_customtarget,sdext_pdfimport_keywords,sdext/source/pdfimport/wrapper))
-
-$(eval $(call gb_CustomTarget_add_dependencies,sdext/source/pdfimport/wrapper,\
- sdext/source/pdfimport/wrapper/keyword_list \
-))
-
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/sdext/Package_presenter_help.mk b/sdext/Package_presenter_help.mk
deleted file mode 100644
index d3efb71109ed..000000000000
--- a/sdext/Package_presenter_help.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_help,$(WORKDIR)/CustomTarget/sdext/source/presenter/help/en-US/com.sun.PresenterScreen))
-
-$(eval $(call gb_Package_add_customtarget,sdext_presenter_help,sdext/source/presenter/help/en-US/com.sun.PresenterScreen))
-
-$(eval $(call gb_CustomTarget_add_dependencies,sdext/source/presenter/help/en-US/com.sun.PresenterScreen,\
- sdext/source/presenter/help/en-US/com.sun.PresenterScreen/presenter.xhp \
-))
-
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/sdext/StaticLibrary_pdfimport_s.mk b/sdext/StaticLibrary_pdfimport_s.mk
index 5fd30722048d..7bebdd722536 100644
--- a/sdext/StaticLibrary_pdfimport_s.mk
+++ b/sdext/StaticLibrary_pdfimport_s.mk
@@ -38,12 +38,9 @@ $(eval $(call gb_StaticLibrary_use_externals,pdfimport_s,\
zlib \
))
-$(eval $(call gb_StaticLibrary_add_package_headers,pdfimport_s,\
- sdext_pdfimport_keywords \
-))
+$(eval $(call gb_StaticLibrary_add_custom_headers,pdfimport_s,sdext/pdfimport))
$(eval $(call gb_StaticLibrary_set_include,pdfimport_s,\
- -I$(WORKDIR)/CustomTarget/sdext/source/pdfimport/wrapper \
-I$(SRCDIR)/sdext/source/pdfimport/inc \
$$(INCLUDE) \
))