accessibility: use CustomTarget makefiles

7 files changed, 26 insertions, 107 deletions

diff --git a/accessibility/bridge/Makefile b/accessibility/CustomTarget_bridge.mk
index 9ed435aa7135..bc58988d8027 100644
--- a/accessibility/bridge/Makefile
+++ b/accessibility/CustomTarget_bridge.mk
@@ -25,28 +25,29 @@
 # 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,accessibility/bridge,new_style))
+
+ACBR := $(call gb_CustomTarget_get_workdir,accessibility/bridge)
+
+$(call gb_CustomTarget_get_target,accessibility/bridge) : \
+    $(ACBR)/org/openoffice/java/accessibility/Build.java
 
 ifeq ($(PRODUCT),)
-DEBUGSWITCH := true
-PRODUCTSWITCH := false
+ac_DEBUGSWITCH := true
+ac_PRODUCTSWITCH := false
 else
-DEBUGSWITCH := false
-PRODUCTSWITCH := true
+ac_DEBUGSWITCH := false
+ac_PRODUCTSWITCH := true
 endif
 
-org/openoffice/java/accessibility/Build.java :
+$(ACBR)/org/openoffice/java/accessibility/Build.java :
+	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
 	mkdir -p $(dir $@) && (\
         echo package org.openoffice.java.accessibility\; && \
         echo public class Build \{ && \
-        echo public static final boolean DEBUG = $(DEBUGSWITCH)\; && \
-        echo public static final boolean PRODUCT = $(PRODUCTSWITCH)\; && \
+        echo public static final boolean DEBUG = $(ac_DEBUGSWITCH)\; && \
+        echo public static final boolean PRODUCT = $(ac_PRODUCTSWITCH)\; && \
         echo \} \
         ) > $@
 
-.DEFAULT_GOAL := all
-.PHONY : all
-all : \
-	org/openoffice/java/accessibility/Build.java
-
 # vim: set ts=4 sw=4 et:
diff --git a/accessibility/bridge/source/java/Makefile b/accessibility/CustomTarget_bridge_inc.mk
index b9d9e33a4d1e..d64b19bec626 100644
--- a/accessibility/bridge/source/java/Makefile
+++ b/accessibility/CustomTarget_bridge_inc.mk
@@ -25,19 +25,17 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-gb_PARTIALBUILD := T
-include $(GBUILDDIR)/gbuild.mk
+$(eval $(call gb_CustomTarget_CustomTarget,accessibility/bridge/inc,new_style))
 
-TARGETDIR := $(WORKDIR)/CustomTarget/accessibility/bridge/inc
+ACBI := $(call gb_CustomTarget_get_workdir,accessibility/bridge/inc)
 
-$(TARGETDIR)/WindowsAccessBridgeAdapter.h :
-	mkdir -p $(dir $@) && \
-       cd $(call gb_JavaClassSet_get_classdir,$(call gb_Jar_get_classsetname,java_uno_accessbridge)) && \
-       javah -classpath . -o $(call gb_Helper_convert_native,$@) org.openoffice.accessibility.WindowsAccessBridgeAdapter
+$(call gb_CustomTarget_get_target,accessibility/bridge/inc) : \
+    $(ACBI)/WindowsAccessBridgeAdapter.h
 
-.DEFAULT_GOAL := all
-.PHONY : all
-all : \
-	$(TARGETDIR)/WindowsAccessBridgeAdapter.h
+$(ACBI)/WindowsAccessBridgeAdapter.h :| $(ACBI)/.dir \
+        $(call gb_Jar_get_target,java_uno_accessbridge)
+	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JVH,1)
+	cd $(call gb_JavaClassSet_get_classdir,$(call gb_Jar_get_classsetname,java_uno_accessbridge)) && \
+    javah -classpath . -o $(call gb_Helper_convert_native,$@) org.openoffice.accessibility.WindowsAccessBridgeAdapter
 
 # vim: set ts=4 sw=4 et:
