diff options
author | Damjan Jovanovic <damjan@apache.org> | 2018-11-27 19:21:36 +0000 |
---|---|---|
committer | Damjan Jovanovic <damjan@apache.org> | 2018-11-27 19:21:36 +0000 |
commit | 41624b9b261a22a0e6f1d9848cdb8456dd4dfb6c (patch) | |
tree | 5dad8f94d8cbc4fe196707c4dd84f39af9ff5f6c | |
parent | daf973719c3c79f4824a992a1129c26d956a218f (diff) |
Complete my previous patch.
Patch by: me
Notes
Notes:
prefer: 7f31e252e4c28cfac9a21fe3309fd39956274d7f
-rw-r--r-- | accessibility/prj/build.lst | 18 | ||||
-rw-r--r-- | accessibility/prj/d.lst | 8 | ||||
-rw-r--r-- | accessibility/prj/makefile.mk | 44 |
3 files changed, 45 insertions, 25 deletions
diff --git a/accessibility/prj/build.lst b/accessibility/prj/build.lst index 5c823b6f9b6b..28b42bc52479 100644 --- a/accessibility/prj/build.lst +++ b/accessibility/prj/build.lst @@ -1,18 +1,2 @@ ac accessibility : L10N:l10n tools jurt offapi unoil vcl javaunohelper jvmaccess cppu sal toolkit svtools LIBXSLT:libxslt NULL -ac accessibility usr1 - all ac_mkout NULL -ac accessibility\inc nmake - all ac_inc NULL -ac accessibility\bridge\org\openoffice\java\accessibility nmake - w ac_ooja ac_inc NULL -ac accessibility\bridge\org\openoffice\accessibility nmake - w ac_ooa ac_ooja.w ac_inc NULL -ac accessibility\bridge\source\java nmake - w ac_ooan ac_ooa.w ac_inc NULL -ac accessibility\inc get - all ac_inc NULL -ac accessibility\source\helper nmake - all ac_helper ac_inc NULL -ac accessibility\source\standard nmake - all ac_standard ac_helper ac_inc NULL -ac accessibility\source\extended nmake - all ac_extended ac_inc NULL -ac accessibility\util nmake - all ac_util ac_helper ac_standard ac_extended NULL -ac accessibility\workben\org\openoffice\accessibility\awb nmake - all ac_awb_main ac_awb_misc ac_awb_canvas ac_awb_view ac_awb_tree NULL -ac accessibility\workben\org\openoffice\accessibility\misc nmake - all ac_awb_misc NULL -ac accessibility\workben\org\openoffice\accessibility\awb\canvas nmake - all ac_awb_canvas ac_awb_tree NULL -ac accessibility\workben\org\openoffice\accessibility\awb\tree nmake - all ac_awb_tree ac_awb_misc NULL -ac accessibility\workben\org\openoffice\accessibility\awb\view nmake - all ac_awb_view ac_awb_view_text NULL -# dependency on ac_awb_misc to avoid concurrent creation of java_ver.mk -ac accessibility\workben\org\openoffice\accessibility\awb\view\text nmake - all ac_awb_view_text ac_awb_misc NULL +ac accessibility\prj nmake - all ac_prj NULL diff --git a/accessibility/prj/d.lst b/accessibility/prj/d.lst index 662373c7c487..e69de29bb2d1 100644 --- a/accessibility/prj/d.lst +++ b/accessibility/prj/d.lst @@ -1,8 +0,0 @@ -..\%__SRC%\class\java_uno_accessbridge.jar %_DEST%\bin%_EXT%\java_uno_accessbridge.jar -..\%__SRC%\class\java_accessibility.jar %_DEST%\bin%_EXT%\java_accessibility.jar - -..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll -..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*.res -..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT% -..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib -..\%__SRC%\misc\java_uno_accessbridge.component %_DEST%\xml\java_uno_accessbridge.component diff --git a/accessibility/prj/makefile.mk b/accessibility/prj/makefile.mk new file mode 100644 index 000000000000..c62c6a657d16 --- /dev/null +++ b/accessibility/prj/makefile.mk @@ -0,0 +1,44 @@ +#************************************************************** +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +#************************************************************** + + + +PRJ=.. +TARGET=prj + +.INCLUDE : settings.mk + +.IF "$(VERBOSE)"!="" +VERBOSEFLAG := +.ELSE +VERBOSEFLAG := -s +.ENDIF + +.IF "$(DEBUG)"!="" +DEBUG_ARGUMENT=DEBUG=$(DEBUG) +.ELIF "$(debug)"!="" +DEBUG_ARGUMENT=debug=$(debug) +.ELSE +DEBUG_ARGUMENT= +.ENDIF + +all: + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog |