gtk2hs-commit Mailing List for Gtk2Hs - A GUI Library for Haskell (Page 133)

Status: Beta

Brought to you by: as49, duncan_coutts, juhp

gtk2hs-commit — Mailing list for Darcs commit messages.

You can subscribe to this list here.

2003	Jan	Feb	Mar	Apr	May (4)	Jun	Jul (68)	Aug (4)	Sep	Oct (23)	Nov (95)	Dec (9)
2004	Jan (3)	Feb	Mar	Apr (51)	May (81)	Jun (2)	Jul (86)	Aug (143)	Sep (3)	Oct (31)	Nov (63)	Dec (90)
2005	Jan (277)	Feb (157)	Mar (99)	Apr (195)	May (151)	Jun (148)	Jul (98)	Aug (123)	Sep (20)	Oct (174)	Nov (155)	Dec (26)
2006	Jan (51)	Feb (19)	Mar (16)	Apr (12)	May (5)	Jun	Jul (11)	Aug (7)	Sep (10)	Oct (31)	Nov (174)	Dec (56)
2007	Jan (45)	Feb (52)	Mar (10)	Apr (5)	May (47)	Jun (16)	Jul (80)	Aug (29)	Sep (14)	Oct (59)	Nov (46)	Dec (16)
2008	Jan (10)	Feb (1)	Mar	Apr	May (49)	Jun (26)	Jul (8)	Aug (4)	Sep (25)	Oct (53)	Nov (9)	Dec (1)
2009	Jan (66)	Feb (11)	Mar (1)	Apr (14)	May (8)	Jun (1)	Jul (2)	Aug (2)	Sep (9)	Oct (23)	Nov (35)	Dec
2010	Jan (7)	Feb (2)	Mar (39)	Apr (19)	May (161)	Jun (19)	Jul (32)	Aug (65)	Sep (113)	Oct (120)	Nov (2)	Dec
2012	Jan	Feb (5)	Mar (4)	Apr (7)	May (9)	Jun (14)	Jul (1)	Aug	Sep (1)	Oct (1)	Nov (12)	Dec (2)
2013	Jan (1)	Feb (17)	Mar (4)	Apr (4)	May (9)	Jun	Jul (8)	Aug	Sep (2)	Oct	Nov	Dec

Flat | Threaded

<< < 1 .. 131 132 133 134 135 .. 170 > >> (Page 133 of 170)

[Gtk2hs-commit] gtk2hs ChangeLog,1.295,1.296

From: Duncan C. <dun...@us...> - 2005-01-16 14:16:16

Update of /cvsroot/gtk2hs/gtk2hs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14288

Modified Files:
	ChangeLog 
Log Message:
Update all the demos to	use the new module names and write new makefiles.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v
retrieving revision 1.295
retrieving revision 1.296
diff -u -d -r1.295 -r1.296
--- ChangeLog	15 Jan 2005 13:14:40 -0000	1.295
+++ ChangeLog	16 Jan 2005 14:15:30 -0000	1.296
@@ -1,3 +1,19 @@
+2005-01-16 Duncan Coutts <du...@co...>
+
+	* demo/buttonbox/ButtonBox.hs demo/buttonbox/Makefile
+	demo/concurrent/Progress.hs demo/concurrent/Makefile
+	demo/filechooser/FileChooserDemo.hs demo/filechooser/Makefile
+	demo/gconf/GConfDemo.hs demo/gconf/Makefile
+	demo/glade/GladeTest.hs	demo/glade/Makefile
+	demo/graphic/Drawing.hs demo/graphic/Makefile
+	demo/hello/Makefile
+	demo/mozembed/TestEmbedMoz.hs demo/mozembed/Makefile
+	demo/profileviewer/ProfileViewer.hs demo/profileviewer/Makefile
+	demo/sourceview/SourceViewTest.hs demo/sourceview/Makefile
+	demo/treeList/ListTest.hs demo/treeList/Makefile
+	demo/unicode/Arabic.hs demo/unicode/Makefile: update all the demos to
+	use the new module names and write new simple makefiles.
+
 2005-01-15 Duncan Coutts <du...@co...>
 
 	* mk/common.mk: change the way we find pacakge variables for files

[Gtk2hs-commit] gtk2hs/demo/concurrent Makefile,1.2,1.3 Progress.hs,1.3,1.4

From: Duncan C. <dun...@us...> - 2005-01-16 14:16:15

Update of /cvsroot/gtk2hs/gtk2hs/demo/concurrent
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14288/demo/concurrent

Modified Files:
	Makefile Progress.hs 
Log Message:
Update all the demos to	use the new module names and write new makefiles.


Index: Makefile
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/demo/concurrent/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile	2 May 2004 13:13:26 -0000	1.2
+++ Makefile	16 Jan 2005 14:15:32 -0000	1.3
@@ -1,11 +1,9 @@
-TOP = ../..
-
-include $(TOP)/mk/config.mk
 
-MAIN = Progress.hs
-
-APPNAME = progress 
+PROG  = progress
+SOURCES = Progress.hs
 
-NEEDPACKAGES = gtk2
+$(PROG) : $(SOURCES)
+	ghc --make $< -o $@ $(HCFLAGS)
 
-include $(TOP)/mk/common.mk
+clean:
+	rm -f $(SOURCES:.hs=.hi) $(SOURCES:.hs=.o) $(PROG)

Index: Progress.hs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/demo/concurrent/Progress.hs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Progress.hs	11 Apr 2003 15:13:55 -0000	1.3
+++ Progress.hs	16 Jan 2005 14:15:32 -0000	1.4
@@ -6,9 +6,9 @@
 -- Gtk's main loop. Thus, everytime Gtk is idleing, GHC gets a chance to
 -- execute Haskell threads.
 
-import Gtk
-import Structs
-import Concurrent
+import Graphics.UI.Gtk
+
+import Control.Concurrent
 
 main :: IO ()
 main = do

[Gtk2hs-commit] gtk2hs/demo/glade GladeTest.hs,1.1,1.2 Makefile,1.5,1.6

From: Duncan C. <dun...@us...> - 2005-01-16 14:16:15

Update of /cvsroot/gtk2hs/gtk2hs/demo/glade
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14288/demo/glade

Modified Files:
	GladeTest.hs Makefile 
Log Message:
Update all the demos to	use the new module names and write new makefiles.


Index: GladeTest.hs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/demo/glade/GladeTest.hs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- GladeTest.hs	11 Dec 2003 22:48:24 -0000	1.1
+++ GladeTest.hs	16 Jan 2005 14:15:33 -0000	1.2
@@ -1,7 +1,7 @@
 module Main where
 
-import Gtk
-import Glade
+import Graphics.UI.Gtk
+import Graphics.UI.Gtk.Glade
 
 main = do
          initGUI
@@ -10,7 +10,8 @@
 	 dialogXmlM <- xmlNew "simple.glade"
 	 let dialogXml = case dialogXmlM of
 	       (Just dialogXml) -> dialogXml
-	       Nothing -> error "can't find the glade file \"simple.glade\" in the current directory"
+	       Nothing -> error "can't find the glade file \"simple.glade\" \
+				\in the current directory"
 	 
 	 -- get a handle on a couple widgets from the glade file
 	 window <- xmlGetWidget dialogXml castToWindow "window1"

Index: Makefile
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/demo/glade/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile	28 Jul 2004 08:19:49 -0000	1.5
+++ Makefile	16 Jan 2005 14:15:33 -0000	1.6
@@ -1,13 +1,9 @@
-TOP = ../..
-
-include $(TOP)/mk/config.mk
-
-MAIN = GladeTest.hs
-
-APPNAME = gladeDemo
 
-NEEDPACKAGES = gtk2 glade
+PROG  = gladetest
+SOURCES = GladeTest.hs
 
-EXTRA_TARFILES += simple.glade
+$(PROG) : $(SOURCES)
+	ghc --make $< -o $@ $(HCFLAGS)
 
-include $(TOP)/mk/common.mk
+clean:
+	rm -f $(SOURCES:.hs=.hi) $(SOURCES:.hs=.o) $(PROG)

[Gtk2hs-commit] gtk2hs/demo/gconf GConfDemo.hs,1.1,1.2 Makefile,1.1,1.2

From: Duncan C. <dun...@us...> - 2005-01-16 14:16:15

Update of /cvsroot/gtk2hs/gtk2hs/demo/gconf
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14288/demo/gconf

Modified Files:
	GConfDemo.hs Makefile 
Log Message:
Update all the demos to	use the new module names and write new makefiles.


Index: Makefile
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/demo/gconf/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile	27 Jul 2004 12:41:06 -0000	1.1
+++ Makefile	16 Jan 2005 14:15:32 -0000	1.2
@@ -1,11 +1,9 @@
-TOP = ../..
-
-include $(TOP)/mk/config.mk
 
-MAIN = GConfDemo.hs
-
-APPNAME = gconfDemo
+PROG  = gconfdemo
+SOURCES = GConfDemo.hs
 
-NEEDPACKAGES = gconf
+$(PROG) : $(SOURCES)
+	ghc --make $< -o $@ -fglasgow-exts -fallow-overlapping-instances $(HCFLAGS)
 
-include $(TOP)/mk/common.mk
+clean:
+	rm -f $(SOURCES:.hs=.hi) $(SOURCES:.hs=.o) $(PROG)

Index: GConfDemo.hs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/demo/gconf/GConfDemo.hs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- GConfDemo.hs	27 Jul 2004 12:41:06 -0000	1.1
+++ GConfDemo.hs	16 Jan 2005 14:15:32 -0000	1.2
@@ -1,6 +1,6 @@
 module Main where
 
-import Gtk (initGUI, mainGUI)
+import Graphics.UI.Gtk (initGUI, mainGUI)
 import System.Gnome.GConf
 
 import Monad (when)

[Gtk2hs-commit] gtk2hs/demo/filechooser FileChooserDemo.hs,1.2,1.3 Makefile,1.2,1.3

From: Duncan C. <dun...@us...> - 2005-01-16 14:16:15

Update of /cvsroot/gtk2hs/gtk2hs/demo/filechooser
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14288/demo/filechooser

Modified Files:
	FileChooserDemo.hs Makefile 
Log Message:
Update all the demos to	use the new module names and write new makefiles.


Index: FileChooserDemo.hs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/demo/filechooser/FileChooserDemo.hs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- FileChooserDemo.hs	2 May 2004 13:20:01 -0000	1.2
+++ FileChooserDemo.hs	16 Jan 2005 14:15:32 -0000	1.3
@@ -1,7 +1,7 @@
 module Main where
 
-import Gtk
-import Glade
+import Graphics.UI.Gtk
+import Graphics.UI.Gtk.Glade
 
 main :: IO ()
 main = do

Index: Makefile
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/demo/filechooser/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile	29 Jul 2004 00:51:27 -0000	1.2
+++ Makefile	16 Jan 2005 14:15:32 -0000	1.3
@@ -1,13 +1,9 @@
-TOP = ../..
-
-include $(TOP)/mk/config.mk
-
-MAIN = FileChooserDemo.hs
-
-APPNAME = fileChooser
 
-NEEDPACKAGES = gtk2 glade
+PROG  = filechooser
+SOURCES = FileChooserDemo.hs
 
-EXTRA_TARFILES += FileChooserDemo.glade
+$(PROG) : $(SOURCES)
+	ghc --make $< -o $@ $(HCFLAGS)
 
-include $(TOP)/mk/common.mk
+clean:
+	rm -f $(SOURCES:.hs=.hi) $(SOURCES:.hs=.o) $(PROG)

[Gtk2hs-commit] gtk2hs/demo/graphic Drawing.hs,1.5,1.6 Makefile,1.2,1.3

From: Duncan C. <dun...@us...> - 2005-01-16 14:16:14

Update of /cvsroot/gtk2hs/gtk2hs/demo/graphic
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14288/demo/graphic

