convert windows-specific bits, part 2: lib

2 files changed, 43 insertions, 70 deletions

diff --git a/accessibility/bridge/source/java/Makefile b/accessibility/bridge/source/java/Makefile
new file mode 100644
index 000000000000..e582dc3efd27
--- /dev/null
+++ b/accessibility/bridge/source/java/Makefile
@@ -0,0 +1,43 @@
+# -*- 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) 2011 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.
+
+gb_PARTIALBUILD := T
+include $(GBUILDDIR)/gbuild.mk
+
+TARGETDIR := $(WORKDIR)/CustomTarget/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 $@ org.openoffice.accessibility.WindowsAccessBridgeAdapter
+
+.DEFAULT_GOAL := all
+.PHONY : all
+all : \
+	$(TARGETDIR)/WindowsAccessBridgeAdapter.h
+
+# vim: set ts=4 sw=4 et:
diff --git a/accessibility/bridge/source/java/makefile.mk b/accessibility/bridge/source/java/makefile.mk
deleted file mode 100644
index f010b953e1d5..000000000000
--- a/accessibility/bridge/source/java/makefile.mk
+++ /dev/null
@@ -1,70 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-PRJNAME=accessibility
-TARGET=accessbridge
-LIBTARGET=NO
-USE_DEFFILE=TRUE
-ENABLE_EXCEPTIONS=TRUE
-VERSIONOBJ=
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-
-.IF "$(GUI)"=="WNT" && "$(SOLAR_JAVA)" != ""
-
-SLOFILES= $(SLO)$/WindowsAccessBridgeAdapter.obj
-
-SHL1TARGET=java_uno_accessbridge
-SHL1IMPLIB=i$(SHL1TARGET)
-SHL1STDLIBS=$(VCLLIB) $(TOOLSLIB) $(JVMACCESSLIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB)
-SHL1OBJS=$(SLOFILES) 
-SHL1VERSIONOBJ=
-
-DEF1NAME=$(SHL1TARGET)
-DEF1EXPORTFILE=exports.dxp
-
-SHL1HEADER=$(OUT)$/inc$/WindowsAccessBridgeAdapter.h
-
-.ENDIF			# "$(GUI)"=="WNT" && "$(SOLAR_JAVA)" != ""
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
-
-.IF "$(GUI)"=="WNT" && "$(SOLAR_JAVA)" != ""
-
-$(SLO)$/WindowsAccessBridgeAdapter.obj : $(SHL1HEADER)
-
-$(SHL1HEADER) :
-    javah -classpath $(OUT)$/class -o $(SHL1HEADER) org.openoffice.accessibility.WindowsAccessBridgeAdapter
-
-.ENDIF			# "$(GUI)"=="WNT"  && "$(SOLAR_JAVA)" != ""