diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-03-26 12:42:44 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-03-26 12:42:44 +0000 |
| commit | a360f024db6058628e5b627d5a1312de6bd18847 (patch) | |
| tree | a8b7e8ea32356a99593dc137c12e977597040c8a /automation/util/makefile.mk | |
| parent | 72079efbf7b3ff1a38344fa934611d8421d74f2c (diff) | |
INTEGRATION: CWS mingwport03 (1.22.18); FILE MERGED
2007/03/19 15:15:22 vg 1.22.18.2: RESYNC MERGED 1.22 1.23
Everything below this line will be added to the revision comment.
2006/09/06 15:46:03 vg 1.22.18.1: #i53572# MinGW port
Diffstat (limited to 'automation/util/makefile.mk')
| -rw-r--r-- | automation/util/makefile.mk | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/automation/util/makefile.mk b/automation/util/makefile.mk index aaa35d4e4f12..da0d37f8d492 100644 --- a/automation/util/makefile.mk +++ b/automation/util/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.24 $ +# $Revision: 1.25 $ # -# last change: $Author: obo $ $Date: 2007-03-09 08:54:24 $ +# last change: $Author: vg $ $Date: 2007-03-26 13:42:44 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -73,8 +73,8 @@ SHL1STDLIBS= \ .IF "$(GUI)"=="WNT" SHL1STDLIBS+= \ - advapi32.lib \ - gdi32.lib + $(ADVAPI32LIB) \ + $(GDI32LIB) .ENDIF SHL1DEF= $(MISC)$/$(SHL1TARGET).def @@ -131,8 +131,8 @@ SHL3STDLIBS= \ .IF "$(GUI)"=="WNT" SHL3STDLIBS+= \ - advapi32.lib \ - gdi32.lib + $(ADVAPI32LIB) \ + $(GDI32LIB) .ENDIF SHL3DEF= $(MISC)$/$(SHL3TARGET).def @@ -151,14 +151,13 @@ DEF3DES =Communication APP1TARGET=testtool .IF "$(GUI)" == "UNX" -APP1STDLIBS= -lapp -lsample APP1DEPN+=$(SHL2TARGETN) $(SHL3TARGETN) .ELSE -APP1STDLIBS= \ - app.lib \ - sample.lib APP1DEPN+=$(SHL2IMPLIBN) $(SHL3IMPLIBN) .ENDIF +APP1STDLIBS= \ + $(APP3RDLIB) \ + $(SAMPLE3RDLIB) APP1STDLIBS+= \ $(CPPUHELPERLIB) \ @@ -188,8 +187,8 @@ APP1STDLIBS+=$(CPPULIB) .IF "$(GUI)"=="WNT" APP1STDLIBS += \ - shell32.lib \ - advapi32.lib + $(SHELL32LIB) \ + $(ADVAPI32LIB) .ENDIF # "$(GUI)"=="WNT" @@ -256,9 +255,11 @@ APP3LIBS= \ $(LB)$/miniapp.lib .IF "$(GUI)" != "UNX" +.IF "$(COM)" != "GCC" # win16 braucht ein appobj APP3OBJS= $(OBJ)$/testapp.obj .ENDIF +.ENDIF # --- Targets ----------------------------------------------------------- |