diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-03-18 12:49:13 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-03-18 12:49:13 +0000 |
| commit | 772fd0220b9d2bd35b5990010d15d2769b35254c (patch) | |
| tree | 515d990b029ef5d55b53c6010c130466db0124c8 /desktop/source/pkgchk/unopkg | |
| parent | 18a5b88ff821e887475950552fbe17329b45516a (diff) | |
INTEGRATION: CWS sb83 (1.10.24); FILE MERGED
2008/03/17 09:02:16 sb 1.10.24.7: RESYNC: (1.11-1.12); FILE MERGED
2008/03/13 14:48:03 sb 1.10.24.6: mingw problems (tono)
2008/02/08 09:17:00 sb 1.10.24.5: #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 all plattforms, are in the brand layer, where they can include brand-specific icons on Windows (read by vcl; potentially visible in Windows Explorer according to hro)
2008/02/07 16:22:45 sb 1.10.24.4: #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).
2008/02/01 13:29:26 sb 1.10.24.3: RESYNC: (1.10-1.11); FILE MERGED
2008/01/23 15:19:22 sb 1.10.24.2: #i84200# moved executables from brand layer to basis layer
2007/12/10 14:43:40 sb 1.10.24.1: #i84200# First step of basis/brand split.
Diffstat (limited to 'desktop/source/pkgchk/unopkg')
| -rw-r--r-- | desktop/source/pkgchk/unopkg/makefile.mk | 105 |
1 files changed, 41 insertions, 64 deletions
diff --git a/desktop/source/pkgchk/unopkg/makefile.mk b/desktop/source/pkgchk/unopkg/makefile.mk index dd92ec40421e..e7aef031e065 100644 --- a/desktop/source/pkgchk/unopkg/makefile.mk +++ b/desktop/source/pkgchk/unopkg/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.12 $ +# $Revision: 1.13 $ # -# last change: $Author: kz $ $Date: 2008-03-06 15:29:48 $ +# last change: $Author: vg $ $Date: 2008-03-18 13:49:13 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -49,63 +49,50 @@ PRJINC += ..$/..$/deployment ..$/.. CFLAGS+=-DSYSTEM_DB -I$(DB_INCLUDES) .ENDIF - -SHARED_OBJS = \ - $(OBJ)$/unopkg_misc.obj \ - $(OBJ)$/unopkg_cmdenv.obj - -################################################################# - -MYAPP1OBJS = \ - $(SHARED_OBJS) \ - $(OBJ)$/unopkg_app.obj -APP1NOSAL = TRUE -APP1OBJS = \ - $(MYAPP1OBJS) \ - $(OBJ)$/lockfile.obj - - -APP1STDLIBS = \ - $(SALLIB) \ - $(CPPULIB) \ - $(CPPUHELPERLIB) \ - $(COMPHELPERLIB) \ - $(UCBHELPERLIB) \ - $(UNOTOOLSLIB) \ - $(TOOLSLIB) \ - $(VCLLIB) \ - $(DEPLOYMENTMISCLIB) - APP1TARGET = so$/unopkg +APP1OBJS = $(OBJFILES) +APP1STDLIBS = $(SALLIB) $(UNOPKGLIB) +APP1DEPN = $(SHL1TARGETN) +APP1NOSAL = TRUE +APP1RPATH = BRAND +.IF "$(OS)" == "WNT" +APP1ICON = $(SOLARRESDIR)$/icons/so8-main-app.ico +APP1LINKRES = $(MISC)$/$(TARGET)1.res +.ENDIF -.IF "$(GUI)" == "WNT" -APP1ICON=$(SOLARRESDIR)$/icons/so8-main-app.ico -APP1LINKRES=$(MISC)$/$(TARGET)1.res -.ENDIF # WNT -################################################################# -APP2NOSAL = TRUE -APP2OBJS = $(APP1OBJS) -APP2STDLIBS = $(APP1STDLIBS) APP2TARGET = unopkg - - -.IF "$(GUI)" == "WNT" -APP2ICON=$(SOLARRESDIR)$/icons/ooo-main-app.ico -APP2LINKRES=$(MISC)$/$(TARGET)2.res -.ENDIF # WNT - -DEPOBJFILES = $(MYAPP1OBJS) \ - $(OBJ)$/lockfile.obj - - -.IF "$(debug)" != "" - -# disable MSVC inlining for debugging -.IF "$(COM)" == "MSC" -CFLAGS += -Ob0 +APP2OBJS = $(OBJFILES) +APP2STDLIBS = $(SALLIB) $(UNOPKGLIB) +APP2DEPN = $(SHL1TARGETN) +APP2NOSAL = TRUE +APP2RPATH = BRAND +.IF "$(OS)" == "WNT" +APP2ICON = $(SOLARRESDIR)$/icons/ooo-main-app.ico +APP2LINKRES = $(MISC)$/$(TARGET)2.res .ENDIF -.ENDIF +SHL1TARGET = unopkg +SHL1OBJS = $(SLOFILES) $(SLO)$/lockfile.obj +SHL1STDLIBS = \ + $(SALLIB) \ + $(CPPULIB) \ + $(CPPUHELPERLIB) \ + $(COMPHELPERLIB) \ + $(UCBHELPERLIB) \ + $(UNOTOOLSLIB) \ + $(TOOLSLIB) \ + $(VCLLIB) \ + $(DEPLOYMENTMISCLIB) +SHL1VERSIONMAP = version.map +SHL1IMPLIB = i$(SHL1TARGET) +DEF1NAME = $(SHL1TARGET) + +SLOFILES = \ + $(SLO)$/unopkg_app.obj \ + $(SLO)$/unopkg_cmdenv.obj \ + $(SLO)$/unopkg_misc.obj + +OBJFILES = $(OBJ)$/unopkg_main.obj .INCLUDE : target.mk @@ -115,13 +102,3 @@ $(APP1TARGETN) : $(MISC)$/binso_created.flg $(MISC)$/binso_created.flg: @@-$(MKDIRHIER) $(BIN)$/so && $(TOUCH) $@ - -.IF "$(GUI)" == "WNT" -ALLTAR: $(BIN)$/unopkg.bin $(BIN)$/so$/unopkg.bin - -$(BIN)$/unopkg.bin: $(BIN)$/unopkg$(EXECPOST) - $(COPY) $< $@ - -$(BIN)$/so$/unopkg.bin: $(BIN)$/so$/unopkg$(EXECPOST) - $(COPY) $< $@ -.ENDIF |