diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-03-18 12:46:03 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-03-18 12:46:03 +0000 |
| commit | 7a911549acebf980db555816e9e2073fce20bc44 (patch) | |
| tree | 049d3eacb215a899053df27f40fb229a2a5744cc /desktop | |
| parent | c5d7f152c85df902c72332b111b52d4e2c3bb697 (diff) | |
INTEGRATION: CWS sb83 (1.38.4); FILE MERGED
2008/03/17 09:35:29 sb 1.38.4.2: merge conflicts
2008/02/07 16:22:45 sb 1.38.4.1: #i84200# extract all the meat from (soffice|unkpkg).bin into (soffice|unkpkg).dll, where the .dll are in the basis layer and the .bin, on Windows (similar to Mac OS X, albeit for different reasons), are in the brand layer, where they can include brand-specific icons (read by vcl; potentially visible in Windows Explorer according to hro).
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/app/makefile.mk | 76 |
1 files changed, 50 insertions, 26 deletions
diff --git a/desktop/source/app/makefile.mk b/desktop/source/app/makefile.mk index 0a97c37fa168..bb169bb372cf 100644 --- a/desktop/source/app/makefile.mk +++ b/desktop/source/app/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.38 $ +# $Revision: 1.39 $ # -# last change: $Author: rt $ $Date: 2008-01-29 16:30:24 $ +# last change: $Author: vg $ $Date: 2008-03-18 13:46:03 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -37,7 +37,6 @@ PRJ=..$/.. PRJNAME=desktop TARGET=dkt -LIBTARGET=NO AUTOSEG=true ENABLE_EXCEPTIONS=TRUE @@ -45,32 +44,57 @@ ENABLE_EXCEPTIONS=TRUE .INCLUDE : settings.mk -# --- Files -------------------------------------------------------- +SHL1TARGET = soffice +SHL1OBJS = \ + $(SLO)$/app.obj \ + $(SLO)$/appfirststart.obj \ + $(SLO)$/appinit.obj \ + $(SLO)$/appsys.obj \ + $(SLO)$/cfgfilter.obj \ + $(SLO)$/checkinstall.obj \ + $(SLO)$/cmdlineargs.obj \ + $(SLO)$/cmdlinehelp.obj \ + $(SLO)$/configinit.obj \ + $(SLO)$/desktopcontext.obj \ + $(SLO)$/desktopresid.obj \ + $(SLO)$/dispatchwatcher.obj \ + $(SLO)$/intro.obj \ + $(SLO)$/langselect.obj \ + $(SLO)$/lockfile.obj \ + $(SLO)$/lockfile2.obj \ + $(SLO)$/migration.obj \ + $(SLO)$/officeipcthread.obj \ + $(SLO)$/oinstanceprovider.obj \ + $(SLO)$/opluginframefactory.obj \ + $(SLO)$/pages.obj \ + $(SLO)$/sofficemain.obj \ + $(SLO)$/userinstall.obj \ + $(SLO)$/wizard.obj +SHL1STDLIBS = \ + $(COMPHELPERLIB) \ + $(CPPUHELPERLIB) \ + $(CPPULIB) \ + $(I18NISOLANGLIB) \ + $(SALLIB) \ + $(SFXLIB) \ + $(SVLLIB) \ + $(SVTOOLLIB) \ + $(TKLIB) \ + $(TOOLSLIB) \ + $(UCBHELPERLIB) \ + $(UNOTOOLSLIB) \ + $(VCLLIB) \ + $(VOSLIB) +SHL1VERSIONMAP = version.map +SHL1IMPLIB = i$(SHL1TARGET) +DEF1NAME = $(SHL1TARGET) OBJFILES = \ - $(OBJ)$/main.obj \ - $(OBJ)$/app.obj \ - $(OBJ)$/appfirststart.obj \ - $(OBJ)$/copyright_ascii_sun.obj \ - $(OBJ)$/copyright_ascii_ooo.obj \ - $(OBJ)$/lockfile.obj \ - $(OBJ)$/lockfile2.obj \ - $(OBJ)$/intro.obj \ - $(OBJ)$/officeipcthread.obj \ - $(OBJ)$/appinit.obj \ - $(OBJ)$/cmdlineargs.obj \ - $(OBJ)$/oinstanceprovider.obj \ - $(OBJ)$/opluginframefactory.obj \ - $(OBJ)$/appsys.obj \ - $(OBJ)$/desktopresid.obj \ - $(OBJ)$/dispatchwatcher.obj \ - $(OBJ)$/configinit.obj \ - $(OBJ)$/checkinstall.obj \ - $(OBJ)$/langselect.obj \ - $(OBJ)$/cmdlinehelp.obj \ - $(OBJ)$/userinstall.obj \ - $(OBJ)$/desktopcontext.obj + $(OBJ)$/copyright_ascii_ooo.obj \ + $(OBJ)$/copyright_ascii_sun.obj \ + $(OBJ)$/main.obj +SLOFILES = $(SHL1OBJS) SRS1NAME= desktop SRC1FILES= desktop.src |