From 1d2b0ef6989bd3ced1271aab38343bed5a3bf2ca Mon Sep 17 00:00:00 2001
From: Stas Degteff <stas_degteff@users.sourceforge.net>
Date: Sun, 20 Mar 2011 15:48:14 +0000
Subject: [PATCH] Prepare to use system hunspell library. Patch from Semen
 Panevin 5025/121

---
 goldlib/gall/Makefile     | 6 +-----
 goldlib/gall/gespell.cpp  | 2 +-
 goldlib/gcfg/Makefile     | 2 +-
 goldlib/gcui/Makefile     | 6 +-----
 goldlib/glibc/Makefile    | 2 +-
 goldlib/gmb3/Makefile     | 2 +-
 goldlib/hunspell/Makefile | 2 +-
 goldlib/smblib/Makefile   | 2 +-
 goldlib/uulib/Makefile    | 2 +-
 goldnode/Makefile         | 2 +-
 rddt/Makefile             | 2 +-
 windows/golded.mak        | 4 ++--
 windows/goldlib.mak       | 4 ++--
 windows/goldnode.mak      | 4 ++--
 windows/rddt.mak          | 4 ++--
 15 files changed, 19 insertions(+), 27 deletions(-)

diff --git a/goldlib/gall/Makefile b/goldlib/gall/Makefile
index 734a2e2..40d5ef8 100644
--- a/goldlib/gall/Makefile
+++ b/goldlib/gall/Makefile
@@ -10,7 +10,7 @@ endif
 
 TOP=../..
 TARGET=gall
-INCS=-I$(TOP)/goldlib/gall
+INCS=-I$(TOP)/goldlib -I$(TOP)/goldlib/gall
 ifdef MINGW
 INCS+=-I$(TOP)/goldlib/glibc
 else
@@ -20,10 +20,6 @@ endif
 endif
 
 include $(TOP)/Config.def
-ifneq ($(findstring GCFG_NO_MYSPELL, $(CPPFLAGS)), GCFG_NO_MYSPELL)
-INCS+=-I$(TOP)/goldlib/hunspell
-endif
-
 include $(TOP)/GNUmakef.inc
 
 ifeq ($(PLATFORM),emx)
diff --git a/goldlib/gall/gespell.cpp b/goldlib/gall/gespell.cpp
index 56fae40..c2b86cd 100644
--- a/goldlib/gall/gespell.cpp
+++ b/goldlib/gall/gespell.cpp
@@ -42,7 +42,7 @@
 #include <glog.h>
 #include <gdbgerr.h>
 #if !defined(GCFG_NO_MYSPELL)
-#include <hunspell.hxx>
+#include <hunspell/hunspell.hxx>
 #endif
 #include <gespell.h>
 
diff --git a/goldlib/gcfg/Makefile b/goldlib/gcfg/Makefile
index 927251d..0f4df99 100644
--- a/goldlib/gcfg/Makefile
+++ b/goldlib/gcfg/Makefile
@@ -10,7 +10,7 @@ endif
 
 TOP=../..
 TARGET=gcfg
-INCS=-I$(TOP)/goldlib/gall -I$(TOP)/goldlib/gcfg
+INCS=-I$(TOP)/goldlib -I$(TOP)/goldlib/gall -I$(TOP)/goldlib/gcfg
 ifdef MINGW
 INCS+=-I$(TOP)/goldlib/glibc
 else
diff --git a/goldlib/gcui/Makefile b/goldlib/gcui/Makefile
index e2eec79..94b59c9 100644
--- a/goldlib/gcui/Makefile
+++ b/goldlib/gcui/Makefile
@@ -16,7 +16,7 @@ endif
 
 TOP=../..
 TARGET=gcui
-INCS=-I$(TOP)/goldlib/gcui -I$(TOP)/goldlib/gall
+INCS=-I$(TOP)/goldlib -I$(TOP)/goldlib/gcui -I$(TOP)/goldlib/gall
 
 ifdef MINGW
 INCS+=-I$(TOP)/goldlib/glibc
@@ -28,10 +28,6 @@ endif
 
 include $(TOP)/Config.def
 
-ifneq ($(findstring GCFG_NO_MYSPELL, $(CPPFLAGS)), GCFG_NO_MYSPELL)
-INCS+=-I$(TOP)/goldlib/hunspell
-endif
-
 include $(TOP)/GNUmakef.inc
 
 ifeq ($(PLATFORM),emx)
