diff options
| author | Gerd Weiss <gm@openoffice.org> | 2007-05-10 10:02:55 +0000 |
|---|---|---|
| committer | Gerd Weiss <gm@openoffice.org> | 2007-05-10 10:02:55 +0000 |
| commit | a899e2c45b1ecab2907c9861b2632ea5b4562848 (patch) | |
| tree | c50acc9905aa1917f291383f51f216fbb2b726c3 /setup_native/source/win32/customactions/patch/makefile.mk | |
| parent | 38eb8f8d55d1fc71052b6cca35bd6cd1c2b486d1 (diff) | |
INTEGRATION: CWS native82 (1.8.70); FILE MERGED
2007/03/29 11:54:46 is 1.8.70.3: RESYNC: (1.8-1.9); FILE MERGED
2007/03/28 07:26:34 dv 1.8.70.2: #i75394# Use only one function definition of SetMSIErrorCode
2007/03/26 14:18:11 dv 1.8.70.1: use SHL1OBJS instead of SLOFILES to prevent build problems
Diffstat (limited to 'setup_native/source/win32/customactions/patch/makefile.mk')
| -rwxr-xr-x | setup_native/source/win32/customactions/patch/makefile.mk | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/setup_native/source/win32/customactions/patch/makefile.mk b/setup_native/source/win32/customactions/patch/makefile.mk index 407be09d755d..3ffaba8e3552 100755 --- a/setup_native/source/win32/customactions/patch/makefile.mk +++ b/setup_native/source/win32/customactions/patch/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.9 $ +# $Revision: 1.10 $ # -# last change: $Author: vg $ $Date: 2007-03-26 14:08:29 $ +# last change: $Author: gm $ $Date: 2007-05-10 11:02:55 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -55,11 +55,7 @@ CFLAGS+=-D_STLP_USE_STATIC_LIB UWINAPILIB= SLOFILES = \ - $(SLO)$/swappatchfiles.obj \ - $(SLO)$/respintest.obj \ - $(SLO)$/shutdown_quickstart.obj \ - $(SLO)$/quickstarter.obj \ - $(SLO)$/upgrade.obj + $(SLO)$/swappatchfiles.obj STDSHL += \ $(ADVAPI32LIB)\ @@ -74,6 +70,13 @@ STDSHL+= \ SHL1LIBS = $(SLB)$/$(TARGET).lib +SHL1OBJS = $(SLOFILES) \ + $(SLO)$/respintest.obj \ + $(SLO)$/shutdown_quickstart.obj \ + $(SLO)$/quickstarter.obj \ + $(SLO)$/upgrade.obj \ + $(SLO)$/seterror.obj + SHL1TARGET = $(TARGET) SHL1IMPLIB = i$(TARGET) |