diff options
| author | Martin Hollmichel <mh@openoffice.org> | 2001-10-18 11:08:40 +0000 |
|---|---|---|
| committer | Martin Hollmichel <mh@openoffice.org> | 2001-10-18 11:08:40 +0000 |
| commit | 00278b5636db405484d89c532543cc87648e9708 (patch) | |
| tree | 5e56c2fccf242461788114d7f35c0d50fdc4957b /stoc | |
| parent | 4933020d870ad8e765336106f5b9e903b1ba0f81 (diff) | |
add: SOLAR_JAVA #90436
Diffstat (limited to 'stoc')
| -rw-r--r-- | stoc/source/javaloader/makefile.mk | 10 | ||||
| -rw-r--r-- | stoc/source/javavm/makefile.mk | 13 |
2 files changed, 12 insertions, 11 deletions
diff --git a/stoc/source/javaloader/makefile.mk b/stoc/source/javaloader/makefile.mk index e49720e7b5f6..a77aece69a26 100644 --- a/stoc/source/javaloader/makefile.mk +++ b/stoc/source/javaloader/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.12 $ +# $Revision: 1.13 $ # -# last change: $Author: kr $ $Date: 2001-09-11 14:33:34 $ +# last change: $Author: mh $ $Date: 2001-10-18 12:08:40 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -69,14 +69,13 @@ USE_DEFFILE=TRUE NO_BSYMBOLIC=TRUE COMP1TYPELIST=$(TARGET) +.IF "$(SOLAR_JAVA)" == "TRUE" # --- Settings ----------------------------------------------------- .INCLUDE : settings.mk # ------------------------------------------------------------------ -.IF "$(SOLAR_JAVA)" == "TRUE" - .INCLUDE : ..$/cppumaker.mk SLOFILES= $(SLO)$/javaloader.obj @@ -95,6 +94,9 @@ SHL1DEF= $(MISC)$/$(SHL1TARGET).def DEF1NAME= $(SHL1TARGET) +.ELSE # SOLAR_JAVA +all: + @echo Nothing to do: SOLAR_JAVA not set .ENDIF # --- Targets ------------------------------------------------------ diff --git a/stoc/source/javavm/makefile.mk b/stoc/source/javavm/makefile.mk index de9d9a878219..e02c510a000b 100644 --- a/stoc/source/javavm/makefile.mk +++ b/stoc/source/javavm/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.11 $ +# $Revision: 1.12 $ # -# last change: $Author: kr $ $Date: 2001-09-11 14:33:34 $ +# last change: $Author: mh $ $Date: 2001-10-18 12:07:56 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -68,17 +68,13 @@ USE_DEFFILE=TRUE NO_BSYMBOLIC=TRUE COMP1TYPELIST=$(TARGET) - - +.IF "$(SOLAR_JAVA)" == "TRUE" # --- Settings ----------------------------------------------------- .INCLUDE : settings.mk # --- Files -------------------------------------------------------- - -.IF "$(SOLAR_JAVA)" == "TRUE" - # Kollision zwischen bool.h aus Java und bool.h aus der STL. # Das Problem tritt fuer alle Plattformen auf, aber anscheinend stolpert nur der # GCC darueber @@ -111,6 +107,9 @@ SHL1DEF= $(MISC)$/$(SHL1TARGET).def DEF1NAME= $(SHL1TARGET) +.ELSE # SOLAR_JAVA +all: + @echo Nothing to do: SOLAR_JAVA not set .ENDIF # --- Targets ------------------------------------------------------ |