From 224af7afa8b014962db8c1d393c6cdd8fe8cf6d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=BCdiger=20Timm?= <rt@openoffice.org>
Date: Fri, 13 Jun 2008 13:36:45 +0000
Subject: [PATCH] INTEGRATION: CWS hunspellexternal (1.14.8); FILE MERGED
 2008/04/22 14:16:23 cmc 1.14.8.5: rejig for dictmgr.hxx move 2008/04/22
 06:39:44 rene 1.14.8.4: #i87604#, #i10000# fix the build with both internal
 and system hunspell 2008/04/21 09:30:24 rene 1.14.8.3: RESYNC: (1.16-1.19);
 FILE MERGED 2008/01/04 19:30:54 rene 1.14.8.2: RESYNC: (1.14-1.16); FILE
 MERGED 2007/10/08 11:09:33 rene 1.14.8.1: add HUNSPELL BUILD_TYPE, make
 dictmgr.hxx used from hunspell, remove HUNSPELLIB from solenv/inc/libs.mk

---
 .../altlinuxhyph/hyphen/makefile.mk           | 29 +++++--------------
 1 file changed, 8 insertions(+), 21 deletions(-)

diff --git a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk
index 703580bad7fa..e65d637f8a2f 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.22 $
+# $Revision: 1.23 $
 #
 # This file is part of OpenOffice.org.
 #
@@ -44,26 +44,17 @@ HNJLIB=$(SLB)\hyphen.lib
 HNJLIB=hyphen.lib
 .ENDIF
 
-.IF "$(ULINGULIB)"==""
-.IF "$(GUI)"=="UNX"
-ULINGULIB=-lulingu
-.ENDIF # unx
-.IF "$(GUI)"=="OS2"
-ULINGULIB=$(SLB)\libulingu.lib
-.ENDIF # unx
-.IF "$(GUI)"=="WNT"
-ULINGULIB=libulingu.lib
-.ENDIF # wnt
-.ENDIF
-
 #----- Settings ---------------------------------------------------------
 
 .INCLUDE : settings.mk
 
 # --- Files --------------------------------------------------------
 
+.IF "$(SYSTEM_HUNSPELL)" != "YES"
+HUNSPELL_CFLAGS += -I$(SOLARVER)$/$(INPATH)$/inc$/hunspell
+.ENDIF
 
-CFLAGS += -I..$/..$/..$/lingutil
+CFLAGS += -I..$/..$/..$/lingutil $(HUNSPELL_CFLAGS)
 
 EXCEPTIONSFILES=	\
         $(SLO)$/hprophelp.obj\
@@ -90,13 +81,9 @@ SHL1STDLIBS= \
         $(UCBHELPERLIB)	\
         $(UNOTOOLSLIB)	\
         $(LNGLIB) \
-        $(HNJLIB)
-
-.IF "$(SYSTEM_HUNSPELL)" != "YES"
-SHL1STDLIBS+=   $(ULINGULIB)
-.ELSE
-SHL1STDLIBS+=   $(HUNSPELL_LIBS)
-.ENDIF
+        $(HNJLIB) \
+        $(ULINGULIB) \
+        $(HUNSPELLLIB)
 
 # build DLL
 SHL1LIBS=		$(SLB)$/$(TARGET).lib