Modified Files:
	Drawing.hs Makefile 
Log Message:
Update all the demos to	use the new module names and write new makefiles.


Index: Drawing.hs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/demo/graphic/Drawing.hs,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Drawing.hs	11 Apr 2003 15:14:05 -0000	1.5
+++ Drawing.hs	16 Jan 2005 14:15:33 -0000	1.6
@@ -1,6 +1,5 @@
 -- Example of an drawing graphics onto a canvas.
-import Prelude 
-import Gtk
+import Graphics.UI.Gtk
 
 main = do
   initGUI

Index: Makefile
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/demo/graphic/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile	2 May 2004 13:13:26 -0000	1.2
+++ Makefile	16 Jan 2005 14:15:34 -0000	1.3
@@ -1,11 +1,9 @@
-TOP = ../..
-
-include $(TOP)/mk/config.mk
 
-MAIN = Drawing.hs
-
-APPNAME = drawing 
+PROG  = drawing
+SOURCES = Drawing.hs
 
-NEEDPACKAGES = gtk2
+$(PROG) : $(SOURCES)
+	ghc --make $< -o $@ $(HCFLAGS)
 
-include $(TOP)/mk/common.mk
+clean:
+	rm -f $(SOURCES:.hs=.hi) $(SOURCES:.hs=.o) $(PROG)

[Gtk2hs-commit] gtk2hs/demo/buttonbox ButtonBox.hs,1.1,1.2 Makefile,1.2,1.3

From: Duncan C. <dun...@us...> - 2005-01-16 14:16:13

Update of /cvsroot/gtk2hs/gtk2hs/demo/buttonbox
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14288/demo/buttonbox

Modified Files:
	ButtonBox.hs Makefile 
Log Message:
Update all the demos to	use the new module names and write new makefiles.


Index: ButtonBox.hs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/demo/buttonbox/ButtonBox.hs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ButtonBox.hs	30 Apr 2004 13:45:32 -0000	1.1
+++ ButtonBox.hs	16 Jan 2005 14:15:31 -0000	1.2
@@ -1,6 +1,6 @@
 module Main (Main.main) where
 
-import Gtk
+import Graphics.UI.Gtk
 
 main :: IO ()
 main = do

Index: Makefile
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/demo/buttonbox/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile	2 May 2004 13:13:25 -0000	1.2
+++ Makefile	16 Jan 2005 14:15:31 -0000	1.3
@@ -1,11 +1,9 @@
-TOP = ../..
-
-include $(TOP)/mk/config.mk
 
-MAIN = ButtonBox.hs
-
-APPNAME = buttonBox
+PROG  = buttonbox
+SOURCES = ButtonBox.hs
 
-NEEDPACKAGES = gtk2
+$(PROG) : $(SOURCES)
+	ghc --make $< -o $@ $(HCFLAGS)
 
-include $(TOP)/mk/common.mk
+clean:
+	rm -f $(SOURCES:.hs=.hi) $(SOURCES:.hs=.o) $(PROG)

[Gtk2hs-commit] gtk2hs/demo/treeList ListTest.hs,1.6,1.7 Makefile,1.2,1.3

From: Duncan C. <dun...@us...> - 2005-01-16 14:15:48

Update of /cvsroot/gtk2hs/gtk2hs/demo/treeList
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14288/demo/treeList

Modified Files:
	ListTest.hs Makefile 
Log Message:
Update all the demos to	use the new module names and write new makefiles.


Index: ListTest.hs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/demo/treeList/ListTest.hs,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ListTest.hs	11 Apr 2003 15:14:06 -0000	1.6
+++ ListTest.hs	16 Jan 2005 14:15:36 -0000	1.7
@@ -1,8 +1,8 @@
 -- Test file for the ListView widget.
 module Main(main) where
 
-import Mogul
-import Events
+import Graphics.UI.Gtk.Mogul
+import Graphics.UI.Gtk.Gdk.Events
 
 main = do
   initGUI

Index: Makefile
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/demo/treeList/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile	2 May 2004 13:13:26 -0000	1.2
+++ Makefile	16 Jan 2005 14:15:36 -0000	1.3
@@ -1,11 +1,9 @@
-TOP = ../..
-
-include $(TOP)/mk/config.mk
 
-MAIN = ListTest.hs
-
-APPNAME = listTest 
+PROG  = listtest
+SOURCES = ListTest.hs
 
-NEEDPACKAGES = mogul
+$(PROG) : $(SOURCES)
+	ghc --make $< -o $@ $(HCFLAGS)
 
-include $(TOP)/mk/common.mk
+clean:
+	rm -f $(SOURCES:.hs=.hi) $(SOURCES:.hs=.o) $(PROG)

[Gtk2hs-commit] gtk2hs/demo/sourceview Makefile,1.2,1.3 SourceViewTest.hs,1.3,1.4

From: Duncan C. <dun...@us...> - 2005-01-16 14:15:48

Update of /cvsroot/gtk2hs/gtk2hs/demo/sourceview
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14288/demo/sourceview

Modified Files:
	Makefile SourceViewTest.hs 
Log Message:
Update all the demos to	use the new module names and write new makefiles.


Index: SourceViewTest.hs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/demo/sourceview/SourceViewTest.hs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- SourceViewTest.hs	2 May 2004 13:13:26 -0000	1.3
+++ SourceViewTest.hs	16 Jan 2005 14:15:36 -0000	1.4
@@ -1,11 +1,8 @@
 -- Test file for the SourceView widget.
 module Main where
 
-import Gtk
-import SourceView
-import SourceBuffer
-import SourceLanguage
-import SourceLanguagesManager
+import Graphics.UI.Gtk
+import Graphics.UI.Gtk.SourceView
 
 main = do
   initGUI

Index: Makefile
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/demo/sourceview/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile	2 May 2004 13:13:26 -0000	1.2
+++ Makefile	16 Jan 2005 14:15:35 -0000	1.3
@@ -1,13 +1,9 @@
-TOP = ../..
-
-include $(TOP)/mk/config.mk
-
-MAIN = SourceViewTest.hs
-
-APPNAME = sourceview
 
-NEEDPACKAGES = sourceview
+PROG  = sourceview
+SOURCES = SourceViewTest.hs
 
-EXTRA_TARFILES += haskell.lang
+$(PROG) : $(SOURCES)
+	ghc --make $< -o $@ $(HCFLAGS)
 
-include $(TOP)/mk/common.mk
+clean:
+	rm -f $(SOURCES:.hs=.hi) $(SOURCES:.hs=.o) $(PROG)

[Gtk2hs-commit] gtk2hs/demo/unicode Arabic.hs,1.10,1.11 Makefile,1.2,1.3

From: Duncan C. <dun...@us...> - 2005-01-16 14:15:48

Update of /cvsroot/gtk2hs/gtk2hs/demo/unicode
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14288/demo/unicode

Modified Files:
	Arabic.hs Makefile 
Log Message:
Update all the demos to	use the new module names and write new makefiles.


Index: Arabic.hs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/demo/unicode/Arabic.hs,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- Arabic.hs	12 Dec 2004 12:45:19 -0000	1.10
+++ Arabic.hs	16 Jan 2005 14:15:36 -0000	1.11
@@ -1,7 +1,8 @@
 -- Example of an international dialog box.
-import Gtk
-import Char
-import Exception
+import Graphics.UI.Gtk
+
+import Data.Char
+import Control.Exception
 
 main :: IO ()
 main = do
@@ -20,7 +21,7 @@
     _ -> return ()
 
 arabic :: Markup
-arabic = markSpan [FontSize $ FSPoint 48]  $
+arabic = markSpan [FontSize SizeGiant]  $
  --"Is Haskell a "++markSpan [FontForeground "red"] "fantastic"++" language?"++
  -- Do you find Haskell a fantastic language? (language has a grammatical
  -- mistake in it)

Index: Makefile
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/demo/unicode/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile	2 May 2004 13:13:26 -0000	1.2
+++ Makefile	16 Jan 2005 14:15:36 -0000	1.3
@@ -1,11 +1,9 @@
-TOP = ../..
-
-include $(TOP)/mk/config.mk
 
-MAIN = Arabic.hs
-
-APPNAME = arabic 
+PROG  = arabic
+SOURCES = Arabic.hs
 
-NEEDPACKAGES = gtk2
+$(PROG) : $(SOURCES)
+	ghc --make $< -o $@ $(HCFLAGS)
 
-include $(TOP)/mk/common.mk
+clean:
+	rm -f $(SOURCES:.hs=.hi) $(SOURCES:.hs=.o) $(PROG)

[Gtk2hs-commit] gtk2hs/demo/profileviewer Makefile,1.2,1.3 ProfileViewer.hs,1.2,1.3

From: Duncan C. <dun...@us...> - 2005-01-16 14:15:47

Update of /cvsroot/gtk2hs/gtk2hs/demo/profileviewer
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14288/demo/profileviewer

Modified Files:
	Makefile ProfileViewer.hs 
Log Message:
Update all the demos to	use the new module names and write new makefiles.


Index: ProfileViewer.hs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/demo/profileviewer/ProfileViewer.hs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ProfileViewer.hs	3 Aug 2004 04:26:08 -0000	1.2
+++ ProfileViewer.hs	16 Jan 2005 14:15:35 -0000	1.3
@@ -15,15 +15,16 @@
 
 module Main where
 
-import Gtk
-import Mogul
-import Glade
+import Graphics.UI.Gtk
+import Graphics.UI.Gtk.Mogul
+import Graphics.UI.Gtk.Glade
 
 import ParseProfile
 
 import Maybe (isJust, fromJust)
 import Monad (when)
 import List  (unfoldr, intersperse)
+import System (getArgs)
 import Data.IORef
 
 main :: IO ()
@@ -135,6 +136,13 @@
     [(0, "allEntries"), (1, "0.1%Entries"), (5, "0.5%Entries"), (10, "1%Entries"),
      (50, "5%Entries"), (100, "10%Entries"), (500, "50%Entries")]
 
+  -- Check the command line to see if a profile file was given
+  commands <- getArgs
+  when (not (null commands))
+       (do profile <- parseProfileFile (head commands)
+           writeIORef profileVar (Just profile)
+          repopulateTreeStore)
+
   -- The final step is to display the main window and run the main loop
   widgetShowAll mainWindow
   mainGUI

Index: Makefile
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/demo/profileviewer/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile	3 Aug 2004 04:26:08 -0000	1.2
+++ Makefile	16 Jan 2005 14:15:35 -0000	1.3
@@ -1,11 +1,9 @@
-TOP = ../..
-
-include $(TOP)/mk/config.mk
 
-MAIN = ProfileViewer.hs
-
-APPNAME = profileviewer
+PROG  = profileviewer
+SOURCES = ProfileViewer.hs ParseProfile.hs
 
-NEEDPACKAGES = gtk2 mogul glade
+$(PROG) : $(SOURCES)
+	ghc --make $< -o $@ $(HCFLAGS)
 
-include $(TOP)/mk/common.mk
+clean:
+	rm -f $(SOURCES:.hs=.hi) $(SOURCES:.hs=.o) $(PROG)

[Gtk2hs-commit] gtk2hs/demo/mozembed Makefile,1.1,1.2 TestEmbedMoz.hs,1.1,1.2

From: Duncan C. <dun...@us...> - 2005-01-16 14:15:47

Update of /cvsroot/gtk2hs/gtk2hs/demo/mozembed
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14288/demo/mozembed

Modified Files:
	Makefile TestEmbedMoz.hs 
Log Message:
Update all the demos to	use the new module names and write new makefiles.


Index: TestEmbedMoz.hs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/demo/mozembed/TestEmbedMoz.hs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- TestEmbedMoz.hs	17 Dec 2004 22:02:54 -0000	1.1
+++ TestEmbedMoz.hs	16 Jan 2005 14:15:35 -0000	1.2
@@ -1,9 +1,9 @@
 -- A Test Program for the Gtk2 Mozilla Widget
 --
 
