diff options
| author | Oliver Bolte <obo@openoffice.org> | 2004-07-06 12:49:07 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2004-07-06 12:49:07 +0000 |
| commit | 7055bfb85c95ef1e8ef0e79ebe94f30ac0d6a8e8 (patch) | |
| tree | ddcebec47b88aeb81a75c5a249e706bf5b775622 /vcl/source/window/makefile.mk | |
| parent | 8b71b3385918ec3edfd2dc8347ff20a2b612e44d (diff) | |
INTEGRATION: CWS docking1 (1.12.34); FILE MERGED
2004/05/30 11:00:15 cd 1.12.34.4: RESYNC: (1.12-1.13); FILE MERGED
2004/03/30 06:12:05 cd 1.12.34.3: #100000# Solved merge problem
2004/03/29 15:36:31 cd 1.12.34.2: #100000# Resolved bad merge which lead to duplicate symbols
2004/03/24 17:57:14 ssa 1.12.34.1: #i24913# support for dockable windows via toolkit
Diffstat (limited to 'vcl/source/window/makefile.mk')
| -rw-r--r-- | vcl/source/window/makefile.mk | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/vcl/source/window/makefile.mk b/vcl/source/window/makefile.mk index c6151d50e2e2..aafc32e6fd44 100644 --- a/vcl/source/window/makefile.mk +++ b/vcl/source/window/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.13 $ +# $Revision: 1.14 $ # -# last change: $Author: hr $ $Date: 2004-05-10 15:50:07 $ +# last change: $Author: obo $ $Date: 2004-07-06 13:49:07 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -69,29 +69,33 @@ TARGET=win # --- Settings ----------------------------------------------------- -.INCLUDE : svpre.mk .INCLUDE : settings.mk -.INCLUDE : sv.mk # --- Files -------------------------------------------------------- -SLOFILES= $(SLO)$/accel.obj \ +SLOFILES= \ $(SLO)$/abstdlg.obj \ + $(SLO)$/accel.obj \ $(SLO)$/accmgr.obj \ $(SLO)$/brdwin.obj \ $(SLO)$/btndlg.obj \ $(SLO)$/cmdevt.obj \ $(SLO)$/cursor.obj \ - $(SLO)$/dockwin.obj \ $(SLO)$/decoview.obj \ $(SLO)$/dialog.obj \ $(SLO)$/dlgctrl.obj \ + $(SLO)$/dndevdis.obj \ + $(SLO)$/dndlcon.obj \ + $(SLO)$/dockmgr.obj \ + $(SLO)$/dockwin.obj \ $(SLO)$/floatwin.obj \ + $(SLO)$/introwin.obj \ $(SLO)$/keycod.obj \ $(SLO)$/keyevent.obj \ $(SLO)$/menu.obj \ $(SLO)$/mnemonic.obj \ $(SLO)$/msgbox.obj \ + $(SLO)$/scrwnd.obj \ $(SLO)$/seleng.obj \ $(SLO)$/split.obj \ $(SLO)$/splitwin.obj \ @@ -100,18 +104,14 @@ SLOFILES= $(SLO)$/accel.obj \ $(SLO)$/syswin.obj \ $(SLO)$/tabdlg.obj \ $(SLO)$/tabpage.obj \ + $(SLO)$/taskpanelist.obj \ $(SLO)$/toolbox.obj \ $(SLO)$/toolbox2.obj \ $(SLO)$/window.obj \ $(SLO)$/window2.obj \ $(SLO)$/window3.obj \ $(SLO)$/winproc.obj \ - $(SLO)$/wrkwin.obj \ - $(SLO)$/introwin.obj \ - $(SLO)$/scrwnd.obj \ - $(SLO)$/dndevdis.obj \ - $(SLO)$/dndlcon.obj \ - $(SLO)$/taskpanelist.obj + $(SLO)$/wrkwin.obj EXCEPTIONSFILES= \ $(SLO)$/window.obj \ |