diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2006-06-29 10:17:20 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2006-06-29 10:17:20 +0000 |
| commit | d0be9bc0435362674c4db1f94b862128fc3ef72f (patch) | |
| tree | e5e6ca47d0a2a3d8b5a3a46f96b2c1657402b6cd /setup_native/source/win32/customactions/quickstarter | |
| parent | af25e8965271a55e15a27a13676fc227248120d3 (diff) | |
INTEGRATION: CWS ause036 (1.2.86); FILE MERGED
2005/09/13 10:58:42 hjs 1.2.86.2: RESYNC: (1.2-1.3); FILE MERGED
2005/08/18 15:18:53 hjs 1.2.86.1: #i53507# cleanup
Diffstat (limited to 'setup_native/source/win32/customactions/quickstarter')
| -rw-r--r-- | setup_native/source/win32/customactions/quickstarter/makefile.mk | 33 |
1 files changed, 12 insertions, 21 deletions
diff --git a/setup_native/source/win32/customactions/quickstarter/makefile.mk b/setup_native/source/win32/customactions/quickstarter/makefile.mk index 55f9ba0c92e8..a5ff4657859c 100644 --- a/setup_native/source/win32/customactions/quickstarter/makefile.mk +++ b/setup_native/source/win32/customactions/quickstarter/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.3 $ +# $Revision: 1.4 $ # -# last change: $Author: rt $ $Date: 2005-09-07 16:33:47 $ +# last change: $Author: ihi $ $Date: 2006-06-29 11:17:20 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -39,8 +39,6 @@ TARGET=quickstarter TARGET1=sdqsmsi TARGET2=qslnkmsi -.IF "$(GUI)"=="WNT" - # --- Settings ----------------------------------------------------- LIBTARGET=NO @@ -56,17 +54,18 @@ UWINAPILIB= # --- Files -------------------------------------------------------- +.IF "$(GUI)"=="WNT" + +STDSHL += \ + advapi32.lib\ + shell32.lib\ + msi.lib\ + $(LIBSTLPORTST) + SHL1OBJS = $(SLO)$/shutdown_quickstart.obj \ $(SLO)$/quickstarter.obj -SHL1STDLIBS= kernel32.lib\ - user32.lib\ - advapi32.lib\ - shell32.lib\ - msi.lib\ - $(LIBSTLPORTST) - SHL1TARGET = $(TARGET1) SHL1IMPLIB = i$(TARGET1) @@ -81,13 +80,6 @@ DEF1EXPORTFILE=$(TARGET1).dxp SHL2OBJS = $(SLO)$/remove_quickstart_link.obj \ $(SLO)$/quickstarter.obj -SHL2STDLIBS= kernel32.lib\ - user32.lib\ - advapi32.lib\ - shell32.lib\ - msi.lib\ - $(LIBSTLPORTST) - SHL2TARGET = $(TARGET2) SHL2IMPLIB = i$(TARGET2) @@ -97,12 +89,11 @@ DEF2NAME=$(SHL2TARGET) SHL2DEPN=$(SHL1OBJS) DEF2EXPORTFILE=$(TARGET2).dxp +.ENDIF + # --- Targets -------------------------------------------------------------- .INCLUDE : target.mk # ------------------------------------------------------------------------- - -.ENDIF - |