-import Gtk
+import Graphics.UI.Gtk
 import Graphics.UI.Gtk.MozEmbed
-import System
+import System (getArgs, getEnv, getProgName)
 
 
 main :: IO ()

Index: Makefile
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/demo/mozembed/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile	17 Dec 2004 22:02:54 -0000	1.1
+++ Makefile	16 Jan 2005 14:15:35 -0000	1.2
@@ -1,6 +1,9 @@
 
-TestEmbedMoz : TestEmbedMoz.hs
-	ghc -package mozembed TestEmbedMoz.hs -o TestEmbedMoz
+PROG  = testembedmoz
+SOURCES = TestEmbedMoz.hs
+
+$(PROG) : $(SOURCES)
+	ghc --make $< -o $@ $(HCFLAGS)
 
 clean:
-	rm TestEmbedMoz TestEmbedMoz.hi TestEmbedMoz.o
+	rm -f $(SOURCES:.hs=.hi) $(SOURCES:.hs=.o) $(PROG)

[Gtk2hs-commit] gtk2hs/demo/hello Makefile,1.3,1.4

From: Duncan C. <dun...@us...> - 2005-01-16 14:15:47

Update of /cvsroot/gtk2hs/gtk2hs/demo/hello
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14288/demo/hello

Modified Files:
	Makefile 
Log Message:
Update all the demos to	use the new module names and write new makefiles.


Index: Makefile
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/demo/hello/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile	12 Jan 2005 02:24:05 -0000	1.3
+++ Makefile	16 Jan 2005 14:15:34 -0000	1.4
@@ -1,6 +1,9 @@
 
-helloworld : World.hs
-	ghc --make $< -o $@
+PROG  = helloworld
+SOURCES = World.hs
+
+$(PROG) : $(SOURCES)
+	ghc --make $< -o $@ $(HCFLAGS)
 
 clean:
-	rm -f World.hi World.o helloworld
+	rm -f $(SOURCES:.hs=.hi) $(SOURCES:.hs=.o) $(PROG)

[Gtk2hs-commit] gtk2hs ChangeLog,1.294,1.295 AUTHORS,1.8,1.9

From: Duncan C. <dun...@us...> - 2005-01-15 13:14:54

Update of /cvsroot/gtk2hs/gtk2hs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13447

Modified Files:
	ChangeLog AUTHORS 
Log Message:
Credit Wolfram Kahl and co for mozembed. Add note about the documentation
coming from Gtk sources. Update my entry.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v
retrieving revision 1.294
retrieving revision 1.295
diff -u -d -r1.294 -r1.295
--- ChangeLog	15 Jan 2005 13:12:03 -0000	1.294
+++ ChangeLog	15 Jan 2005 13:14:40 -0000	1.295
@@ -13,6 +13,9 @@
 	* mk/chsDepend.in: the assertion can now be enabled since it no	longer
 	fails.
 
+	* AUTHORS: credit Wolfram Kahl and co for mozembed. Add note about
+	the documentation coming from Gtk sources. Update my entry.
+
 2005-01-14 Duncan Coutts <du...@co...>
 
 	* mk/chsDepend.in: do the extra check properly and make it a warning

Index: AUTHORS
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/AUTHORS,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- AUTHORS	14 Jan 2005 13:11:14 -0000	1.8
+++ AUTHORS	15 Jan 2005 13:14:40 -0000	1.9
@@ -6,13 +6,20 @@
 (c2hs and some sources and techniques)
 
 Duncan Coutts <du...@co...>
-(GtkSourceView, libglade)
+(sourceview, glade, gconf, general hackery)
 
 Jens Petersen <pet...@ha...>
 (RPMs and tons of other stuff)
 
+Wolfram Kahl <ka...@ca...>
+with help from Scott West and Jonas Svensson
+(binding for GtkMozEmbed the mozilla rendering engine in a widget)
+
 JP Bernardy <jy...@ya...>
 Jonas Svensson <d99...@dt...>
 Vincenzo Ciancia <ci...@cl...>
 Matthew Walton <ma...@al...>
 
+Much of the documentation is derived from the GTK+ documentation which is
+Copyright (c) 1995..2005 the GTK+ Team
+See the GTK+ AUTHORS & COPYING files for details.

[Gtk2hs-commit] gtk2hs/mk common.mk,1.50,1.51 chsDepend.in,1.11,1.12

From: Duncan C. <dun...@us...> - 2005-01-15 13:12:36

Update of /cvsroot/gtk2hs/gtk2hs/mk
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12810/mk

Modified Files:
	common.mk chsDepend.in 
Log Message:
mk/common.mk: Change the way we find pacakge variables for files being built.
It's now based only on the file name rather than through an inherited variable.
Hopefully this will be less fragile.

Makefile.am: supply the new PKGNAME variables, remove the NAME variables
required under the previous scheme. Add dependencies to make sure all
appropriate .chs files exist before .dep files are generated.
Put some built sources into nodist_<module>_SOURCES so they are not included
in the tarball and fixup other rules affected by this.

mk/chsDepend.in: the assertion can now be enabled since it no longer fails!


Index: chsDepend.in
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/mk/chsDepend.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- chsDepend.in	14 Jan 2005 19:04:50 -0000	1.11
+++ chsDepend.in	15 Jan 2005 13:12:05 -0000	1.12
@@ -42,7 +42,7 @@
       done;
       if test $FOUND = no; then
         echo could not find $DEP.chs on search path $SEARCHPATH;
-#        exit 1;
+        exit 1;
       fi;
       IFS=$OLDIFS;
     done;

Index: common.mk
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/mk/common.mk,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- common.mk	14 Jan 2005 19:04:50 -0000	1.50
+++ common.mk	15 Jan 2005 13:12:04 -0000	1.51
@@ -6,23 +6,39 @@
 EMPTY :=
 SPACE := $(EMPTY) $(EMPTY)
 
-pkgVPATH = $(subst $(SPACE),:,$($(1)_SOURCESDIRS))
+# Cunning make hackery, this function translates from a file name to the
+# package variable name prefix, eg
+#   "gtk/Graphics/UI/Gtk.hs" to "libHSgtk_a"
+# using a make var
+#   gtk_PKGNAME = libHSgtk_a
+# the second argument is the package variable you're after, eg
+#   $(call getPkgVar,HCFLAGS)
+#
+PKG = \
+  $(if $(call $(firstword $(subst /, ,$@))_PKGNAME,$@),$(strip \
+       $(call $(firstword $(subst /, ,$@))_PKGNAME,$@)), \
+     $(error PKG: cannot find PKGNAME for "$@", $(1) flag requested))
 
-LINK = 	$(strip $(HC) -o $@ $(HCFLAGS) $($(NAME)_HCFLAGS) \
-	$(addprefix -package ,$($(NAME)_PACKAGEDEPS)) \
-	$(AM_LDFLAGS) $($(NAME)_LDFLAGS))
+# necessary so support packages under the tools directory
+tools_PKGNAME = $(call tools_$(word 2,$(subst /, ,$(1)))_PKGNAME,$(1))
+
+pkgVPATH = $(subst $(SPACE),:,$($(PKG)_SOURCESDIRS))
+
+LINK = 	$(strip $(HC) -o $@ $(HCFLAGS) $($(PKG)_HCFLAGS) \
+	$(addprefix -package ,$($(PKG)_PACKAGEDEPS)) \
+	$(AM_LDFLAGS) $($(PKG)_LDFLAGS))
 
 #Using pattern rule here to prevent automake from understanding the rule
 #and falsely concluding that two source files will produce the same object
 #file even though the object files will be in different directories.
 #Obviously the 'subdir-objects' option only works for C/C++ files.
 %.o : %.hs $(CONFIG_H)
-	@echo Building for $(NAME)
-	$(strip $(HC) -c $< -o $@ $(HCFLAGS) $($(NAME)_HCFLAGS) \
-	$(call getVar,$<,HCFLAGS) -i$(call pkgVPATH,$(NAME)) \
-	$(addprefix -package-name ,$(notdir $(basename $($(NAME)_PACKAGE)))) \
-	$(addprefix '-#include<,$(addsuffix >', $($(NAME)_HEADER))) \
-	$(AM_CPPFLAGS) $($(NAME)_CPPFLAGS))
+	@echo Building for $(PKG)
+	$(strip $(HC) -c $< -o $@ $(HCFLAGS) $($(PKG)_HCFLAGS) \
+	$(call getVar,$<,HCFLAGS) -i$(pkgVPATH) \
+	$(addprefix -package-name ,$(notdir $(basename $($(PKG)_PACKAGE)))) \
+	$(addprefix '-#include<,$(addsuffix >', $($(PKG)_HEADER))) \
+	$(AM_CPPFLAGS) $($(PKG)_CPPFLAGS))
 
 .DELETE_ON_ERROR : %.deps
 
@@ -36,13 +52,13 @@
 depend: $($(NAME)_BUILDSOURCES)
 	$(if $(word 2,$($(NAME)_HSFILES)),\
 	$(HC) -M $(addprefix -optdep,-f $(NAME).deps) \
-	$($(NAME)_HCFLAGS) -i$(call pkgVPATH,$(NAME)) \
+	$($(NAME)_HCFLAGS) -i$(subst $(SPACE),:,$($(NAME)_SOURCESDIRS)) \
 	$(addprefix -package ,$($(NAME)_PACKAGEDEPS)) \
 	$(AM_CPPFLAGS) $(EXTRA_CPPFLAGS) $(CPPFLAGS) \
 	$($(NAME)_HSFILES))
 
 .chs.dep :
-	@$(CHSDEPEND) -i$(call pkgVPATH,$(NAME)) $<
+	@$(CHSDEPEND) -i$(pkgVPATH) $<
 
 .hs.chi :
 	@:
@@ -70,39 +86,39 @@
 %.precomp :
 	$(strip $(C2HS) $(C2HS_FLAGS)		\
 	+RTS $(HSTOOLFLAGS) $(PROFFLAGS) -RTS		\
-	$(addprefix -C,$($(NAME)_CFLAGS) $($(NAME)_CPPFLAGS))		\
+	$(addprefix -C,$($(PKG)_CFLAGS) $($(PKG)_CPPFLAGS))		\
 	--cppopts='-include "$(CONFIG_H)"' \
-	--precomp=$($(NAME)_PRECOMP) $($(NAME)_HEADER))
+	--precomp=$($(PKG)_PRECOMP) $($(PKG)_HEADER))
 
 .chs.pp.chs: $(CONFIG_H)
-	@echo Preprocessing for $(NAME)
+	@echo Preprocessing for $(PKG)
 	$(strip $(HSCPP) $(AM_CPPFLAGS) \
-	$(if $(NAME),$($(NAME)_CPPFLAGS) $($(NAME)_CFLAGS),$(CPPFLAGS)) \
+	$($(PKG)_CPPFLAGS) $($(PKG)_CFLAGS) \
 	$(addprefix -include ,$(CONFIG_H)) \
 	$< -o $@)
 
 .hsc.hs: $(CONFIG_H)
 	$(strip $(HSC2HS) $(HSCFLAGS) +RTS $(HSTOOLFLAGS) -RTS \
         $(addprefix -L-optl,\
-	$(AM_LDFLAGS) $($(NAME)_EXTRA_LIBS) $($(NAME)_LIBS)) \
+	$(AM_LDFLAGS) $($(PKG)_LIBS)) \
         $(addprefix -C,	$(filter-out -I%,$(AM_CPPFLAGS)) \
-	$($(NAME)_CFLAGS))\
+	$($(PKG)_CFLAGS))\
         $(filter -I%,$(AM_CPPFLAGS)) \
-	$($(NAME)_CPPFLAGS)\
-	--include $(CONFIG_H) --include $($(NAME)_HEADER) \
+	$($(PKG)_CPPFLAGS)\
+	--include $(CONFIG_H) --include $($(PKG)_HEADER) \
         --cc=$(HC) --lflag=-no-hs-main $<)
 
 .chs.hs: 
-	@echo Building .hs file for $(NAME)
+	@echo Building .hs file for $(PKG)
 	$(if $(subst no,,$(BUILT_IN_C2HS)),$(strip \
 	if test -x $(C2HS); then :; else \
-	  $(MAKE) $(AM_MAKEFLAGS) NAME="tools_c2hs_c2hsLocal" \
+	  $(MAKE) $(AM_MAKEFLAGS) \
 	  tools/c2hs/c2hsLocal; fi;))
-	$(strip if test -f $($(NAME)_PRECOMP); then :; else \
-	  $(MAKE) $(AM_MAKEFLAGS) NAME="$(NAME)" $($(NAME)_PRECOMP); fi;)
+	$(strip if test -f $($(PKG)_PRECOMP); then :; else \
+	  $(MAKE) $(AM_MAKEFLAGS) $($(PKG)_PRECOMP); fi;)
 	$(strip $(C2HS) $(C2HS_FLAGS) \
 	+RTS $(HSTOOLFLAGS) -RTS \
-	-i$(call pkgVPATH,$(NAME)) --precomp=$($(NAME)_PRECOMP) -o $@ $<)
+	-i$(pkgVPATH) --precomp=$($(PKG)_PRECOMP) -o $@ $<)
 
 
 # installation of packages

[Gtk2hs-commit] gtk2hs ChangeLog,1.293,1.294 Makefile.am,1.36,1.37

From: Duncan C. <dun...@us...> - 2005-01-15 13:12:23

Update of /cvsroot/gtk2hs/gtk2hs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12810

Modified Files:
	ChangeLog Makefile.am 
Log Message:
mk/common.mk: Change the way we find pacakge variables for files being built.
It's now based only on the file name rather than through an inherited variable.
Hopefully this will be less fragile.

Makefile.am: supply the new PKGNAME variables, remove the NAME variables
required under the previous scheme. Add dependencies to make sure all
appropriate .chs files exist before .dep files are generated.
Put some built sources into nodist_<module>_SOURCES so they are not included
in the tarball and fixup other rules affected by this.

mk/chsDepend.in: the assertion can now be enabled since it no longer fails!


Index: Makefile.am
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/Makefile.am,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- Makefile.am	14 Jan 2005 19:04:49 -0000	1.36
+++ Makefile.am	15 Jan 2005 13:12:03 -0000	1.37
@@ -54,8 +54,7 @@
 # we can access program-specific variables like <name>_PACKAGEDEPS. The
 # following is a hack to prevent automake from assuming that we are overriding
 # the tools/hierarchyGen/TypeGenerator goal.
-TypeGenerator_NAME = tools/hierarchyGen/TypeGenerator
-$(TypeGenerator_NAME) : NAME = tools_hierarchyGen_TypeGenerator
+tools_hierarchyGen_PKGNAME = tools_hierarchyGen_TypeGenerator
 
 tools_hierarchyGen_TypeGenerator_MAIN = \
   $(tools_hierarchyGen_TypeGenerator_SOURCES)
@@ -74,8 +73,7 @@
 #
 ################################################################################
 
-HookGenerator_NAME = tools/callbackGen/HookGenerator
-$(HookGenerator_NAME) : NAME = tools_callbackGen_HookGenerator
+tools_callbackGen_PKGNAME = tools_callbackGen_HookGenerator
 
 tools_callbackGen_HookGenerator_MAIN = \
   $(tools_callbackGen_HookGenerator_SOURCES)
@@ -103,8 +101,7 @@
 #
 ################################################################################
 
-#Exclude_NAME = tools/apicoverage/Exclude
-#$(Exclude_NAME) : NAME = tools_apicoverage_Exclude
+#tools_apicoverage_PKGNAME = tools_apicoverage_Exclude
 #
 #tools_apicoverage_Exclude_MAIN = \
 #  $(tools_apicoverage_Exclude_SOURCES)
@@ -122,8 +119,7 @@
 #
 ################################################################################
 
-tools_c2hs_c2hsLocal_NAME = tools/c2hs/c2hsLocal
-$(tools_c2hs_c2hsLocal_NAME) : NAME = tools_c2hs_c2hsLocal
+tools_c2hs_PKGNAME = tools_c2hs_c2hsLocal
 
 tools_c2hs_c2hsLocal_MAIN = c2hs/toplevel/Main.hs
 tools_c2hs_c2hsLocal_PACKAGEDEPS	= 
@@ -209,8 +205,7 @@
 #
 ################################################################################
 
-libHSglib_a_NAME = libHSglib.a
-$(libHSglib_a_NAME) : NAME = libHSglib_a
+glib_PKGNAME = libHSglib_a
 
 libHSglib_a_PACKAGE		= glib/glib.pkg
 libHSglib_a_PACKAGEDEPS		= 
@@ -271,6 +266,8 @@
 CLEANFILES += $(libHSglib_a_BUILDSOURCES)
 
 DISTCLEANFILES+= libHSglib_a.deps $(libHSglib_a_CHSFILES_HS:.hs=.dep)
+
+$(libHSglib_a_CHSFILES:.chs=.dep) : $(libHSglib_a_CHSFILES)
 ifeq (,$(findstring clean,$(MAKECMDGOALS)))
 -include libHSglib_a.deps $(libHSglib_a_CHSFILES:.chs=.dep)
  endif
@@ -280,8 +277,7 @@
 #
 ################################################################################
 
-libHSgtk_a_NAME = libHSgtk.a
-$(libHSgtk_a_NAME) : NAME = libHSgtk_a
+gtk_PKGNAME = libHSgtk_a
 
 libHSgtk_a_PACKAGE		= gtk/gtk.pkg
 libHSgtk_a_PACKAGEDEPS		= 
@@ -294,10 +290,12 @@
 
 libHSgtk_a_SOURCESDIRS = $(libHSglib_a_SOURCESDIRS) gtk
 
+nodist_libHSgtk_a_SOURCES =						\
+	gtk/Graphics/UI/Gtk/Types.chs					\
+	gtk/Graphics/UI/Gtk/Signals.chs
+
 libHSgtk_a_SOURCES =					 		\
 	gtk/Graphics/UI/Gtk.hs						\
-	gtk/Graphics/UI/Gtk/Types.chs				        \
-	gtk/Graphics/UI/Gtk/Signals.chs				        \
 	gtk/Graphics/UI/Gtk/Pango/Types.chs.pp				\
 	gtk/Graphics/UI/Gtk/TreeList/TreeModel.chs.pp			\
 	gtk/Graphics/UI/Gtk/TreeList/TreeViewColumn.chs			\
@@ -455,13 +453,15 @@
 	--modname=Graphics.UI.Gtk.Types \
         --parentname=System.Glib.GObject)
 
+libHSgtk_a_ALLSOURCES = $(libHSgtk_a_SOURCES) $(nodist_libHSgtk_a_SOURCES)
+
 am_libHSgtk_a_OBJECTS = \
-  $(addsuffix .$(OBJEXT),$(basename $(basename $(libHSgtk_a_SOURCES))))
+  $(addsuffix .$(OBJEXT),$(basename $(basename $(libHSgtk_a_ALLSOURCES))))
 
-libHSgtk_a_CHSPPFILES   = $(filter %.chs.pp,$(libHSgtk_a_SOURCES))
-libHSgtk_a_CHSFILES     = $(filter %.chs,$(libHSgtk_a_SOURCES:.chs.pp=.chs))
+libHSgtk_a_CHSPPFILES   = $(filter %.chs.pp,$(libHSgtk_a_ALLSOURCES))
+libHSgtk_a_CHSFILES     = $(filter %.chs,$(libHSgtk_a_ALLSOURCES:.chs.pp=.chs))
 libHSgtk_a_CHSFILES_HS  = $(libHSgtk_a_CHSFILES:.chs=.hs)
-libHSgtk_a_HSCFILES     = $(filter %.hsc, $(libHSgtk_a_SOURCES))
+libHSgtk_a_HSCFILES     = $(filter %.hsc, $(libHSgtk_a_ALLSOURCES))
 libHSgtk_a_HSCFILES_HS  = $(libHSgtk_a_HSCFILES:.hsc=.hs)
 
 libHSgtk_a_BUILDSOURCES = \
@@ -472,7 +472,7 @@
 	gtk/Graphics/UI/Gtk/Signals.chs
 libHSgtk_a_HSFILES  = \
 	$(filter %.hs,$(libHSgtk_a_BUILDSOURCES)) \
-	$(filter %.hs,$(libHSgtk_a_SOURCES))
+	$(filter %.hs,$(libHSgtk_a_ALLSOURCES))
 
 nobase_hi_SCRIPTS += $(libHSgtk_a_HSFILES:.hs=.hi)
 
@@ -511,6 +511,8 @@
 CLEANFILES+= $(libHSgtk_a_BUILDSOURCES)
 
 DISTCLEANFILES+= libHSgtk_a.deps $(libHSgtk_a_CHSFILES_HS:.hs=.dep)
+
+$(libHSgtk_a_CHSFILES:.chs=.dep) : $(libHSglib_a_CHSFILES) $(libHSgtk_a_CHSFILES)
 ifeq (,$(findstring clean, $(MAKECMDGOALS)))
 -include libHSgtk_a.deps $(libHSgtk_a_CHSFILES_HS:.hs=.dep)
  endif
@@ -520,8 +522,7 @@
 #
 ################################################################################
 
-libHSmogul_a_NAME = libHSmogul.a
-$(libHSmogul_a_NAME) : NAME = libHSmogul_a
+mogul_PKGNAME = libHSmogul_a
 
 libHSmogul_a_PACKAGE		= mogul/mogul.pkg
 libHSmogul_a_PACKAGEDEPS	= 
@@ -563,8 +564,7 @@
 
 if ENABLE_LIBGLADE
 
-libHSglade_a_NAME = libHSglade.a
-$(libHSglade_a_NAME) : NAME = libHSglade_a
+glade_PKGNAME = libHSglade_a
 
 libHSglade_a_PACKAGE		= glade/glade.pkg
 libHSglade_a_PACKAGEDEPS	= 
@@ -577,8 +577,10 @@
 
 libHSglade_a_SOURCESDIRS = $(libHSgtk_a_SOURCESDIRS) glade
 
+nodist_libHSglade_a_SOURCES =	\
+	glade/Graphics/UI/Gtk/Glade/Types.chs
+
 libHSglade_a_SOURCES =	        \
-	glade/Graphics/UI/Gtk/Glade/Types.chs	\
         glade/Graphics/UI/Gtk/Glade.chs
 
 glade_Graphics_UI_Gtk_Glade_Types_hs_HCFLAGS	= -fglasgow-exts
@@ -593,14 +595,16 @@
                       --modname=Graphics.UI.Gtk.Glade.Types \
 		      --parentname=Graphics.UI.Gtk.Types)
 
+libHSglade_a_ALLSOURCES = $(libHSglade_a_SOURCES) $(nodist_libHSglade_a_SOURCES)
+
 am_libHSglade_a_OBJECTS = \
-	$(addsuffix .$(OBJEXT),$(basename $(basename $(libHSglade_a_SOURCES))))
+	$(addsuffix .$(OBJEXT),$(basename $(basename $(libHSglade_a_ALLSOURCES))))
 
-libHSglade_a_CHSPPFILES = $(filter %.chs.pp,$(libHSglade_a_SOURCES))
+libHSglade_a_CHSPPFILES = $(filter %.chs.pp,$(libHSglade_a_ALLSOURCES))
 libHSglade_a_CHSFILES = \
-  $(filter %.chs,$(libHSglade_a_SOURCES:.chs.pp=.chs))
+  $(filter %.chs,$(libHSglade_a_ALLSOURCES:.chs.pp=.chs))
 libHSglade_a_CHSFILES_HS = $(libHSglade_a_CHSFILES:.chs=.hs)
