INTEGRATION: CWS ause069 (1.21.2); FILE MERGED

2006/12/04 16:39:52 hjs 1.21.2.2: RESYNC: (1.21-1.22); FILE MERGED
2006/11/28 15:05:57 hjs 1.21.2.1: #i70359# remove forced shell calls
This commit is contained in:
Oliver Bolte 2007-01-25 11:36:37 +00:00
parent 07aafcf139
commit 05c7429d76

View file

@ -4,9 +4,9 @@
#
# $RCSfile: makefile.mk,v $
#
# $Revision: 1.22 $
# $Revision: 1.23 $
#
# last change: $Author: vg $ $Date: 2006-11-01 15:08:47 $
# last change: $Author: obo $ $Date: 2007-01-25 12:36:37 $
#
# The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1.
@ -117,7 +117,7 @@ DEBUGSWITCH = true
.IF "$(GUI)"=="UNX" || "$(USE_SHELL)" != "4nt"
$(JAVADIR)$/$(PACKAGE)$/%.java: makefile.mk
@-+$(MKDIRHIER) $(JAVADIR)$/$(PACKAGE) >& $(NULLDEV)
@-$(MKDIRHIER) $(JAVADIR)$/$(PACKAGE) >& $(NULLDEV)
@-echo package org.openoffice.java.accessibility\; > $@
@-echo public class Build { >> $@
@-echo public static final boolean DEBUG = $(DEBUGSWITCH)\; >> $@
@ -125,7 +125,7 @@ $(JAVADIR)$/$(PACKAGE)$/%.java: makefile.mk
@-echo } >> $@
.ELSE
$(JAVADIR)$/$(PACKAGE)$/%.java: makefile.mk
@-+$(MKDIRHIER) $(JAVADIR)$/$(PACKAGE) >& $(NULLDEV)
@-$(MKDIRHIER) $(JAVADIR)$/$(PACKAGE) >& $(NULLDEV)
@-echo package org.openoffice.java.accessibility; > $@
@-echo public class Build { >> $@
@-echo public static final boolean DEBUG = $(DEBUGSWITCH); >> $@
@ -135,5 +135,5 @@ $(JAVADIR)$/$(PACKAGE)$/%.java: makefile.mk
$(CLASSDIR)$/$(PACKAGE)$/Build.class : $(JAVADIR)$/$(PACKAGE)$/Build.java
-+$(JAVAC) -d $(CLASSDIR) $(JAVADIR)$/$(PACKAGE)$/Build.java
-$(JAVAC) -d $(CLASSDIR) $(JAVADIR)$/$(PACKAGE)$/Build.java