diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-01-31 08:49:43 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-01-31 08:49:43 +0000 |
| commit | ebd41cb35c4d41e58b1905e2affd6141b3fdb50c (patch) | |
| tree | eaed92e4e017f68ce629695bedc80e19896822ca /jvmfwk/plugins/sunmajor/pluginlib/makefile.mk | |
| parent | 15ad410545cdddbb9ae0d707edb1418f444a8cfe (diff) | |
INTEGRATION: CWS jre5issues (1.5.8); FILE MERGED
2005/01/18 12:48:49 jl 1.5.8.2: #i40879# in build environment the JRE is not tested for accessibility, because of potential X server problems
2005/01/14 10:11:42 jl 1.5.8.1: #i39912# #i40180# fixes for MAC, FREEBSD
Diffstat (limited to 'jvmfwk/plugins/sunmajor/pluginlib/makefile.mk')
| -rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/makefile.mk | 27 |
1 files changed, 22 insertions, 5 deletions
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/makefile.mk b/jvmfwk/plugins/sunmajor/pluginlib/makefile.mk index d6ed70a08..fafd928a0 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/makefile.mk +++ b/jvmfwk/plugins/sunmajor/pluginlib/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.6 $ +# $Revision: 1.7 $ # -# last change: $Author: obo $ $Date: 2005-01-25 15:19:14 $ +# last change: $Author: rt $ $Date: 2005-01-31 09:49:43 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -80,15 +80,15 @@ DLLPRE = # ------------------------------------------------------------------ #.INCLUDE : ..$/cppumaker.mk -.IF "$(SOLAR_JAVA)"!="" && "$(OS)"!="MACOSX" +.IF "$(SOLAR_JAVA)"!="" UNOTYPES = \ com.sun.star.uno.TypeClass \ com.sun.star.uno.XInterface SLOFILES= \ - $(SLO)$/sunjavaplugin.obj \ $(SLO)$/sunversion.obj \ + $(SLO)$/sunjavaplugin.obj \ $(SLO)$/vendorbase.obj \ $(SLO)$/util.obj \ $(SLO)$/sunjre.obj \ @@ -132,9 +132,26 @@ JAVACLASSFILES= \ $(CLASSDIR)$/JREProperties.class JAVAFILES = $(subst,$(CLASSDIR)$/, $(subst,.class,.java $(JAVACLASSFILES))) -.ENDIF + +.ENDIF # SOLAR_JAVA + + # --- Targets ------------------------------------------------------ .INCLUDE : target.mk +.IF "$(GUI)"=="WNT" +BOOTSTRAPFILE=$(BIN)$/sunjavaplugin.ini +.ELSE +BOOTSTRAPFILE=$(BIN)$/sunjavapluginrc +.ENDIF + + +$(BOOTSTRAPFILE): sunjavapluginrc + +-$(COPY) $< $@ + + +ALLTAR: \ + $(BOOTSTRAPFILE) + |