[Gtk2hs-commit] gtk2hs Makefile,1.15,1.16 gtk2hs.spec.in,1.6,1.7

[<ju...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs
In directory sc8-pr-cvs1:/tmp/cvs-serv14715

Modified Files:
	Makefile gtk2hs.spec.in 
Log Message:
* Makefile (inplace): Do not build the demos by default.
	(noinplace): Ditto.
	(demo): New separate target to build demos.
	(install*): Drop no-op for demos.
	(uninstall): Ditto.
* gtk2hs.spec.in: Default to ghc-6.0.1.
	(%files): Include demo as dir in docs rather than individual
	source files.
fix changelog typo



Index: Makefile
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/Makefile,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- Makefile	15 Jul 2003 08:48:41 -0000	1.15
+++ Makefile	31 Jul 2003 10:30:38 -0000	1.16
@@ -20,11 +20,6 @@
 endif
 	$(MAKE) -Cgtk $@ 
 	$(MAKE)	-Cmogul $@ 
-	$(MAKE) -Cdemo/hello $@ 
-	$(MAKE) -Cdemo/unicode $@ 
-	$(MAKE) -Cdemo/graphic $@ 
-	$(MAKE) -Cdemo/treeList $@ 
-	$(MAKE) -Cdemo/concurrent $@ 
 ifeq ($(BUILDDOCS),yes)
 	$(MAKE) -Cdoc all
 endif
@@ -32,6 +27,8 @@
 noinplace :
 	$(MAKE) -Cmogul $@ 
 	$(MAKE) -Cgtk $@
+
+demo : noinplace
 	$(MAKE) -Cdemo/concurrent $@ 
 	$(MAKE) -Cdemo/treeList $@ 
 	$(MAKE) -Cdemo/graphic $@ 
@@ -41,20 +38,10 @@
 install install-without-pkg : all
 	$(MAKE) -Cgtk  $@
 	$(MAKE) -Cmogul  $@
-	$(MAKE) -Cdemo/hello install
-	$(MAKE) -Cdemo/unicode install
-	$(MAKE) -Cdemo/graphic install
-	$(MAKE) -Cdemo/treeList install
-	$(MAKE) -Cdemo/concurrent install
 
 uninstall :
 	$(MAKE) -Cmogul  $@
 	$(MAKE) -Cgtk  $@
-	$(MAKE) -Cdemo/concurrent $@ 
-	$(MAKE) -Cdemo/treeList $@ 
-	$(MAKE) -Cdemo/graphic $@ 
-	$(MAKE) -Cdemo/unicode $@ 
-	$(MAKE) -Cdemo/hello $@ 
 
 clean	: noinplace
 ifeq ($(BUILT_IN_C2HS),yes)

Index: gtk2hs.spec.in
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk2hs.spec.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- gtk2hs.spec.in	15 Jul 2003 10:45:46 -0000	1.6
+++ gtk2hs.spec.in	31 Jul 2003 10:30:38 -0000	1.7
@@ -3,8 +3,7 @@
 # Copyright [2001..2002] Manuel M T Chakravarty <ch...@cs...>
 # Copyright 2002, 2003 Jens-Ulrik Holger Petersen <pet...@ha...>
 
-%define ghc_version 6.0
-#%%define ghc_version 5.04.3
+%define ghc_version 6.0.1
 
 Summary: Haskell binding for the GIMP Toolkit (GTK2), a GUI library
 Name: gtk2hs
@@ -96,11 +95,15 @@
 
 %files doc
 %defattr(-,root,root) 
-%doc demo/*/*.hs
+%doc demo
 %doc doc/GTK
 %doc doc/MOGUL
 
 %changelog
+* Thu Jul 31 2003 Jens Petersen <pet...@ha...>
+- build with ghc-6.0.1
+- put demo dir in docs dir rather than individual source files
+
 * Thu Jul 10 2003 Jens Petersen <pet...@ha...>
 - build with ghc-6.0
 - name ghc subpackage "ghc%%{ghc_version}"