diff --git a/goldlib/glibc/Makefile b/goldlib/glibc/Makefile
index b10ba34..6954069 100644
--- a/goldlib/glibc/Makefile
+++ b/goldlib/glibc/Makefile
@@ -2,7 +2,7 @@
 
 TOP=../..
 TARGET=glibc
-INCS=-I$(TOP)/goldlib/glibc -I$(TOP)/goldlib/gall
+INCS=-I$(TOP)/goldlib -I$(TOP)/goldlib/glibc -I$(TOP)/goldlib/gall
 CFLAGS=-DHAVE_CONFIG_H
 
 include $(TOP)/GNUmakef.inc
diff --git a/goldlib/gmb3/Makefile b/goldlib/gmb3/Makefile
index b99d1ec..e467107 100644
--- a/goldlib/gmb3/Makefile
+++ b/goldlib/gmb3/Makefile
@@ -10,7 +10,7 @@ endif
 
 TOP=../..
 TARGET=gmb3
-INCS=-I$(TOP)/goldlib/gall -I$(TOP)/goldlib/gcui -I$(TOP)/goldlib/gcfg -I$(TOP)/goldlib/gmb3 -I$(TOP)/goldlib/smblib
+INCS=-I$(TOP)/goldlib -I$(TOP)/goldlib/gall -I$(TOP)/goldlib/gcui -I$(TOP)/goldlib/gcfg -I$(TOP)/goldlib/gmb3 -I$(TOP)/goldlib/smblib
 ifdef MINGW
 INCS+=-I$(TOP)/goldlib/glibc
 else
diff --git a/goldlib/hunspell/Makefile b/goldlib/hunspell/Makefile
index 7b1fa74..a482ce4 100644
--- a/goldlib/hunspell/Makefile
+++ b/goldlib/hunspell/Makefile
@@ -2,7 +2,7 @@
 
 TOP=../..
 TARGET=hunspell
-INCS=-I$(TOP)/goldlib/hunspell -I$(TOP)/goldlib/gall
+INCS=-I$(TOP)/goldlib -I$(TOP)/goldlib/gall
 CFLAGS=
 
 include $(TOP)/GNUmakef.inc
diff --git a/goldlib/smblib/Makefile b/goldlib/smblib/Makefile
index 54cd26a9..6f518b6 100644
--- a/goldlib/smblib/Makefile
+++ b/goldlib/smblib/Makefile
@@ -2,7 +2,7 @@
 
 TOP=../..
 TARGET=smblib
-INCS=-I$(TOP)/goldlib/smblib -I$(TOP)/goldlib/gall
+INCS=-I$(TOP)/goldlib -I$(TOP)/goldlib/smblib -I$(TOP)/goldlib/gall
 CFLAGS=-x c++
 
 include $(TOP)/GNUmakef.inc
diff --git a/goldlib/uulib/Makefile b/goldlib/uulib/Makefile
index c1a80c5..bb5d3f8 100644
--- a/goldlib/uulib/Makefile
+++ b/goldlib/uulib/Makefile
@@ -5,7 +5,7 @@ PATCH=15
 
 TOP=../..
 TARGET=uulib
-INCS=-I$(TOP)/goldlib/uulib -I$(TOP)/goldlib/gall -I$(TOP)/goldlib/glibc
+INCS=-I$(TOP)/goldlib -I$(TOP)/goldlib/uulib -I$(TOP)/goldlib/gall -I$(TOP)/goldlib/glibc
 CFLAGS=-DHAVE_CONFIG_H -DVERSION=\"$(VERSION)\" -DPATCH=\"$(PATCH)\"
 
 include $(TOP)/GNUmakef.inc
diff --git a/goldnode/Makefile b/goldnode/Makefile
index 45aa3e5..3c1f6b7 100644
--- a/goldnode/Makefile
+++ b/goldnode/Makefile
@@ -11,7 +11,7 @@ endif
 TOP=..
 SHORTTARGET=gn
 TARGET=goldnode
-INCS=-I$(TOP)/goldlib/gall -I$(TOP)/goldlib/gcfg -I$(TOP)/golded3/
+INCS=-I$(TOP)/goldlib -I$(TOP)/goldlib/gall -I$(TOP)/goldlib/gcfg -I$(TOP)/golded3/
 ifdef MINGW
 STDLIBS=-luser32
 endif
