diff options
| author | Kay Ramme <kr@openoffice.org> | 2001-09-11 13:33:34 +0000 |
|---|---|---|
| committer | Kay Ramme <kr@openoffice.org> | 2001-09-11 13:33:34 +0000 |
| commit | 31ebffd43b19a19cb59fc6135925598514bd5483 (patch) | |
| tree | c455a51e22bb208aba5370b207e4a7af27111cd9 /stoc/source | |
| parent | 903200bc37044a9cb3364dde87005845c6461331 (diff) | |
ifdef makefile targets (#90436#)
Diffstat (limited to 'stoc/source')
| -rw-r--r-- | stoc/source/javaloader/makefile.mk | 8 | ||||
| -rw-r--r-- | stoc/source/javavm/makefile.mk | 14 |
2 files changed, 17 insertions, 5 deletions
diff --git a/stoc/source/javaloader/makefile.mk b/stoc/source/javaloader/makefile.mk index 0888b8e46..e49720e7b 100644 --- a/stoc/source/javaloader/makefile.mk +++ b/stoc/source/javaloader/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.11 $ +# $Revision: 1.12 $ # -# last change: $Author: jbu $ $Date: 2001-06-22 16:20:58 $ +# last change: $Author: kr $ $Date: 2001-09-11 14:33:34 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -75,6 +75,8 @@ COMP1TYPELIST=$(TARGET) # ------------------------------------------------------------------ +.IF "$(SOLAR_JAVA)" == "TRUE" + .INCLUDE : ..$/cppumaker.mk SLOFILES= $(SLO)$/javaloader.obj @@ -93,6 +95,8 @@ SHL1DEF= $(MISC)$/$(SHL1TARGET).def DEF1NAME= $(SHL1TARGET) +.ENDIF + # --- Targets ------------------------------------------------------ .INCLUDE : target.mk diff --git a/stoc/source/javavm/makefile.mk b/stoc/source/javavm/makefile.mk index be3555876..de9d9a878 100644 --- a/stoc/source/javavm/makefile.mk +++ b/stoc/source/javavm/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.10 $ +# $Revision: 1.11 $ # -# last change: $Author: jbu $ $Date: 2001-06-22 16:20:58 $ +# last change: $Author: kr $ $Date: 2001-09-11 14:33:34 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -68,12 +68,17 @@ USE_DEFFILE=TRUE NO_BSYMBOLIC=TRUE COMP1TYPELIST=$(TARGET) + + # --- 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 @@ -86,7 +91,7 @@ CDEFS += -D__SGI_STL_BOOL_H SLOFILES= \ $(SLO)$/javavm.obj \ $(SLO)$/jvmargs.obj - + SHL1TARGET= $(TARGET) SHL1VERSIONMAP=$(TARGET).map SHL1STDLIBS= \ @@ -106,7 +111,10 @@ SHL1DEF= $(MISC)$/$(SHL1TARGET).def DEF1NAME= $(SHL1TARGET) +.ENDIF + # --- Targets ------------------------------------------------------ + .INCLUDE : target.mk |