diff options
| author | Simon Tatham <anakin@pobox.com> | 2004-04-17 11:44:49 +0000 |
|---|---|---|
| committer | Simon Tatham <anakin@pobox.com> | 2004-04-17 11:44:49 +0000 |
| commit | d0e7285f26348fbcd81fca12a6d1e1d914eb6044 (patch) | |
| tree | 698932d8590ff0ca820474c36ab73c229443a3ba | |
| parent | 0c07f492cbd3ca5362013be65bd3567f4db060c7 (diff) | |
| download | halibut-d0e7285f26348fbcd81fca12a6d1e1d914eb6044.zip halibut-d0e7285f26348fbcd81fca12a6d1e1d914eb6044.tar.gz halibut-d0e7285f26348fbcd81fca12a6d1e1d914eb6044.tar.bz2 halibut-d0e7285f26348fbcd81fca12a6d1e1d914eb6044.tar.xz | |
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]
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | Makefile | 12 | ||||
| m--------- | charset | 0 |
3 files changed, 14 insertions, 1 deletions
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 @@ -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 -Subproject 599cac1725cd60d2f3a74e15b8e400dabbbbd20 +Subproject 6259a8be9f765f82f936901996a4dcf41a20bb2 |