diff --git a/accessibility/Jar_accessibility.mk b/accessibility/Jar_accessibility.mk
index bc687097c36b..49f77a038264 100644
--- a/accessibility/Jar_accessibility.mk
+++ b/accessibility/Jar_accessibility.mk
@@ -87,9 +87,4 @@ $(eval $(call gb_Jar_add_generated_sourcefiles,java_accessibility,\
     CustomTarget/accessibility/bridge/org/openoffice/java/accessibility/Build \
 ))
 
-# Dummy dep. to satisfy make's depsolver: .../classes is created by a
-# custom target, so there is no dependency information for it here.
-# It also makes sure that the package is built before this jar .-)
-$(WORKDIR)/CustomTarget/accessibility/bridge/org/openoffice/java/accessibility/Build.java :| $(call gb_Package_get_target,accessibility_bridge)
-
 # vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/accessibility/Library_java_uno_accessbridge.mk b/accessibility/Library_java_uno_accessbridge.mk
index d6e008fce51f..e03dd432010a 100644
--- a/accessibility/Library_java_uno_accessbridge.mk
+++ b/accessibility/Library_java_uno_accessbridge.mk
@@ -27,14 +27,7 @@
 
 $(eval $(call gb_Library_Library,java_uno_accessbridge))
 
-$(eval $(call gb_Library_add_package_headers,java_uno_accessbridge,\
-    accessibility_bridge_inc \
-))
-
-$(eval $(call gb_Library_set_include,java_uno_accessbridge,\
-    $$(INCLUDE) \
-    -I$(WORKDIR)/CustomTarget/accessibility/bridge/inc \
-))
+$(eval $(call gb_Library_add_custom_headers,java_uno_accessbridge,accessibility/bridge/inc))
 
 $(eval $(call gb_Library_add_api,java_uno_accessbridge,\
     offapi \
diff --git a/accessibility/Module_accessibility.mk b/accessibility/Module_accessibility.mk
index 04ce3461d760..368973e54581 100644
--- a/accessibility/Module_accessibility.mk
+++ b/accessibility/Module_accessibility.mk
@@ -35,11 +35,11 @@ $(eval $(call gb_Module_add_targets,accessibility,\
 ifneq ($(SOLAR_JAVA),)
 ifeq ($(OS),WNT)
 $(eval $(call gb_Module_add_targets,accessibility,\
+    CustomTarget_bridge \
+    CustomTarget_bridge_inc \
     Jar_accessibility \
     Jar_uno_accessbridge \
     Library_java_uno_accessbridge \
-    Package_bridge \
-    Package_bridge_inc \
 ))
 endif
 endif
diff --git a/accessibility/Package_bridge.mk b/accessibility/Package_bridge.mk
deleted file mode 100644
index 44aa98fcb798..000000000000
--- a/accessibility/Package_bridge.mk
+++ /dev/null
@@ -1,32 +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) 2010 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,accessibility_bridge,$(WORKDIR)/CustomTarget/accessibility/bridge))
-
-$(eval $(call gb_Package_add_customtarget,accessibility_bridge,accessibility/bridge))
-
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/accessibility/Package_bridge_inc.mk b/accessibility/Package_bridge_inc.mk
deleted file mode 100644
index 78fe99f1988b..000000000000
--- a/accessibility/Package_bridge_inc.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) 2010 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,accessibility_bridge_inc,$(WORKDIR)/CustomTarget/accessibility/bridge/inc))
-
-$(eval $(call gb_Package_add_customtarget,accessibility_bridge_inc,accessibility/bridge/source/java))
-
-$(eval $(call gb_CustomTarget_add_outdir_dependencies,accessibility/bridge/source/java,\
-    $(call gb_JavaClassSet_get_target,$(call gb_Jar_get_classsetname,java_uno_accessbridge)) \
-))
-
-# vim:set shiftwidth=4 softtabstop=4 expandtab: