diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-03-26 12:59:19 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-03-26 12:59:19 +0000 |
| commit | 5db03f52d7857c98fc55a6ec9bc6f12125a53dc8 (patch) | |
| tree | 0b5b2ca22126c24b98cf17f9dcfbd8e1c3ea02c5 /officecfg/org | |
| parent | 61bb4875c0b442030b649d9be22a724af17b8b4b (diff) | |
MWS_SRX644: migrate branch mws_srx644 -> HEAD
Diffstat (limited to 'officecfg/org')
| -rw-r--r-- | officecfg/org/openoffice/configuration/makefile.mk | 13 | ||||
| -rw-r--r-- | officecfg/org/openoffice/helper/makefile.mk | 14 |
2 files changed, 14 insertions, 13 deletions
diff --git a/officecfg/org/openoffice/configuration/makefile.mk b/officecfg/org/openoffice/configuration/makefile.mk index cb7abe209d80..9fb7907cf152 100644 --- a/officecfg/org/openoffice/configuration/makefile.mk +++ b/officecfg/org/openoffice/configuration/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.7 $ +# $Revision: 1.8 $ # -# last change: $Author: hjs $ $Date: 2002-06-10 16:09:54 $ +# last change: $Author: hr $ $Date: 2003-03-26 13:49:47 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -66,14 +66,11 @@ PRJNAME=officecfg TARGET =cfgimport PACKAGE=org$/openoffice$/configuration -# Our jar build rules don't like -P# -MAXPROCESS=1 - # --- Settings ----------------------------------------------------- .INCLUDE : settings.mk -JARFILES = jaxp.jar parser.jar xt.jar +EXTRAJARFILES = jaxp.jar parser.jar xt.jar JAVACLASSFILES= \ $(CLASSDIR)$/$(PACKAGE)$/XMLDefaultGenerator.class \ @@ -97,3 +94,7 @@ JARCOMPRESS = TRUE .INCLUDE : target.mk +.IF "$(JARTARGETN)"!="" +$(JARTARGETN) : $(JAVACLASSFILES) $(JAVATARGET) +.ENDIF # "$(JARTARGETN)"!="" + diff --git a/officecfg/org/openoffice/helper/makefile.mk b/officecfg/org/openoffice/helper/makefile.mk index d3fb48807d7d..43aaa97cf2bd 100644 --- a/officecfg/org/openoffice/helper/makefile.mk +++ b/officecfg/org/openoffice/helper/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.7 $ +# $Revision: 1.8 $ # -# last change: $Author: hjs $ $Date: 2002-06-10 16:10:19 $ +# last change: $Author: hr $ $Date: 2003-03-26 13:49:48 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -66,14 +66,11 @@ PRJNAME=officecfg TARGET =schema PACKAGE=org$/openoffice$/helper -# Our jar build rules don't like -P# -MAXPROCESS=1 - # --- Settings ----------------------------------------------------- .INCLUDE : settings.mk -JARFILES = jaxp.jar parser.jar +EXTRAJARFILES = jaxp.jar parser.jar JAVACLASSFILES= \ $(CLASSDIR)$/$(PACKAGE)$/DefaultNamespaceRemover.class \ @@ -91,6 +88,9 @@ JARCOMPRESS = TRUE # --- Targets ------------------------------------------------------ - .INCLUDE : target.mk +.IF "$(JARTARGETN)"!="" +$(JARTARGETN) : $(JAVACLASSFILES) $(JAVATARGET) +.ENDIF # "$(JARTARGETN)"!="" + |