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

[Duncan C. <dun...@us...>]

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)