diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-01-11 14:00:29 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-01-11 14:00:29 +0000 |
| commit | e74dddc5cc5667b0136056e05465b3415af7ff3b (patch) | |
| tree | 156ec61fc119b836f9ee26fc154ef194f1257eb8 /sfx2/util | |
| parent | 978047cac61565660496038e92c9bea981f1c5a6 (diff) | |
INTEGRATION: CWS sb25 (1.34.86); FILE MERGED
2004/12/17 13:44:35 sb 1.34.86.3: #i37077# Fixes for WNT.
2004/12/07 20:02:09 sb 1.34.86.2: RESYNC: (1.34-1.35); FILE MERGED
2004/11/12 17:04:21 sb 1.34.86.1: #i37077# Reduce number of exported symbols of sfx dynamic library.
Diffstat (limited to 'sfx2/util')
| -rw-r--r-- | sfx2/util/makefile.mk | 32 |
1 files changed, 5 insertions, 27 deletions
diff --git a/sfx2/util/makefile.mk b/sfx2/util/makefile.mk index c51c59b95350..4addbe96ac9a 100644 --- a/sfx2/util/makefile.mk +++ b/sfx2/util/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.35 $ +# $Revision: 1.36 $ # -# last change: $Author: hr $ $Date: 2004-11-09 11:51:36 $ +# last change: $Author: rt $ $Date: 2005-01-11 15:00:29 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -65,14 +65,15 @@ PRJ=.. ENABLE_EXCEPTIONS=TRUE PRJNAME=sfx2 TARGET=sfx -.INCLUDE : $(PRJ)$/util$/makefile.pmk #sfx.hid generieren GEN_HID=TRUE GEN_HID_OTHER=TRUE +USE_DEFFILE=TRUE # --- Settings ----------------------------------------------------- .INCLUDE : settings.mk +.INCLUDE : $(PRJ)$/util$/makefile.pmk # --- Allgemein ---------------------------------------------------- @@ -103,6 +104,7 @@ LIB2FILES= $(LB)$/isfx.lib SHL1TARGET= sfx$(UPD)$(DLLPOSTFIX) SHL1IMPLIB= isfx +SHL1USE_EXPORTS=ordinal SHL1STDLIBS+=\ $(FWELIB) \ @@ -154,25 +156,9 @@ SHL1OBJS= $(SLO)$/sfxdll.obj SHL1DEF= $(MISC)$/$(SHL1TARGET).def DEF1NAME =$(SHL1TARGET) -DEF1DEPN =$(MISC)$/$(SHL1TARGET).flt \ - $(HXX1FILES) \ - $(HXX2FILES) \ - $(HXX3FILES) \ - $(HXX4FILES) \ - $(HXX5FILES) \ - $(HXX6FILES) \ - $(HXX7FILES) \ - $(HXX8FILES) \ - $(HXX9FILES) \ - $(HXX10FILES) DEFLIB1NAME =sfx DEF1DES =Sfx -.IF "$(GUI)"=="WNT" -DEF1EXPORT6 = component_writeInfo -DEF1EXPORT7 = component_getFactory -.ENDIF - SFXSRSLIST=\ $(SRS)$/accel.srs \ $(SRS)$/appl.srs \ @@ -195,11 +181,3 @@ RESLIB1SRSFILES=$(SFXSRSLIST) .INCLUDE : target.mk - -# --- SFX-Filter-Datei --- - -$(MISC)$/$(SHL1TARGET).flt: makefile.mk - @echo ------------------------------ - @echo Making: $@ - @+$(TYPE) sfxwin.flt > $@ - |