From d0e7285f26348fbcd81fca12a6d1e1d914eb6044 Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Sat, 17 Apr 2004 11:44:49 +0000
Subject: Link libcharset into Halibut. (This involved faffing with
 CVSROOT/modules, so anyone with a checked-out copy of Halibut will
 unfortunately need to do `cvs co' again.)

[originally from svn r4088]
[added anachronistic .gitmodules so that past revisions can be checked out]
[this svn revision also touched charset,timber]
---
 .gitmodules |  3 +++
 Makefile    | 12 +++++++++++-
 charset     |  2 +-
 3 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 .gitmodules

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..7938e18
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "charset"]
+	path = charset
+	url = git://git.tartarus.org/simon/charset.git
diff --git a/Makefile b/Makefile
index 22fa715..97debc8 100644
--- a/Makefile
+++ b/Makefile
@@ -96,14 +96,24 @@ else
 VDEF = `(cd $(SRC); md5sum -c manifest && cat version)`
 endif
 
+halibut:
+
 SRC := ../
 
+LIBCHARSET_SRCDIR = $(SRC)charset/
+LIBCHARSET_OBJDIR = ./#
+LIBCHARSET_OBJPFX = cs-#
+LIBCHARSET_GENPFX = charset-#
+MD = -MD
+CFLAGS += -I$(LIBCHARSET_SRCDIR) -I$(LIBCHARSET_OBJDIR)
+include $(LIBCHARSET_SRCDIR)Makefile
+
 MODULES := main malloc ustring error help licence version misc tree234
 MODULES += input keywords contents index style biblio
 MODULES += bk_text bk_xhtml bk_whlp bk_man bk_info bk_paper bk_ps bk_pdf
 MODULES += winhelp psdata
 
-OBJECTS := $(addsuffix .o,$(MODULES))
+OBJECTS := $(addsuffix .o,$(MODULES)) $(LIBCHARSET_OBJS)
 DEPS := $(addsuffix .d,$(MODULES))
 
 halibut: $(OBJECTS)
diff --git a/charset b/charset
index 599cac1..6259a8b 160000
--- a/charset
+++ b/charset
@@ -1 +1 @@
-Subproject commit 599cac1725cd60d2f3a74e15b8e400dabbbbd206
+Subproject commit 6259a8be9f765f82f936901996a4dcf41a20bb23
-- 
cgit v1.1