-libHSglade_a_HSCFILES = $(filter %.hsc, $(libHSglade_a_SOURCES))
+libHSglade_a_HSCFILES = $(filter %.hsc, $(libHSglade_a_ALLSOURCES))
 libHSglade_a_HSCFILES_HS = $(libHSglade_a_HSCFILES:.hsc=.hs)
 libHSglade_a_BUILDSOURCES = \
 	$(libHSglade_a_CHSPPFILES:.chs.pp=.chs) \
@@ -609,7 +613,7 @@
         glade/Graphics/UI/Gtk/Glade/Types.chs
 libHSglade_a_HSFILES  = \
 	$(filter %.hs,$(libHSglade_a_BUILDSOURCES)) \
-	$(filter %.hs,$(libHSglade_a_SOURCES))
+	$(filter %.hs,$(libHSglade_a_ALLSOURCES))
 
 nobase_hi_SCRIPTS += $(libHSglade_a_HSFILES:.hs=.hi)
 
@@ -619,6 +623,8 @@
 CLEANFILES += $(libHSglade_a_BUILDSOURCES) 
 
 DISTCLEANFILES+= libHSglade_a.deps $(libHSglade_a_CHSFILES_HS:.hs=.dep)
+
+$(libHSglade_a_CHSFILES:.chs=.dep) : $(libHSglib_a_CHSFILES) $(libHSglade_a_CHSFILES)
 ifeq (,$(findstring clean, $(MAKECMDGOALS)))
 -include libHSglade_a.deps $(libHSglade_a_CHSFILES:.chs=.dep)
  endif
@@ -632,8 +638,7 @@
 
 if ENABLE_GNOME
 
-libHSgconf_a_NAME = libHSgconf.a
-$(libHSgconf_a_NAME) : NAME = libHSgconf_a
+gconf_PKGNAME = libHSgconf_a
 
 libHSgconf_a_PACKAGE		= gconf/gconf.pkg
 libHSgconf_a_PACKAGEDEPS	= 
@@ -646,11 +651,13 @@
 
 libHSgconf_a_SOURCESDIRS = $(libHSgtk_a_SOURCESDIRS) gconf
 
-libHSgconf_a_SOURCES =	        			\
-	gconf/System/Gnome/GConf/Types.chs		\
-        gconf/System/Gnome/GConf/GConfValue.chs		\
-        gconf/System/Gnome/GConf/GConfClient.chs	\
-        gconf/System/Gnome/GConf.hs
+nodist_libHSgconf_a_SOURCES =				\
+	gconf/System/Gnome/GConf/Types.chs
+
+libHSgconf_a_SOURCES =					\
+	gconf/System/Gnome/GConf/GConfValue.chs		\
+	gconf/System/Gnome/GConf/GConfClient.chs	\
+	gconf/System/Gnome/GConf.hs
 
 gconf/System/Gnome/GConf/Types.chs :			\
 	$(srcdir)/tools/hierarchyGen/hierarchy.list \
@@ -662,14 +669,16 @@
 	$@ --tag=gconf --lib=gconf --prefix=gconf \
 	--modname=System.Gnome.GConf.Types --parentname=System.Glib.GObject)
 
+libHSgconf_a_ALLSOURCES = $(libHSgconf_a_SOURCES) $(nodist_libHSgconf_a_SOURCES)
+
 am_libHSgconf_a_OBJECTS = \
-	$(addsuffix .$(OBJEXT),$(basename $(basename $(libHSgconf_a_SOURCES))))
+	$(addsuffix .$(OBJEXT),$(basename $(basename $(libHSgconf_a_ALLSOURCES))))
 
-libHSgconf_a_CHSPPFILES = $(filter %.chs.pp,$(libHSgconf_a_SOURCES))
+libHSgconf_a_CHSPPFILES = $(filter %.chs.pp,$(libHSgconf_a_ALLSOURCES))
 libHSgconf_a_CHSFILES = \
-  $(filter %.chs,$(libHSgconf_a_SOURCES:.chs.pp=.chs))
+  $(filter %.chs,$(libHSgconf_a_ALLSOURCES:.chs.pp=.chs))
 libHSgconf_a_CHSFILES_HS = $(libHSgconf_a_CHSFILES:.chs=.hs)
-libHSgconf_a_HSCFILES = $(filter %.hsc, $(libHSgconf_a_SOURCES))
+libHSgconf_a_HSCFILES = $(filter %.hsc, $(libHSgconf_a_ALLSOURCES))
 libHSgconf_a_HSCFILES_HS = $(libHSgconf_a_HSCFILES:.hsc=.hs)
 libHSgconf_a_BUILDSOURCES = \
 	$(libHSgconf_a_CHSPPFILES:.chs.pp=.chs) \
@@ -678,7 +687,7 @@
         gconf/System/Gnome/GConf/Types.chs
 libHSgconf_a_HSFILES  = \
 	$(filter %.hs,$(libHSgconf_a_BUILDSOURCES)) \
-	$(filter %.hs,$(libHSgconf_a_SOURCES))
+	$(filter %.hs,$(libHSgconf_a_ALLSOURCES))
 
 nobase_hi_SCRIPTS += $(libHSgconf_a_HSFILES:.hs=.hi)
 
@@ -693,6 +702,7 @@
 
 DISTCLEANFILES+= libHSgconf_a.deps $(libHSgconf_a_CHSFILES_HS:.hs=.dep)
 
+$(libHSgconf_a_CHSFILES:.chs=.dep) : $(libHSglib_a_CHSFILES) $(libHSgtk_a_CHSFILES) $(libHSgconf_a_CHSFILES)
 ifeq (,$(findstring clean, $(MAKECMDGOALS)))
 -include libHSgconf_a.deps $(libHSgconf_a_CHSFILES:.chs=.dep)
  endif
@@ -706,8 +716,7 @@
 
 if ENABLE_GNOME
 
-libHSsourceview_a_NAME = libHSsourceview.a
-$(libHSsourceview_a_NAME) : NAME = libHSsourceview_a
+sourceview_PKGNAME = libHSsourceview_a
 
 libHSsourceview_a_PACKAGE	= sourceview/sourceview.pkg
 libHSsourceview_a_PACKAGEDEPS	= 
@@ -720,9 +729,11 @@
 
 libHSsourceview_a_SOURCESDIRS = $(libHSgtk_a_SOURCESDIRS) sourceview
 
-libHSsourceview_a_SOURCES =			\
+nodist_libHSsourceview_a_SOURCES =						\
+	sourceview/Graphics/UI/Gtk/SourceView/Types.chs
+
+libHSsourceview_a_SOURCES =							\
 	sourceview/Graphics/UI/Gtk/SourceView.hs				\
-	sourceview/Graphics/UI/Gtk/SourceView/Types.chs				\
 	sourceview/Graphics/UI/Gtk/SourceView/SourceBuffer.chs			\
 	sourceview/Graphics/UI/Gtk/SourceView/SourceIter.chs			\
 	sourceview/Graphics/UI/Gtk/SourceView/SourceLanguage.chs		\
@@ -747,14 +758,16 @@
 	$@ --tag=sourceview --parentname=Graphics.UI.Gtk.Types \
         --modname=Graphics.UI.Gtk.SourceView.Types)
 
+libHSsourceview_a_ALLSOURCES = $(libHSsourceview_a_SOURCES) $(nodist_libHSsourceview_a_SOURCES)
+
 am_libHSsourceview_a_OBJECTS = \
-	$(addsuffix .$(OBJEXT),$(basename $(basename $(libHSsourceview_a_SOURCES))))
+	$(addsuffix .$(OBJEXT),$(basename $(basename $(libHSsourceview_a_ALLSOURCES))))
 
-libHSsourceview_a_CHSPPFILES = $(filter %.chs.pp,$(libHSsourceview_a_SOURCES))
+libHSsourceview_a_CHSPPFILES = $(filter %.chs.pp,$(libHSsourceview_a_ALLSOURCES))
 libHSsourceview_a_CHSFILES = \
-  $(filter %.chs,$(libHSsourceview_a_SOURCES:.chs.pp=.chs))
+  $(filter %.chs,$(libHSsourceview_a_ALLSOURCES:.chs.pp=.chs))
 libHSsourceview_a_CHSFILES_HS = $(libHSsourceview_a_CHSFILES:.chs=.hs)
-libHSsourceview_a_HSCFILES = $(filter %.hsc, $(libHSsourceview_a_SOURCES))
+libHSsourceview_a_HSCFILES = $(filter %.hsc, $(libHSsourceview_a_ALLSOURCES))
 libHSsourceview_a_HSCFILES_HS = $(libHSsourceview_a_HSCFILES:.hsc=.hs)
 libHSsourceview_a_BUILDSOURCES = \
 	$(libHSsourceview_a_CHSPPFILES:.chs.pp=.chs) \
@@ -763,7 +776,7 @@
         sourceview/Graphics/UI/Gtk/SourceView/Types.chs
 libHSsourceview_a_HSFILES  = \
 	$(filter %.hs,$(libHSsourceview_a_BUILDSOURCES)) \
-	$(filter %.hs,$(libHSsourceview_a_SOURCES))
+	$(filter %.hs,$(libHSsourceview_a_ALLSOURCES))
 
 nobase_hi_SCRIPTS += $(libHSsourceview_a_HSFILES:.hs=.hi)
 
@@ -774,6 +787,7 @@
 
 DISTCLEANFILES+= libHSsourceview_a.deps $(libHSsourceview_a_CHSFILES_HS:.hs=.dep)
 
+$(libHSsourceview_a_CHSFILES:.chs=.dep) : $(libHSglib_a_CHSFILES) $(libHSgtk_a_CHSFILES) $(libHSsourceview_a_CHSFILES)
 ifeq (,$(findstring clean, $(MAKECMDGOALS)))
 -include libHSsourceview_a.deps $(libHSsourceview_a_CHSFILES:.chs=.dep)
  endif
@@ -787,8 +801,7 @@
 
 if ENABLE_MOZEMBED
 
-libHSmozembed_a_NAME = libHSmozembed.a
-$(libHSmozembed_a_NAME) : NAME = libHSmozembed_a
+mozembed_PKGNAME = libHSmozembed_a
 
 libHSmozembed_a_PACKAGE		= mozembed/mozembed.pkg
 libHSmozembed_a_PACKAGEDEPS	= 
@@ -801,8 +814,10 @@
 
 libHSmozembed_a_SOURCESDIRS = $(libHSgtk_a_SOURCESDIRS) mozembed
 
+nodist_libHSmozembed_a_SOURCES =			\
+	mozembed/Graphics/UI/Gtk/MozEmbed/Types.chs
+
 libHSmozembed_a_SOURCES =				\
-	mozembed/Graphics/UI/Gtk/MozEmbed/Types.chs	\
 	mozembed/Graphics/UI/Gtk/MozEmbed.chs
 
 mozembed_Graphics_UI_Gtk_MozEmbed_Types_hs_HCFLAGS = -fglasgow-exts
@@ -817,14 +832,15 @@
 	$@ --tag=mozembed --parentname=Graphics.UI.Gtk.Types \
 	--modname=Graphics.UI.Gtk.MozEmbed.Types)
 
+libHSmozembed_a_ALLSOURCES = $(libHSmozembed_a_SOURCES) $(nodist_libHSmozembed_a_SOURCES)
+
 am_libHSmozembed_a_OBJECTS = \
-	$(addsuffix .$(OBJEXT),$(basename $(basename $(libHSmozembed_a_SOURCES))))
+	$(addsuffix .$(OBJEXT),$(basename $(basename $(libHSmozembed_a_ALLSOURCES))))
 
