diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-01-11 13:08:31 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-01-11 13:08:31 +0000 |
| commit | cda96f98b8d20c303c263d6256b52ed69a6fd800 (patch) | |
| tree | fdaca61470bdb664c7881a889dd316a92f2782ed /toolkit | |
| parent | c82e99718e089e0b7da8ead0f8a3491425d3bdb4 (diff) | |
INTEGRATION: CWS sb25 (1.15.68); FILE MERGED
2004/12/17 14:05:01 sb 1.15.68.3: #i37077# Fixes for WNT.
2004/12/10 11:03:02 sb 1.15.68.2: #i37760# Cleaned up.
2004/11/25 18:14:45 mt 1.15.68.1: #i37760# Less exports...
Diffstat (limited to 'toolkit')
| -rw-r--r-- | toolkit/util/makefile.mk | 41 |
1 files changed, 7 insertions, 34 deletions
diff --git a/toolkit/util/makefile.mk b/toolkit/util/makefile.mk index 3ddd4bcfd474..29a87758eb59 100644 --- a/toolkit/util/makefile.mk +++ b/toolkit/util/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.15 $ +# $Revision: 1.16 $ # -# last change: $Author: rt $ $Date: 2004-05-07 16:17:58 $ +# last change: $Author: rt $ $Date: 2005-01-11 14:08:31 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -67,10 +67,13 @@ PRJ=.. PRJNAME=toolkit TARGET=tk VERSION=$(UPD) +USE_DEFFILE=TRUE # --- Settings ----------------------------------------------------------- .INCLUDE : settings.mk +.INCLUDE : $(PRJ)$/util$/makefile.pmk + # --- Allgemein ---------------------------------------------------------- @@ -80,6 +83,7 @@ LIB1FILES= $(SLB)$/awt.lib \ $(SLB)$/helper.lib SHL1TARGET= tk$(VERSION)$(DLLPOSTFIX) SHL1IMPLIB= itk +SHL1USE_EXPORTS=ordinal SHL1STDLIBS=\ $(VCLLIB) \ @@ -96,14 +100,10 @@ SHL1DEF= $(MISC)$/$(SHL1TARGET).def SHL1DEPN=$(LIB1TARGET) DEF1NAME =$(SHL1TARGET) -DEF1DEPN =$(MISC)$/$(SHL1TARGET).flt \ - $(LIB1TARGET) -DEF1DEPN+=$(DEF1EXPORTFILE) +DEF1DEPN =$(LIB1TARGET) DEF1DES =TK DEFLIB1NAME =tk -DEF1EXPORTFILE= tk.dxp - .IF "$(OS)"=="MACOSX" # [ed] 6/16/02 Add in X libraries if we're building X @@ -125,30 +125,3 @@ RESLIB1NAME=$(TARGET) RESLIB1SRSFILES=$(RES1FILELIST) .INCLUDE : target.mk - -# --- Targets ------------------------------------------------------------ - -$(MISC)$/$(SHL1TARGET).flt: makefile.mk - @echo ------------------------------ - @echo Making: $@ - @echo Provider> $@ - @echo UnoControlEditModel>> $@ - @echo UnoFixedTextControl>> $@ - @echo UnoControlFixedTextModel>> $@ - @echo UnoButtonControl>> $@ - @echo UnoControlButtonModel>> $@ - @echo UnoListBoxControl>> $@ - @echo UnoControlListBoxModel>> $@ - @echo VCLXButton>> $@ - @echo VCLXCheckBox>> $@ - @echo VCLXComboBox>> $@ - @echo VCLXFixedText>> $@ - @echo VCLXFontMetric>> $@ - @echo VCLXGraphics>> $@ - @echo VCLXListBox>> $@ - @echo VCLXMessageBox>> $@ - @echo VCLXRadioButton>> $@ - @echo VCLXScrollBar>> $@ - @echo VCLXVirtualDevice>> $@ - @echo VCLXToolkit>> $@ - @echo __CT>> $@ |