From 25a6aac7997cb51a2e7014cf1a6fc82520e7c5c8 Mon Sep 17 00:00:00 2001
From: Stas Degteff <stas_degteff@users.sourceforge.net>
Date: Mon, 10 Apr 2006 19:04:04 +0000
Subject: [PATCH] CGG build with hunspell

---
 Makefile                  | 30 +++++++++++++++---------------
 golded3/Makefile          |  2 +-
 goldlib/gall/Makefile     |  2 +-
 goldlib/hunspell/Makefile |  9 +++++++++
 4 files changed, 26 insertions(+), 17 deletions(-)
 create mode 100644 goldlib/hunspell/Makefile

diff --git a/Makefile b/Makefile
index ebceb84..7bcc4ce 100644
--- a/Makefile
+++ b/Makefile
@@ -13,28 +13,28 @@ endif
 EXECUTABLES=golded3 goldnode rddt
 
 all: sourcelists
-        @$(SHELL) -ec 'for i in $(foreach dir,$(LIBS),goldlib/$(dir)); do cd $$i; $(MAKE) all; cd ../..; done'
-        @$(SHELL) -ec 'for i in $(EXECUTABLES); do cd $$i; $(MAKE) all; cd ..; done'
-        @echo 'To build HTML man pages run "make docs".'
-        @echo 'To reduce binaries size (remove debug information) run "make strip".'
+	@$(SHELL) -ec 'for i in $(foreach dir,$(LIBS),goldlib/$(dir)); do cd $$i; $(MAKE) all; cd ../..; done'
+	@$(SHELL) -ec 'for i in $(EXECUTABLES); do cd $$i; $(MAKE) all; cd ..; done'
+	@echo 'To build HTML man pages run "make docs".'
+	@echo 'To reduce binaries size (remove debug information) run "make strip".'
 
 clean:
-        @$(SHELL) -ec 'for i in $(foreach dir,$(LIBS),goldlib/$(dir)); do cd $$i; $(MAKE) clean; cd ../..; done'
-        @$(SHELL) -ec 'for i in $(EXECUTABLES); do cd $$i; $(MAKE) clean; cd ..; done'
-        @-rm -f $(OBJPATH)/$(PLATFORM)/source.lst
+	@$(SHELL) -ec 'for i in $(foreach dir,$(LIBS),goldlib/$(dir)); do cd $$i; $(MAKE) clean; cd ../..; done'
+	@$(SHELL) -ec 'for i in $(EXECUTABLES); do cd $$i; $(MAKE) clean; cd ..; done'
+	@-rm -f $(OBJPATH)/$(PLATFORM)/source.lst
 
 dirs:
-        @mkdir -p $(BIN) $(LIBPATH)/$(PLATFORM)
-        @mkdir -p $(foreach dir,$(LIBS),$(OBJPATH)/$(PLATFORM)/$(dir))
-        @mkdir -p $(foreach dir,$(EXECUTABLES),$(OBJPATH)/$(PLATFORM)/$(dir))
+	@mkdir -p $(BIN) $(LIBPATH)/$(PLATFORM)
+	@mkdir -p $(foreach dir,$(LIBS),$(OBJPATH)/$(PLATFORM)/$(dir))
+	@mkdir -p $(foreach dir,$(EXECUTABLES),$(OBJPATH)/$(PLATFORM)/$(dir))
 
 sourcelists: dirs
-        @$(SHELL) -ec 'for i in $(foreach dir,$(LIBS),goldlib/$(dir)); do cd $$i; $(MAKE) sourcelist; cd ../..; done'
-        @$(SHELL) -ec 'for i in $(EXECUTABLES); do cd $$i; $(MAKE) sourcelist; cd ..; done'
-        @echo -n >$(OBJPATH)/$(PLATFORM)/source.lst
+	@$(SHELL) -ec 'for i in $(foreach dir,$(LIBS),goldlib/$(dir)); do cd $$i; $(MAKE) sourcelist; cd ../..; done'
+	@$(SHELL) -ec 'for i in $(EXECUTABLES); do cd $$i; $(MAKE) sourcelist; cd ..; done'
+	@echo -n >$(OBJPATH)/$(PLATFORM)/source.lst
 
 docs:
-        @cd $@ ; $(MAKE) all ; cd ..
+	@cd $@ ; $(MAKE) all ; cd ..
 
 strip:
-        cd $(BIN)/ ; strip *$(PLATFORM)$(EXEEXT)
+	cd $(BIN)/ ; strip *$(PLATFORM)$(EXEEXT)
diff --git a/golded3/Makefile b/golded3/Makefile
index e52823c..b11ea7c 100644
--- a/golded3/Makefile
+++ b/golded3/Makefile
@@ -15,7 +15,7 @@ SHORTTARGET=ged
 TARGET=golded3
 GLIBS=gmb3 gall gcfg uulib smblib msgidlib
 ifneq ($(findstring GCFG_NO_MYSPELL, $(CPPFLAGS)), GCFG_NO_MYSPELL)
-GLIBS+=myspell
+GLIBS+=hunspell
 endif
 INCS=-I. -I$(TOP)/goldlib/gall -I$(TOP)/goldlib/gcfg -I$(TOP)/goldlib/gmb3 -I$(TOP)/goldlib/uulib -I$(TOP)/goldlib/smblib -I$(TOP)/goldlib/msgidlib
 
diff --git a/goldlib/gall/Makefile b/goldlib/gall/Makefile
index 04e3998..6f09def 100644
--- a/goldlib/gall/Makefile
+++ b/goldlib/gall/Makefile
@@ -21,7 +21,7 @@ endif
 
 include $(TOP)/Config.def
 ifneq ($(findstring GCFG_NO_MYSPELL, $(CPPFLAGS)), GCFG_NO_MYSPELL)
-INCS+=-I$(TOP)/goldlib/myspell
+INCS+=-I$(TOP)/goldlib/hunspell
 endif
 
 include $(TOP)/GNUmakef.inc
diff --git a/goldlib/hunspell/Makefile b/goldlib/hunspell/Makefile
new file mode 100644
index 0000000..7b1fa74
--- /dev/null
+++ b/goldlib/hunspell/Makefile
@@ -0,0 +1,9 @@
+# -*- makefile -*-
+
+TOP=../..
+TARGET=hunspell
+INCS=-I$(TOP)/goldlib/hunspell -I$(TOP)/goldlib/gall
+CFLAGS=
+
+include $(TOP)/GNUmakef.inc
+include $(TOP)/GNUmakef.lib