-libHSmozembed_a_CHSPPFILES = $(filter %.chs.pp,$(libHSmozembed_a_SOURCES))
-libHSmozembed_a_CHSFILES = \
-  $(filter %.chs,$(libHSmozembed_a_SOURCES:.chs.pp=.chs))
+libHSmozembed_a_CHSPPFILES = $(filter %.chs.pp,$(libHSmozembed_a_ALLSOURCES))
+libHSmozembed_a_CHSFILES = $(filter %.chs,$(libHSmozembed_a_ALLSOURCES:.chs.pp=.chs))
 libHSmozembed_a_CHSFILES_HS = $(libHSmozembed_a_CHSFILES:.chs=.hs)
-libHSmozembed_a_HSCFILES = $(filter %.hsc, $(libHSmozembed_a_SOURCES))
+libHSmozembed_a_HSCFILES = $(filter %.hsc, $(libHSmozembed_a_ALLSOURCES))
 libHSmozembed_a_HSCFILES_HS = $(libHSmozembed_a_HSCFILES:.hsc=.hs)
 libHSmozembed_a_BUILDSOURCES = \
 	$(libHSmozembed_a_CHSPPFILES:.chs.pp=.chs) \
@@ -833,7 +849,7 @@
         mozembed/Graphics/UI/Gtk/MozEmbed/Types.chs
 libHSmozembed_a_HSFILES  = \
 	$(filter %.hs,$(libHSmozembed_a_BUILDSOURCES)) \
-	$(filter %.hs,$(libHSmozembed_a_SOURCES))
+	$(filter %.hs,$(libHSmozembed_a_ALLSOURCES))
 
 nobase_hi_SCRIPTS += $(libHSmozembed_a_HSFILES:.hs=.hi)
 
@@ -844,6 +860,7 @@
 
 DISTCLEANFILES+= libHSmozembed_a.deps $(libHSmozembed_a_CHSFILES_HS:.hs=.dep)
 
+$(libHSmozembed_a_CHSFILES:.chs=.dep) : $(libHSglib_a_CHSFILES) $(libHSgtk_a_CHSFILES) $(libHSmozembed_a_CHSFILES)
 ifeq (,$(findstring clean, $(MAKECMDGOALS)))
 -include libHSmozembed_a.deps $(libHSmozembed_a_CHSFILES:.chs=.dep)
  endif

Index: ChangeLog
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v
retrieving revision 1.293
retrieving revision 1.294
diff -u -d -r1.293 -r1.294
--- ChangeLog	14 Jan 2005 19:04:48 -0000	1.293
+++ ChangeLog	15 Jan 2005 13:12:03 -0000	1.294
@@ -1,3 +1,18 @@
+2005-01-15 Duncan Coutts <du...@co...>
+
+	* mk/common.mk: change the way we find pacakge variables for files
+	being built. It's now based only on the file name rather than through
+	an inherited variable. Hopefully this will be less fragile.
+
+	* Makefile.am: supply the new PKGNAME variables, remove the NAME
+	variables required under the previous scheme. Add dependencies to make
+	sure all appropriate .chs files exist before .dep files are generated.
+	Put some built sources into nodist_<module>_SOURCES so they are not
+	included in the tarball and fixup other rules affected by this.
+
+	* mk/chsDepend.in: the assertion can now be enabled since it no	longer
+	fails.
+
 2005-01-14 Duncan Coutts <du...@co...>
 
 	* mk/chsDepend.in: do the extra check properly and make it a warning

[Gtk2hs-commit] gtk2hs ChangeLog,1.292,1.293 Makefile.am,1.35,1.36

From: Duncan C. <dun...@us...> - 2005-01-14 19:05:32

Update of /cvsroot/gtk2hs/gtk2hs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14123

Modified Files:
	ChangeLog Makefile.am 
Log Message:
Move a couple Types.chs locations/names and make sure the empty directories
get included in the tarball.
Make sure Types and Signals files are removed on make clean.
Disable building and distributing the apicoverage tool.

In mk/common.mk, make package registering on install work again after the
earlier change to using pkglibdir.

in mk/chsDepend.in, do the extra check properly and make it a warning by
default. It still warns rather a lot.


