diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-05-07 15:34:05 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-05-07 15:34:05 +0000 |
| commit | 6fa2f2a0db27107b2d60fb49f275fcda1a7c9a7c (patch) | |
| tree | 6c1de53ceceda3c51118da693556406a87a055f6 /lingucomponent | |
| parent | e6193678322fa28f6b4a04333687680fdc1d62ff (diff) | |
#i10000# prevent link errors on windows
Diffstat (limited to 'lingucomponent')
| -rw-r--r-- | lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk | 24 |
1 files changed, 7 insertions, 17 deletions
diff --git a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk index 8981402876ea..a9ac761484bf 100644 --- a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk +++ b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.20 $ +# $Revision: 1.21 $ # # This file is part of OpenOffice.org. # @@ -32,7 +32,7 @@ PRJ = ..$/..$/..$/.. PRJNAME = lingucomponent -TARGET = hyphen +TARGET = hyphen_lib ENABLE_EXCEPTIONS=TRUE USE_DEFFILE=TRUE @@ -56,8 +56,6 @@ ULINGULIB=libulingu.lib .ENDIF # wnt .ENDIF - - #----- Settings --------------------------------------------------------- .INCLUDE : settings.mk @@ -65,11 +63,7 @@ ULINGULIB=libulingu.lib # --- Files -------------------------------------------------------- -CXXFLAGS += -I..$/..$/..$/lingutil -CFLAGSCXX += -I..$/..$/..$/lingutil -CFLAGSCC += -I..$/..$/..$/lingutil - -.IF "$(header)" == "" +CFLAGS += -I..$/..$/..$/lingutil EXCEPTIONSFILES= \ $(SLO)$/hprophelp.obj\ @@ -80,8 +74,8 @@ SLOFILES= \ $(SLO)$/hreg.obj\ $(SLO)$/hyphenimp.obj - -SHL1TARGET= $(TARGET)$(DLLPOSTFIX) +REALNAME:=hyphen +SHL1TARGET= $(REALNAME)$(DLLPOSTFIX) SHL1STDLIBS= \ $(CPPULIB) \ @@ -104,22 +98,18 @@ SHL1STDLIBS+= $(ULINGULIB) SHL1STDLIBS+= $(HUNSPELL_LIBS) .ENDIF - - # build DLL SHL1LIBS= $(SLB)$/$(TARGET).lib -SHL1IMPLIB= i$(TARGET) +SHL1IMPLIB= i$(REALNAME) SHL1DEPN= $(SHL1LIBS) SHL1DEF= $(MISC)$/$(SHL1TARGET).def -SHL1VERSIONMAP= $(TARGET).map +SHL1VERSIONMAP= $(REALNAME).map # build DEF file DEF1NAME =$(SHL1TARGET) DEF1EXPORTFILE= exports.dxp -.ENDIF - # --- Targets ------------------------------------------------------ .INCLUDE : target.mk |