diff options
| author | Patrick Luby <patrick.luby@openoffice.org> | 2000-09-22 03:26:34 +0000 |
|---|---|---|
| committer | Patrick Luby <patrick.luby@openoffice.org> | 2000-09-22 03:26:34 +0000 |
| commit | 41a136b11197d4b6d3a3ed006578add13a58971c (patch) | |
| tree | ed8cd47b50abcd640c6d294100a180ee11d59564 /vcl | |
| parent | 844567621c55f763bf7632e5b1cfaa69ef93934d (diff) | |
Remove .IF "remote" != "" statements from makefile.mk files in vcl/aqua/source subdirectories since they were causing link errors
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/aqua/source/app/makefile.mk | 20 | ||||
| -rw-r--r-- | vcl/aqua/source/gdi/makefile.mk | 8 | ||||
| -rw-r--r-- | vcl/aqua/source/window/makefile.mk | 8 |
3 files changed, 11 insertions, 25 deletions
diff --git a/vcl/aqua/source/app/makefile.mk b/vcl/aqua/source/app/makefile.mk index 952096278947..34cf885ddf00 100644 --- a/vcl/aqua/source/app/makefile.mk +++ b/vcl/aqua/source/app/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.2 $ +# $Revision: 1.3 $ # -# last change: $Author: ping.liao $ $Date: 2000-09-21 22:30:03 $ +# last change: $Author: patrick.luby $ $Date: 2000-09-22 04:26:34 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -81,25 +81,19 @@ dummy: .ELSE # "$(OS)"!="MACOSX" -.IF "$(remote)"=="" +OBJFILES= $(OBJ)$/salmain.obj + SLOFILES= $(SLO)$/salshl.obj \ $(SLO)$/saldata.obj \ $(SLO)$/salinst.obj \ $(SLO)$/saltimer.obj \ $(SLO)$/salsound.obj \ $(SLO)$/salinfo.obj \ - $(SLO)$/salsys.obj - -.ENDIF + $(SLO)$/salsys.obj \ + $(SLO)$/salmain.obj -OBJFILES+=$(OBJ)$/salmain.obj -SLOFILES+=$(SLO)$/salmain.obj - -.IF "$(remote)"!="" EXCEPTIONSFILES=$(SLO)$/salmain.obj \ - $(OBJ)$/salmain.obj - -.ENDIF + $(OBJ)$/salmain.obj .ENDIF # "$(OS)"!="MACOSX" diff --git a/vcl/aqua/source/gdi/makefile.mk b/vcl/aqua/source/gdi/makefile.mk index b05c6a5db9a2..ab638e6a1eb7 100644 --- a/vcl/aqua/source/gdi/makefile.mk +++ b/vcl/aqua/source/gdi/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.1.1.1 $ +# $Revision: 1.2 $ # -# last change: $Author: hr $ $Date: 2000-09-18 17:05:26 $ +# last change: $Author: patrick.luby $ $Date: 2000-09-22 04:26:34 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -81,8 +81,6 @@ dummy: .ELSE # "$(OS)"!="MACOSX" -.IF "$(remote)"=="" - SLOFILES= $(SLO)$/salgdi.obj \ $(SLO)$/salgdi2.obj \ $(SLO)$/salgdi3.obj \ @@ -101,8 +99,6 @@ OBJFILES= $(OBJ)$/salgdi.obj \ $(OBJ)$/salogl.obj .ENDIF -.ENDIF - .ENDIF # "$(OS)"!="MACOSX" # --- Targets ------------------------------------------------------ diff --git a/vcl/aqua/source/window/makefile.mk b/vcl/aqua/source/window/makefile.mk index 9f4791709673..2405bc943200 100644 --- a/vcl/aqua/source/window/makefile.mk +++ b/vcl/aqua/source/window/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.1.1.1 $ +# $Revision: 1.2 $ # -# last change: $Author: hr $ $Date: 2000-09-18 17:05:26 $ +# last change: $Author: patrick.luby $ $Date: 2000-09-22 04:26:34 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -83,8 +83,6 @@ dummy: .ELSE # "$(OS)"!="MACOSX" -.IF "$(remote)"=="" - SLOFILES= \ $(SLO)/salframe.obj $(SLO)/salobj.obj @@ -93,8 +91,6 @@ OBJFILES= \ $(OBJ)/salframe.obj $(OBJ)/salobj.obj .ENDIF -.ENDIF - .ENDIF # "$(OS)"!="MACOSX" # --- Targets ------------------------------------------------------ |