diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-05-22 15:41:25 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-05-22 15:41:25 +0000 |
| commit | eba34d8c13cff414dbc6c7390f22e5cb45c5c390 (patch) | |
| tree | fd1434a5266e0e8fe06a088444a86d7bab5e7bec /sw/util | |
| parent | b7c1b62db758ace50c1488e6f227eedd0583355e (diff) | |
INTEGRATION: CWS chart2mst3 (1.52.12); FILE MERGED
2007/05/14 19:53:07 bm 1.52.12.8: RESYNC: (1.59-1.60); FILE MERGED
2007/04/24 23:53:08 bm 1.52.12.7: RESYNC: (1.58-1.59); FILE MERGED
2007/02/07 19:42:24 iha 1.52.12.6: RESYNC: (1.56-1.58); FILE MERGED
2006/11/24 21:22:53 bm 1.52.12.5: RESYNC: (1.54-1.56); FILE MERGED
2006/11/10 13:47:30 tl 1.52.12.4: #i71245#, #i69313#; old chart removed, fixed incorrectly shown default chart
2006/05/05 18:39:39 bm 1.52.12.3: RESYNC: (1.53-1.54); FILE MERGED
2006/01/26 00:16:12 bm 1.52.12.2: RESYNC: (1.52-1.53); FILE MERGED
2006/01/16 09:23:00 tl 1.52.12.1: #30052# added new resource file
Diffstat (limited to 'sw/util')
| -rw-r--r-- | sw/util/makefile.mk | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/sw/util/makefile.mk b/sw/util/makefile.mk index d583df29cb..26387b4e25 100644 --- a/sw/util/makefile.mk +++ b/sw/util/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.60 $ +# $Revision: 1.61 $ # -# last change: $Author: kz $ $Date: 2007-05-10 16:27:59 $ +# last change: $Author: vg $ $Date: 2007-05-22 16:41:25 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -73,6 +73,7 @@ sw_res_files= \ $(SRS)$/table.srs \ $(SRS)$/uiview.srs \ $(SRS)$/undo.srs \ + $(SRS)$/unocore.srs \ $(SRS)$/utlui.srs \ $(SRS)$/web.srs \ $(SRS)$/wrtsh.srs \ @@ -102,11 +103,6 @@ LIB1TARGET =$(SLB)$/swall.lib LIB1OBJFILES= $(OUT)$/slo$/swmodule.obj \ $(OUT)$/slo$/swdll.obj -.IF "$(OS)"!="MACOSX" -# static libraries -SHL1STDLIBS+= $(SCHLIB) -.ENDIF - # dynamic libraries SHL1STDLIBS+= \ $(SVXLIB) \ @@ -135,11 +131,6 @@ SHL1STDLIBS+= \ $(AVMEDIALIB) \ $(XML2LIB) -.IF "$(OS)"=="MACOSX" -# static libraries at end for OS X -SHL1STDLIBS+= $(SCHLIB) -.ENDIF - .IF "$(GUI)"=="WNT" SHL1STDLIBS+= $(ADVAPI32LIB) .ENDIF # WNT |