Index: Makefile.am
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/Makefile.am,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- Makefile.am	14 Jan 2005 13:11:16 -0000	1.35
+++ Makefile.am	14 Jan 2005 19:04:49 -0000	1.36
@@ -3,12 +3,6 @@
 MOSTLYCLEANFILES = *.deps.bak
 CLEANFILES =
 DISTCLEANFILES = */*.precomp
-#CPPFLAGS += $(filter -I% -D%, \
-#	$(GLIB_CFLAGS) $(GTK_CFLAGS) \
-#	$(SOURCEVIEW_CFLAGS) $(LIBGLADE_CFLAGS) \
-#	$(GCONF_CFLAGS) $(MOZEMBED_CFLAGS))
-
-# Build c2hs before anything else.
 
 EXTRA_DIST = \
 	tools/callbackGen/Signal.chs-boot1	\
@@ -20,6 +14,13 @@
 	tools/hierarchyGen/Hierarchy.chs.template \
 	sourceview/sourceview.h
 
+# There are no other files in these dirs and tar excludes empty dirs
+dist-hook:
+	mkdir $(distdir)/glade/Graphics/UI/Gtk/Glade
+	touch $(distdir)/glade/Graphics/UI/Gtk/Glade/.keep
+	mkdir $(distdir)/mozembed/Graphics/UI/Gtk/MozEmbed
+	touch $(distdir)/mozembed/Graphics/UI/Gtk/MozEmbed/.keep
+
 CHSDEPEND = $(srcdir)/mk/chsDepend
 
 # all packages and applications
@@ -42,7 +43,6 @@
 noinst_PROGRAMS = \
 	tools/hierarchyGen/TypeGenerator \
 	tools/callbackGen/HookGenerator \
-	tools/apicoverage/Exclude \
 	tools/c2hs/c2hsLocal
 
 #
@@ -103,19 +103,19 @@
 #
 ################################################################################
 
-Exclude_NAME = tools/apicoverage/Exclude
-$(Exclude_NAME) : NAME = tools_apicoverage_Exclude
-
-tools_apicoverage_Exclude_MAIN = \
-  $(tools_apicoverage_Exclude_SOURCES)
-tools_apicoverage_Exclude_PACKAGEDEPS = 
-tools_apicoverage_Exclude_SOURCESDIRS = tools/apicoverage
-tools_apicoverage_Exclude_SOURCES = \
-  tools/apicoverage/Exclude.hs
-am_tools_apicoverage_Exclude_OBJECTS = $(addsuffix .$(OBJEXT),\
-  $(basename $(tools_apicoverage_Exclude_SOURCES)))
-MOSTLYCLEANFILES+= $(am_tools_apicoverage_Exclude_OBJECTS)
-MOSTLYCLEANFILES+= $(tools_apicoverage_Exclude_SOURCES:.hs=.hi)
+#Exclude_NAME = tools/apicoverage/Exclude
+#$(Exclude_NAME) : NAME = tools_apicoverage_Exclude
+#
+#tools_apicoverage_Exclude_MAIN = \
+#  $(tools_apicoverage_Exclude_SOURCES)
+#tools_apicoverage_Exclude_PACKAGEDEPS = 
+#tools_apicoverage_Exclude_SOURCESDIRS = tools/apicoverage
+#tools_apicoverage_Exclude_SOURCES = \
+#  tools/apicoverage/Exclude.hs
+#am_tools_apicoverage_Exclude_OBJECTS = $(addsuffix .$(OBJEXT),\
+#  $(basename $(tools_apicoverage_Exclude_SOURCES)))
+#MOSTLYCLEANFILES+= $(am_tools_apicoverage_Exclude_OBJECTS)
+#MOSTLYCLEANFILES+= $(tools_apicoverage_Exclude_SOURCES:.hs=.hi)
 
 #
 #	c2hs interface generator
@@ -233,8 +233,8 @@
 	glib/System/Glib/GValueTypes.chs	\
 	glib/System/Glib/GParameter.hsc		\
 	glib/System/Glib/StoreValue.hsc		\
-	glib/System/Glib/GObject.chs		\
-	glib/System/Glib/GError.chs		\
+	glib/System/Glib/GObject.chs.pp		\
+	glib/System/Glib/GError.chs.pp		\
 	glib/System/Glib/GList.chs
 
 glib_System_Glib_Types_hs_HCFLAGS	= -fglasgow-exts
@@ -467,7 +467,9 @@
 libHSgtk_a_BUILDSOURCES = \
 	$(libHSgtk_a_CHSPPFILES:.chs.pp=.chs) \
 	$(libHSgtk_a_CHSFILES_HS) \
-	$(libHSgtk_a_HSCFILES_HS)
+	$(libHSgtk_a_HSCFILES_HS) \
+	gtk/Graphics/UI/Gtk/Types.chs \
+	gtk/Graphics/UI/Gtk/Signals.chs
 libHSgtk_a_HSFILES  = \
 	$(filter %.hs,$(libHSgtk_a_BUILDSOURCES)) \
 	$(filter %.hs,$(libHSgtk_a_SOURCES))
@@ -603,7 +605,8 @@
 libHSglade_a_BUILDSOURCES = \
 	$(libHSglade_a_CHSPPFILES:.chs.pp=.chs) \
 	$(libHSglade_a_CHSFILES_HS) \
-        $(libHSglade_a_HSCFILES_HS)
+        $(libHSglade_a_HSCFILES_HS) \
+        glade/Graphics/UI/Gtk/Glade/Types.chs
 libHSglade_a_HSFILES  = \
 	$(filter %.hs,$(libHSglade_a_BUILDSOURCES)) \
 	$(filter %.hs,$(libHSglade_a_SOURCES))
@@ -644,12 +647,12 @@
 libHSgconf_a_SOURCESDIRS = $(libHSgtk_a_SOURCESDIRS) gconf
 
 libHSgconf_a_SOURCES =	        			\
-	gconf/System/Gnome/GConf/GConfType.chs		\
+	gconf/System/Gnome/GConf/Types.chs		\
         gconf/System/Gnome/GConf/GConfValue.chs		\
         gconf/System/Gnome/GConf/GConfClient.chs	\
         gconf/System/Gnome/GConf.hs
 
-gconf/System/Gnome/GConf/GConfType.chs :	\
+gconf/System/Gnome/GConf/Types.chs :			\
 	$(srcdir)/tools/hierarchyGen/hierarchy.list \
 	$(srcdir)/tools/hierarchyGen/TypeGenerator  \
 	$(srcdir)/tools/hierarchyGen/Hierarchy.chs.template
@@ -657,7 +660,7 @@
 	$(srcdir)/tools/hierarchyGen/hierarchy.list \
 	$(srcdir)/tools/hierarchyGen/Hierarchy.chs.template \
 	$@ --tag=gconf --lib=gconf --prefix=gconf \
-	--modname=System.Gnome.GConf.GConfType --parentname=System.Glib.GObject)
+	--modname=System.Gnome.GConf.Types --parentname=System.Glib.GObject)
 
 am_libHSgconf_a_OBJECTS = \
 	$(addsuffix .$(OBJEXT),$(basename $(basename $(libHSgconf_a_SOURCES))))
@@ -672,7 +675,7 @@
 	$(libHSgconf_a_CHSPPFILES:.chs.pp=.chs) \
 	$(libHSgconf_a_CHSFILES_HS) \
         $(libHSgconf_a_HSCFILES_HS) \
-        gconf/System/Gnome/GConf/GConfType.chs
+        gconf/System/Gnome/GConf/Types.chs
 libHSgconf_a_HSFILES  = \
 	$(filter %.hs,$(libHSgconf_a_BUILDSOURCES)) \
 	$(filter %.hs,$(libHSgconf_a_SOURCES))
@@ -756,7 +759,8 @@
 libHSsourceview_a_BUILDSOURCES = \
 	$(libHSsourceview_a_CHSPPFILES:.chs.pp=.chs) \
 	$(libHSsourceview_a_CHSFILES_HS) \
-        $(libHSsourceview_a_HSCFILES_HS)
+        $(libHSsourceview_a_HSCFILES_HS) \
+        sourceview/Graphics/UI/Gtk/SourceView/Types.chs
 libHSsourceview_a_HSFILES  = \
 	$(filter %.hs,$(libHSsourceview_a_BUILDSOURCES)) \
 	$(filter %.hs,$(libHSsourceview_a_SOURCES))
@@ -798,12 +802,12 @@
 libHSmozembed_a_SOURCESDIRS = $(libHSgtk_a_SOURCESDIRS) mozembed
 
 libHSmozembed_a_SOURCES =				\
-	mozembed/Graphics/UI/Gtk/MozEmbedType.chs	\
+	mozembed/Graphics/UI/Gtk/MozEmbed/Types.chs	\
 	mozembed/Graphics/UI/Gtk/MozEmbed.chs
 
-mozembed_Graphics_UI_Gtk_MozEmbedType_hs_HCFLAGS = -fglasgow-exts
+mozembed_Graphics_UI_Gtk_MozEmbed_Types_hs_HCFLAGS = -fglasgow-exts
 
-mozembed/Graphics/UI/Gtk/MozEmbedType.chs :	\
+mozembed/Graphics/UI/Gtk/MozEmbed/Types.chs :	\
 	$(srcdir)/tools/hierarchyGen/hierarchy.list \
 	$(srcdir)/tools/hierarchyGen/TypeGenerator  \
 	$(srcdir)/tools/hierarchyGen/Hierarchy.chs.template
@@ -811,7 +815,7 @@
 	$(srcdir)/tools/hierarchyGen/hierarchy.list \
 	$(srcdir)/tools/hierarchyGen/Hierarchy.chs.template \
 	$@ --tag=mozembed --parentname=Graphics.UI.Gtk.Types \
-	--modname=Graphics.UI.Gtk.MozEmbedType)
+	--modname=Graphics.UI.Gtk.MozEmbed.Types)
 
 am_libHSmozembed_a_OBJECTS = \
 	$(addsuffix .$(OBJEXT),$(basename $(basename $(libHSmozembed_a_SOURCES))))
@@ -826,7 +830,7 @@
 	$(libHSmozembed_a_CHSPPFILES:.chs.pp=.chs) \
 	$(libHSmozembed_a_CHSFILES_HS) \
         $(libHSmozembed_a_HSCFILES_HS) \
-        mozembed/Graphics/UI/Gtk/MozEmbedType.chs
+        mozembed/Graphics/UI/Gtk/MozEmbed/Types.chs
 libHSmozembed_a_HSFILES  = \
 	$(filter %.hs,$(libHSmozembed_a_BUILDSOURCES)) \
 	$(filter %.hs,$(libHSmozembed_a_SOURCES))

Index: ChangeLog
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v
retrieving revision 1.292
retrieving revision 1.293
diff -u -d -r1.292 -r1.293
--- ChangeLog	14 Jan 2005 13:11:15 -0000	1.292
+++ ChangeLog	14 Jan 2005 19:04:48 -0000	1.293
@@ -1,3 +1,19 @@
+2005-01-14 Duncan Coutts <du...@co...>
+
+	* mk/chsDepend.in: do the extra check properly and make it a warning
+	by default. It still warns rather a lot.
+
+	* Makefile.am: move a couple Types.chs locations/names and make sure
+	the empty directories get included in the tarball. Disable building
+	and distributing the apicoverage tool. Make sure Types and Signals
+	files are removed on make clean.
+
+	* mk/common.mk: make package registering on install work again after
+	the earlier change to using pkglibdir.
+
+	* mozembed/Graphics/UI/Gtk/MozEmbed.chs,
+	gconf/System/Gnome/GConf/GConfClient.chs: change name of Types import.
+
 2005-01-14  Jens Petersen  <pet...@ha...>
 
 	* mogul/mogul.pkg.in (library_dirs): Use @GTK_LIBDIR_CQ@

[Gtk2hs-commit] gtk2hs/mk chsDepend.in,1.10,1.11 common.mk,1.49,1.50

From: Duncan C. <dun...@us...> - 2005-01-14 19:05:02

Update of /cvsroot/gtk2hs/gtk2hs/mk
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14123/mk

Modified Files:
	chsDepend.in common.mk 
Log Message:
Move a couple Types.chs locations/names and make sure the empty directories
get included in the tarball.
Make sure Types and Signals files are removed on make clean.
Disable building and distributing the apicoverage tool.

In mk/common.mk, make package registering on install work again after the
earlier change to using pkglibdir.

in mk/chsDepend.in, do the extra check properly and make it a warning by
default. It still warns rather a lot.


Index: chsDepend.in
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/mk/chsDepend.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- chsDepend.in	13 Jan 2005 23:09:20 -0000	1.10
+++ chsDepend.in	14 Jan 2005 19:04:50 -0000	1.11
@@ -29,17 +29,21 @@
     DEPNAMES=;
     for DEP in $DEPS; do
       IFS=:;
+      FOUND=no;
       for DEPDIR in $SEARCHPATH; do
         DEPNAME=`echo "$DEPDIR/$DEP" | $SED 's%\.//*%%'`;
         #echo Looking for $DEP in $DEPDIR , i.e.: $DEPNAME
         if test -f "$DEPNAME.chs"; then
           #echo Found $DEP in $DEPDIR
 	  DEPNAMES="$DEPNAMES $DEPNAME.chi";
+	  FOUND=yes;
 	  break;
         fi;
-#	echo could not find $DEP '('$DEPNAME.chs')' on search path $SEARCHPATH;
-#	exit 1;
       done;
+      if test $FOUND = no; then
+        echo could not find $DEP.chs on search path $SEARCHPATH;
+#        exit 1;
+      fi;
       IFS=$OLDIFS;
     done;
     echo "# .chs dependencies for $FULLNAME" > $FULLNAMEDEP;

Index: common.mk
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/mk/common.mk,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- common.mk	13 Jan 2005 23:01:17 -0000	1.49
+++ common.mk	14 Jan 2005 19:04:50 -0000	1.50
@@ -112,9 +112,9 @@
 install-data-hook :
 	$(if $(PKGCONF),if test -f $(PKGCONF); then :; \
 	else echo "[]" > $(PKGCONF); fi;)
-	$(foreach pkgname,$(lib_LIBRARIES), \
+	$(foreach pkgname,$(pkglib_LIBRARIES), \
 	$(GHCPKG) $(addprefix -f ,$(PKGCONF)) -u -g \
-	-Dprefix=$(prefix) -Dexec_prefix=$(exec_prefix) \
+	-Dprefix=$(prefix) -Dexec_prefix=$(exec_prefix) -Dpkglibdir=$(pkglibdir)\
 	-i $(call getVar,$(pkgname),PACKAGE);)
 
 uninstall-hook :

[Gtk2hs-commit] gtk2hs/gconf/System/Gnome/GConf GConfClient.chs,1.7,1.8

From: Duncan C. <dun...@us...> - 2005-01-14 19:05:02

Update of /cvsroot/gtk2hs/gtk2hs/gconf/System/Gnome/GConf
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14123/gconf/System/Gnome/GConf

Modified Files:
	GConfClient.chs 
Log Message:
Move a couple Types.chs locations/names and make sure the empty directories
get included in the tarball.
Make sure Types and Signals files are removed on make clean.
Disable building and distributing the apicoverage tool.

In mk/common.mk, make package registering on install work again after the
earlier change to using pkglibdir.

in mk/chsDepend.in, do the extra check properly and make it a warning by
default. It still warns rather a lot.


Index: GConfClient.chs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gconf/System/Gnome/GConf/GConfClient.chs,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- GConfClient.chs	8 Jan 2005 16:59:04 -0000	1.7
+++ GConfClient.chs	14 Jan 2005 19:04:51 -0000	1.8
@@ -95,7 +95,7 @@
 import System.Glib.GError   (GErrorDomain, GErrorClass(..), propagateGError)
 import System.Glib.GObject  (makeNewGObject)
 {#import Graphics.UI.Gtk.Signals#}
-{#import System.Gnome.GConf.GConfType#}
+{#import System.Gnome.GConf.Types#}
 {#import System.Gnome.GConf.GConfValue#}
 
 {# context lib="gconf" prefix ="gconf_client" #}

[Gtk2hs-commit] gtk2hs/mozembed/Graphics/UI/Gtk MozEmbed.chs,1.3,1.4

From: Duncan C. <dun...@us...> - 2005-01-14 19:05:01

Update of /cvsroot/gtk2hs/gtk2hs/mozembed/Graphics/UI/Gtk
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14123/mozembed/Graphics/UI/Gtk

Modified Files:
	MozEmbed.chs 
Log Message:
Move a couple Types.chs locations/names and make sure the empty directories
get included in the tarball.
Make sure Types and Signals files are removed on make clean.
Disable building and distributing the apicoverage tool.

In mk/common.mk, make package registering on install work again after the
earlier change to using pkglibdir.

in mk/chsDepend.in, do the extra check properly and make it a warning by
default. It still warns rather a lot.


Index: MozEmbed.chs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/mozembed/Graphics/UI/Gtk/MozEmbed.chs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- MozEmbed.chs	8 Jan 2005 16:08:58 -0000	1.3
+++ MozEmbed.chs	14 Jan 2005 19:04:50 -0000	1.4
@@ -62,7 +62,7 @@
 {#import Graphics.UI.Gtk.Signals#}		(ConnectId,
 						connect_STRING__BOOL,
 						connect_PTR__INT)
-{#import Graphics.UI.Gtk.MozEmbedType #}
+{#import Graphics.UI.Gtk.MozEmbed.Types#}
 import Graphics.UI.Gtk.Abstract.Widget		(Widget)
 
 {#context lib="gtkembedmoz" prefix ="gtk"#}

[Gtk2hs-commit] gtk2hs AUTHORS,1.7,1.8 ChangeLog,1.291,1.292 Makefile.am,1.34,1.35 acinclude.m4,1.4,1.5 configure.ac,1.17,1.18

From: Jens-Ulrik P. <ju...@us...> - 2005-01-14 13:11:56

Update of /cvsroot/gtk2hs/gtk2hs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30314

Modified Files:
	AUTHORS ChangeLog Makefile.am acinclude.m4 configure.ac 
Log Message:
	* mogul/mogul.pkg.in (library_dirs): Use @GTK_LIBDIR_CQ@

	* configure.ac (hidir): Uses braces for default value.

	* acinclude.m4 (GTKHS_REFORMAT_PACKAGE_LIBS): Use pkglibdir now
	instead of libdir, and delay its expansion.

	* Makefile.am (EXTRA_DIST): Add "sourceview/sourceview.h".



Index: acinclude.m4
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/acinclude.m4,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- acinclude.m4	12 Dec 2004 14:28:12 -0000	1.4
+++ acinclude.m4	14 Jan 2005 13:11:18 -0000	1.5
@@ -129,5 +129,5 @@
 dnl path to where the Haskell libraries are going to be installed in
 dnl case they go into a non-standard directory. If they go into a
 dnl standard directory then we duplicate a path here. Dough.
-[$3]="[$][$3][$]C_LDIR\"[$]libdir\"";
+[$3]="[$][$3][$]C_LDIR\"\${pkglibdir}\"";
 ])dnl

Index: configure.ac
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/configure.ac,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- configure.ac	14 Jan 2005 00:12:24 -0000	1.17
+++ configure.ac	14 Jan 2005 13:11:18 -0000	1.18
@@ -395,7 +395,7 @@
 AC_ARG_WITH(hidir,
 	[  --with-hidir=DIR        specify install dir for .hi files],
 	[hidir=$withval],
-	[hidir='$(pkglibdir)/imports'])
+	[hidir='${pkglibdir}/imports'])
 AC_SUBST(hidir)
 
 dnl Check if user wants bindings for deprecated APIs. Defaults to yes.

Index: Makefile.am
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/Makefile.am,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- Makefile.am	14 Jan 2005 00:12:24 -0000	1.34
+++ Makefile.am	14 Jan 2005 13:11:16 -0000	1.35
@@ -17,7 +17,8 @@
 	tools/checkDirs.sh			\
 	tools/c2hs/toplevel/c2hs_config.h	\
 	tools/hierarchyGen/hierarchy.list	\
-	tools/hierarchyGen/Hierarchy.chs.template
+	tools/hierarchyGen/Hierarchy.chs.template \
+	sourceview/sourceview.h
 
 CHSDEPEND = $(srcdir)/mk/chsDepend
 

Index: AUTHORS
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/AUTHORS,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- AUTHORS	30 Apr 2004 13:45:31 -0000	1.7
+++ AUTHORS	14 Jan 2005 13:11:14 -0000	1.8
@@ -5,12 +5,12 @@
 Manuel M. T. Chakravarty <ch...@cs...>
 (c2hs and some sources and techniques)
 
-Jens Petersen <pet...@ha...>
-(RPMs and tons of other stuff)
-
 Duncan Coutts <du...@co...>
 (GtkSourceView, libglade)
 
+Jens Petersen <pet...@ha...>
+(RPMs and tons of other stuff)
+
 JP Bernardy <jy...@ya...>
 Jonas Svensson <d99...@dt...>
 Vincenzo Ciancia <ci...@cl...>

Index: ChangeLog
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v
retrieving revision 1.291
retrieving revision 1.292
diff -u -d -r1.291 -r1.292
--- ChangeLog	14 Jan 2005 00:18:31 -0000	1.291
+++ ChangeLog	14 Jan 2005 13:11:15 -0000	1.292
@@ -1,3 +1,14 @@
+2005-01-14  Jens Petersen  <pet...@ha...>
+
+	* mogul/mogul.pkg.in (library_dirs): Use @GTK_LIBDIR_CQ@
+
+	* configure.ac (hidir): Uses braces for default value.
+
+	* acinclude.m4 (GTKHS_REFORMAT_PACKAGE_LIBS): Use pkglibdir now
+	instead of libdir, and delay its expansion.
+
+	* Makefile.am (EXTRA_DIST): Add "sourceview/sourceview.h".
+
 2005-01-13 Duncan Coutts <du...@co...>
 
 	* gtk/Graphics/UI/Gtk/Pango/Enums.chs.pp: fix whitespace problem that

[Gtk2hs-commit] gtk2hs/mogul mogul.pkg.in,1.3,1.4

From: Jens-Ulrik P. <ju...@us...> - 2005-01-14 13:11:40

Update of /cvsroot/gtk2hs/gtk2hs/mogul
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30314/mogul

Modified Files:
	mogul.pkg.in 
Log Message:
	* mogul/mogul.pkg.in (library_dirs): Use @GTK_LIBDIR_CQ@

	* configure.ac (hidir): Uses braces for default value.

	* acinclude.m4 (GTKHS_REFORMAT_PACKAGE_LIBS): Use pkglibdir now
	instead of libdir, and delay its expansion.

	* Makefile.am (EXTRA_DIST): Add "sourceview/sourceview.h".



Index: mogul.pkg.in
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/mogul/mogul.pkg.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- mogul.pkg.in	12 Jan 2005 00:00:47 -0000	1.3
+++ mogul.pkg.in	14 Jan 2005 13:11:19 -0000	1.4
@@ -3,7 +3,7 @@
      auto            = True,
      import_dirs     = ["@hidir@/mogul"],
      source_dirs     = [],
-     library_dirs    = [],
+     library_dirs    = [@GTK_LIBDIR_CQ@],
      hs_libraries    = ["HSmogul"],
      extra_libraries = [],
      include_dirs    = [],

[Gtk2hs-commit] gtk2hs/tools/c2hs/c CParser.hs,1.1,1.2

From: Duncan C. <dun...@us...> - 2005-01-14 00:18:42

Update of /cvsroot/gtk2hs/gtk2hs/tools/c2hs/c
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11342/tools/c2hs/c

Modified Files:
	CParser.hs 
Log Message:
Allow c2hs to cope with (and ignore) multiple __atribute__ annotations.
Required for glib-2.6.


Index: CParser.hs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/tools/c2hs/c/CParser.hs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CParser.hs	21 Nov 2004 21:05:27 -0000	1.1
+++ CParser.hs	14 Jan 2005 00:18:32 -0000	1.2
@@ -346,7 +346,7 @@
   list (
       ctoken_ (CTokGnuC GnuCExtTok) `opt` ()      -- ignore GCC's __extension__
   -*> parseCDeclSpec 
-  *-> optMaybe parseGnuCAttr			  -- ignore GCC's __attribute__
+  *-> list parseGnuCAttr			  -- ignore GCC's __attribute__
   )*> parseCDeclr 
   *> list parseCDecl 
   *> parseCCompStat
@@ -489,7 +489,7 @@
   list1 (
       ctoken_ (CTokGnuC GnuCExtTok) `opt` ()      -- ignore GCC's __extension__
   -*> parseCDeclSpec 
-  *-> optMaybe parseGnuCAttr			  -- ignore GCC's __attribute__
+  *-> list parseGnuCAttr			  -- ignore GCC's __attribute__
   )*> seplist comma_ parseCInitDecl *-> semic_
   `actionAttrs`
     (\(specs, declrs) -> 
@@ -681,7 +681,7 @@
       (pointer `opt` id)
   *>  base
   *>  many (flip (.)) id (arrayType <|> newStyleFun <|> oldStyleFun)
-  *-> optMaybe parseGnuCAttr			  -- ignore GCC's __attribute__
+  *-> list parseGnuCAttr			  -- ignore GCC's __attribute__
   `action`
     \((ptr, base), declrTrans) -> ptr . declrTrans $ base 
   where

[Gtk2hs-commit] gtk2hs ChangeLog,1.290,1.291

From: Duncan C. <dun...@us...> - 2005-01-14 00:18:41

Update of /cvsroot/gtk2hs/gtk2hs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11342

Modified Files:
	ChangeLog 
Log Message:
Allow c2hs to cope with (and ignore) multiple __atribute__ annotations.
Required for glib-2.6.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v
retrieving revision 1.290
retrieving revision 1.291
diff -u -d -r1.290 -r1.291
--- ChangeLog	14 Jan 2005 00:12:24 -0000	1.290
+++ ChangeLog	14 Jan 2005 00:18:31 -0000	1.291
@@ -19,6 +19,9 @@
 	Get all doc files to be installed. I'm not sure where the html docs
 	should be installed however, it's $(datadir)/doc/gtk2hs/html for now.
 
+	* tools/c2hs/c/CParser.hs: allow c2hs to cope with (and ignore)
+	multiple __atribute__ annotations. Required for glib-2.6.
+
 2005-01-12 Axel Simon <A....@ke...>
 
 	* Makefile.am, gtk/Graphics/UI/Gtk/Pango/Rendering.chs.pp,

[Gtk2hs-commit] gtk2hs ChangeLog,1.289,1.290 configure.ac,1.16,1.17 Makefile.am,1.33,1.34

From: Duncan C. <dun...@us...> - 2005-01-14 00:12:40

Update of /cvsroot/gtk2hs/gtk2hs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9560

Modified Files:
	ChangeLog configure.ac Makefile.am 
Log Message:
Get everything to be installed under $pkglibdir rather than $libdir (ie
$prefix/gtk2hs/*).
Fix building of .hs.uncpp files needed for haddock (add to SUFFIXs).

Get all doc files to be installed. I'm not sure where the html docs should be
installed however, it's $(datadir)/doc/gtk2hs/html for now.


Index: configure.ac
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/configure.ac,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- configure.ac	13 Jan 2005 23:01:16 -0000	1.16
+++ configure.ac	14 Jan 2005 00:12:24 -0000	1.17
@@ -395,7 +395,7 @@
 AC_ARG_WITH(hidir,
 	[  --with-hidir=DIR        specify install dir for .hi files],
 	[hidir=$withval],
-	[hidir=$libdir/hi])
+	[hidir='$(pkglibdir)/imports'])
 AC_SUBST(hidir)
 
 dnl Check if user wants bindings for deprecated APIs. Defaults to yes.

Index: Makefile.am
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/Makefile.am,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- Makefile.am	13 Jan 2005 23:01:16 -0000	1.33
+++ Makefile.am	14 Jan 2005 00:12:24 -0000	1.34
@@ -1,5 +1,5 @@
 AUTOMAKE_OPTIONS = foreign subdir-objects
-SUFFIXES = .chs.pp .chs .hsc .deps .dep
+SUFFIXES = .hs.uncpp .chs.pp .chs .hsc .deps .dep
 MOSTLYCLEANFILES = *.deps.bak
 CLEANFILES =
 DISTCLEANFILES = */*.precomp