diff --git a/rddt/Makefile b/rddt/Makefile
index d3b7a50..5b941c9 100644
--- a/rddt/Makefile
+++ b/rddt/Makefile
@@ -11,7 +11,7 @@ endif
 TOP=..
 SHORTTARGET=rddt
 TARGET=rddt
-INCS=-I$(TOP)/goldlib/gall -I$(TOP)/golded3
+INCS=-I$(TOP)/goldlib -I$(TOP)/goldlib/gall -I$(TOP)/golded3
 ifdef MINGW
 STDLIBS=-luser32
 endif
diff --git a/windows/golded.mak b/windows/golded.mak
index a9cf15a..bf6cb7f 100644
--- a/windows/golded.mak
+++ b/windows/golded.mak
@@ -118,7 +118,7 @@ CLEAN :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
 CPP=cl.exe
-CPP_PROJ=/nologo /MD /W3 /Gm /GX /Zi /O1 /I "..\golded3" /I "..\goldlib\gall" /I "..\goldlib\gcui" /I "..\goldlib\gcfg" /I "..\goldlib\glibc" /I "..\goldlib\gmb3" /I "..\goldlib\smblib" /I "..\goldlib\uulib" /I "..\goldlib\hunspell" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "HAVE_STDARG_H" /D "HAVE_CONFIG_H" /D "__INCLUDE_NEW_KEYWORDS__" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /J /FD /c
+CPP_PROJ=/nologo /MD /W3 /Gm /GX /Zi /O1 /I "..\golded3" /I "..\goldlib\gall" /I "..\goldlib\gcui" /I "..\goldlib\gcfg" /I "..\goldlib\glibc" /I "..\goldlib\gmb3" /I "..\goldlib\smblib" /I "..\goldlib\uulib" /I "..\goldlib" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "HAVE_STDARG_H" /D "HAVE_CONFIG_H" /D "__INCLUDE_NEW_KEYWORDS__" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /J /FD /c
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
@@ -318,7 +318,7 @@ CLEAN :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
 CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /Gm /Gi /GX /ZI /Od /I ".\golded3" /I ".\goldlib\gall" /I ".\goldlib\gcui" /I ".\goldlib\gcfg" /I ".\goldlib\glibc" /I ".\goldlib\gmb3" /I ".\goldlib\msgidlib" /I ".\goldlib\smblib" /I ".\goldlib\uulib" /I "..\golded3" /I "..\goldlib\gall" /I "..\goldlib\gcui" /I "..\goldlib\gcfg" /I "..\goldlib\glibc" /I "..\goldlib\gmb3" /I "..\goldlib\smblib" /I "..\goldlib\uulib" /I "..\goldlib\hunspell" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "HAVE_STDARG_H" /D "HAVE_CONFIG_H" /D "__INCLUDE_NEW_KEYWORDS__" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /J /FD /GZ /c 
+CPP_PROJ=/nologo /MDd /W3 /Gm /Gi /GX /ZI /Od /I ".\golded3" /I ".\goldlib\gall" /I ".\goldlib\gcui" /I ".\goldlib\gcfg" /I ".\goldlib\glibc" /I ".\goldlib\gmb3" /I ".\goldlib\msgidlib" /I ".\goldlib\smblib" /I ".\goldlib\uulib" /I "..\golded3" /I "..\goldlib\gall" /I "..\goldlib\gcui" /I "..\goldlib\gcfg" /I "..\goldlib\glibc" /I "..\goldlib\gmb3" /I "..\goldlib\smblib" /I "..\goldlib\uulib" /I "..\goldlib" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "HAVE_STDARG_H" /D "HAVE_CONFIG_H" /D "__INCLUDE_NEW_KEYWORDS__" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /J /FD /GZ /c
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
diff --git a/windows/goldlib.mak b/windows/goldlib.mak
index e3201b3..4052d73 100644
--- a/windows/goldlib.mak
+++ b/windows/goldlib.mak
@@ -233,7 +233,7 @@ CLEAN :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
 CPP=cl.exe
