Update of /cvsroot/gtk2hs/gtk2hs/sourceview
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13198/sourceview
Modified Files:
.cvsignore Makefile
Log Message:
Update make files and all to support building documentation
with haddock. Other minor build fixes. Remove gendoc and doc.
* sourceview/Makefile (C2HS_EXTRA_FLAGS): Replaces HIDIRS for c2hs.
* mogul/Makefile: Add EXCLUDE_DOCS and PREPROC_DOCS for haddock.
* mk/recurse.mk: Remove $(MAKE_DOCS) dependency from all targets.
Add html and install-html targets.
* mk/library.mk (PKGDOCDIR): New variable to hold package doc dir.
(html): New target that builds packages docs with haddock. Just
warns if HADDOCK is not defined.
(install-html): New target to install packages docs.
* mk/config.mk.in: Add HADDOCK and GHC_DOCDIR replacing BUILDDOCS,
xml and xslt related variables.
* mk/common.mk (INST_DOCDIR): Setup new variable.
(C2HSFLAGGED): Add C2HS_EXTRA_FLAGS for finding .chi files.
* gtk/multiline/TextView.chs: Fix doc typos at top.
* gtk/Makefile: Add EXCLUDE_DOCS and PREPROC_DOCS for haddock.
* glade/Makefile (C2HS_EXTRA_FLAGS): Replaces HIDIRS for c2hs only.
* gconf/System/Gnome/GConf/GConfClient.chs: Doc tweaks to make
haddock happy at top and for gconfAddDir.
* gconf/Makefile (C2HS_EXTRA_FLAGS): Replaces HIDIRS for c2hs only.
* gtk2hs.spec.in: Use ghc-6.2.1 and define short ghc version %ghcver.
Use License instead of Copyright. Update buildrequires.
Add separate subpackages for sourceview, gconf and glade
Name subpackages with %ghcver. Subpackages now require the
appropriate -devel package. Define %ghclibdir and %gtk2hsdir.
(%build): Update configure invocation - drop xml options and
use --prefix and --libdir. Make html. Use mkdir. Clean demo
dirs with find.
(%post,%preun): Update and add scripts for new subpackages.
(%files): Html docs are now in /usr/share/doc/gtk2hs.
* configure.in: Comment out GtkGLExt, HOpenGL checks. Check for
haddock instead of xslt. Add --with-ghc-docdir option.
Remove xml catalog and xsl checks. Replace missing xml final warning
with haddock missing warning.
* Makefile: No longer build gendoc or doc. Build mogul after gtk2.
Index: .cvsignore
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/sourceview/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- .cvsignore 3 Aug 2004 16:56:52 -0000 1.1
+++ .cvsignore 19 Aug 2004 07:54:21 -0000 1.2
@@ -9,3 +9,4 @@
SourceTagTable.hs
SourceView.hs
SourceViewType.*
+doc
Index: Makefile
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/sourceview/Makefile,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- Makefile 6 Aug 2004 01:28:19 -0000 1.11
+++ Makefile 19 Aug 2004 07:54:21 -0000 1.12
@@ -6,11 +6,8 @@
MAIN = SourceView.hs
-# In order for ghc and c2hs to find .chi and .hi files in ../gtk/* we
-# need to set these directories here. Note that this list is different
-# from SUBDIRS in that the directories given here are not searched for
-# compilable files.
-HIDIRS = ../gtk/glib ../gtk/abstract ../gtk/general ../gtk/multiline
+# help c2hs find Hierarchy and TextIter
+C2HS_EXTRA_FLAGS = -i../gtk/general:../gtk/multiline
HEADER = sourceview.h
EXTRA_HFILES = sourceview.h
|