@@ -22,20 +22,20 @@
 CHSDEPEND = $(srcdir)/mk/chsDepend
 
 # all packages and applications
-lib_LIBRARIES =	\
+pkglib_LIBRARIES =	\
         libHSglib.a	\
 	libHSgtk.a	\
         libHSmogul.a
 if ENABLE_LIBGLADE
-lib_LIBRARIES += libHSglade.a
+pkglib_LIBRARIES += libHSglade.a
 endif
 if ENABLE_GNOME
-lib_LIBRARIES += 	\
+pkglib_LIBRARIES += 	\
         libHSgconf.a	\
         libHSsourceview.a
 endif
 if ENABLE_MOZEMBED
-lib_LIBRARIES += libHSmozembed.a
+pkglib_LIBRARIES += libHSmozembed.a
 endif
 
 noinst_PROGRAMS = \
@@ -474,9 +474,13 @@
 nobase_hi_SCRIPTS += $(libHSgtk_a_HSFILES:.hs=.hi)
 
 if BUILDDOCS
-htmldir = $(prefix)/html
-html_DATA = $(foreach HSFILE, $(libHSgtk_a_HSFILES), \
-		$(patsubst gtk.%.hs, doc/%.html, $(subst /,.,$(HSFILE))))
+htmldir = $(datadir)/doc/gtk2hs/html
+html_DATA = \
+	$(foreach HSFILE, $(libHSgtk_a_HSFILES), \
+	$(patsubst gtk.%.hs, doc/%.html, $(subst /,.,$(HSFILE)))) \
+	doc/index.html doc/haddock.css doc/haskell_icon.gif doc/doc-index.html \
+	$(foreach LETTER, A B C D E F G H I J K L M N O P R S T U V W X Y, \
+		doc/doc-index-$(LETTER).html) #missing letters Q and Z
 EXCLUDE_DOCS = 
 PREPROC_DOCS = gtk/Graphics/UI/Gtk.hs
 

Index: ChangeLog
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v
retrieving revision 1.289
retrieving revision 1.290
diff -u -d -r1.289 -r1.290
--- ChangeLog	13 Jan 2005 23:09:20 -0000	1.289
+++ ChangeLog	14 Jan 2005 00:12:24 -0000	1.290
@@ -13,6 +13,12 @@
 	issues with the NAME make var being set incorrectly. I have a plan to
 	replace the cunning NAME hack with a different hack.
 
+	* configure.ac, Makefile.am: get everything to be installed under
+	$pkglibdir rather than $libdir (ie $prefix/gtk2hs/*).
+	Fix building of .hs.uncpp files needed for haddock (add to SUFFIXs).
+	Get all doc files to be installed. I'm not sure where the html docs
+	should be installed however, it's $(datadir)/doc/gtk2hs/html for now.
+
 2005-01-12 Axel Simon <A....@ke...>
 
 	* Makefile.am, gtk/Graphics/UI/Gtk/Pango/Rendering.chs.pp,

2 messages has been excluded from this view by a project administrator.

Flat | Threaded

<< < 1 .. 131 132 133 134 135 .. 170 > >> (Page 133 of 170)