-CPP_PROJ=/nologo /MD /W3 /Gm /GX /Zi /O1 /I "..\goldlib\gall" /I "..\goldlib\gcui" /I "..\goldlib\gcfg" /I "..\goldlib\glibc" /I "..\goldlib\gmb3" /I "..\goldlib\smblib" /I "..\goldlib\uulib" /I "..\goldlib\hunspell" /D "WIN32" /D "NDEBUG" /D "_LIB" /D "HAVE_STDARG_H" /D "HAVE_CONFIG_H" /D "__INCLUDE_NEW_KEYWORDS__" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /J /FD /c 
+CPP_PROJ=/nologo /MD /W3 /Gm /GX /Zi /O1 /I "..\goldlib\gall" /I "..\goldlib\gcui" /I "..\goldlib\gcfg" /I "..\goldlib\glibc" /I "..\goldlib\gmb3" /I "..\goldlib\smblib" /I "..\goldlib\uulib" /I "..\goldlib" /D "WIN32" /D "NDEBUG" /D "_LIB" /D "HAVE_STDARG_H" /D "HAVE_CONFIG_H" /D "__INCLUDE_NEW_KEYWORDS__" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /J /FD /c
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
@@ -672,7 +672,7 @@ CLEAN :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
 CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /Gm /Gi /GX /ZI /Od /I "..\goldlib\gall" /I "..\goldlib\gcui" /I "..\goldlib\gcfg" /I "..\goldlib\glibc" /I "..\goldlib\gmb3" /I "..\goldlib\smblib" /I "..\goldlib\uulib" /I "..\goldlib\hunspell" /D "WIN32" /D "_DEBUG" /D "_LIB" /D "HAVE_STDARG_H" /D "HAVE_CONFIG_H" /D "__INCLUDE_NEW_KEYWORDS__" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /J /FD /GZ /c 
+CPP_PROJ=/nologo /MDd /W3 /Gm /Gi /GX /ZI /Od /I "..\goldlib\gall" /I "..\goldlib\gcui" /I "..\goldlib\gcfg" /I "..\goldlib\glibc" /I "..\goldlib\gmb3" /I "..\goldlib\smblib" /I "..\goldlib\uulib" /I "..\goldlib" /D "WIN32" /D "_DEBUG" /D "_LIB" /D "HAVE_STDARG_H" /D "HAVE_CONFIG_H" /D "__INCLUDE_NEW_KEYWORDS__" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /J /FD /GZ /c
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
diff --git a/windows/goldnode.mak b/windows/goldnode.mak
index 6ea8254..6a30f23 100644
--- a/windows/goldnode.mak
+++ b/windows/goldnode.mak
@@ -61,7 +61,7 @@ CLEAN :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
 CPP=cl.exe
-CPP_PROJ=/nologo /MD /W3 /Gm /GX /Zi /O1 /I ".\golded3" /I ".\goldlib\gall" /I ".\goldlib\gcfg" /I ".\goldlib\glibc" /I ".\goldlib\gmb3" /I ".\goldlib\msgidlib" /I ".\goldlib\smblib" /I ".\goldlib\uulib" /I "..\golded3" /I "..\goldlib\gall" /I "..\goldlib\gcfg" /I "..\goldlib\glibc" /I "..\goldlib\gmb3" /I "..\goldlib\smblib" /I "..\goldlib\uulib" /I "..\goldlib\hunspell" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "HAVE_STDARG_H" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /J /FD /c 
+CPP_PROJ=/nologo /MD /W3 /Gm /GX /Zi /O1 /I ".\golded3" /I ".\goldlib\gall" /I ".\goldlib\gcfg" /I ".\goldlib\glibc" /I ".\goldlib\gmb3" /I ".\goldlib\msgidlib" /I ".\goldlib\smblib" /I ".\goldlib\uulib" /I "..\golded3" /I "..\goldlib\gall" /I "..\goldlib\gcfg" /I "..\goldlib\glibc" /I "..\goldlib\gmb3" /I "..\goldlib\smblib" /I "..\goldlib\uulib" /I "..\goldlib" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "HAVE_STDARG_H" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /J /FD /c
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
@@ -146,7 +146,7 @@ CLEAN :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
 CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /Gm /Gi /GX /ZI /Od /I ".\golded3" /I ".\goldlib\gall" /I ".\goldlib\gcfg" /I ".\goldlib\glibc" /I ".\goldlib\gmb3" /I ".\goldlib\msgidlib" /I ".\goldlib\smblib" /I ".\goldlib\uulib" /I "..\golded3" /I "..\goldlib\gall" /I "..\goldlib\gcfg" /I "..\goldlib\glibc" /I "..\goldlib\gmb3" /I "..\goldlib\smblib" /I "..\goldlib\uulib" /I "..\goldlib\hunspell" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "HAVE_STDARG_H" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /J /FD /GZ /c 
+CPP_PROJ=/nologo /MDd /W3 /Gm /Gi /GX /ZI /Od /I ".\golded3" /I ".\goldlib\gall" /I ".\goldlib\gcfg" /I ".\goldlib\glibc" /I ".\goldlib\gmb3" /I ".\goldlib\msgidlib" /I ".\goldlib\smblib" /I ".\goldlib\uulib" /I "..\golded3" /I "..\goldlib\gall" /I "..\goldlib\gcfg" /I "..\goldlib\glibc" /I "..\goldlib\gmb3" /I "..\goldlib\smblib" /I "..\goldlib\uulib" /I "..\goldlib" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "HAVE_STDARG_H" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /J /FD /GZ /c
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
diff --git a/windows/rddt.mak b/windows/rddt.mak
index 963d537..859efe0 100644
--- a/windows/rddt.mak
+++ b/windows/rddt.mak
@@ -61,7 +61,7 @@ CLEAN :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
 CPP=cl.exe
-CPP_PROJ=/nologo /MD /W3 /Gm /GX /Zi /O1 /I ".\golded3" /I ".\goldlib\gall" /I ".\goldlib\gcfg" /I ".\goldlib\glibc" /I ".\goldlib\gmb3" /I ".\goldlib\msgidlib" /I ".\goldlib\smblib" /I ".\goldlib\uulib" /I "..\golded3" /I "..\goldlib\gall" /I "..\goldlib\gcfg" /I "..\goldlib\glibc" /I "..\goldlib\gmb3" /I "..\goldlib\smblib" /I "..\goldlib\uulib" /I "..\goldlib\hunspell" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "HAVE_STDARG_H" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /J /FD /c 
+CPP_PROJ=/nologo /MD /W3 /Gm /GX /Zi /O1 /I ".\golded3" /I ".\goldlib\gall" /I ".\goldlib\gcfg" /I ".\goldlib\glibc" /I ".\goldlib\gmb3" /I ".\goldlib\msgidlib" /I ".\goldlib\smblib" /I ".\goldlib\uulib" /I "..\golded3" /I "..\goldlib\gall" /I "..\goldlib\gcfg" /I "..\goldlib\glibc" /I "..\goldlib\gmb3" /I "..\goldlib\smblib" /I "..\goldlib\uulib" /I "..\goldlib" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "HAVE_STDARG_H" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /J /FD /c
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
@@ -146,7 +146,7 @@ CLEAN :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
 CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /Gm /Gi /GX /ZI /Od /I ".\golded3" /I ".\goldlib\gall" /I ".\goldlib\gcfg" /I ".\goldlib\glibc" /I ".\goldlib\gmb3" /I ".\goldlib\msgidlib" /I ".\goldlib\smblib" /I ".\goldlib\uulib" /I "..\golded3" /I "..\goldlib\gall" /I "..\goldlib\gcfg" /I "..\goldlib\glibc" /I "..\goldlib\gmb3" /I "..\goldlib\smblib" /I "..\goldlib\uulib" /I "..\goldlib\hunspell" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "HAVE_STDARG_H" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /J /FD /GZ /c
+CPP_PROJ=/nologo /MDd /W3 /Gm /Gi /GX /ZI /Od /I ".\golded3" /I ".\goldlib\gall" /I ".\goldlib\gcfg" /I ".\goldlib\glibc" /I ".\goldlib\gmb3" /I ".\goldlib\msgidlib" /I ".\goldlib\smblib" /I ".\goldlib\uulib" /I "..\golded3" /I "..\goldlib\gall" /I "..\goldlib\gcfg" /I "..\goldlib\glibc" /I "..\goldlib\gmb3" /I "..\goldlib\smblib" /I "..\goldlib\uulib" /I "..\goldlib" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "HAVE_STDARG_H" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /J /FD /GZ /c
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<