[Gtk2hs-commit] gtk2hs Makefile,1.19,1.20

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

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

Modified Files:
	Makefile 
Log Message:
(MAKE_TOOLS): Only add c2hs when BUILT_IN_C2HS is no.
(MAKE_DOCS): gendoc and doc targets moved here from MAKE_TOOLS since
 doc must be done after gtk.
(MAKE_APPS): Add demo/sourceview.
(dist): Depend on gtk2hs.spec.
(rpm): dist now depends on gtk2hs.spec.
(srpm): Ditto.
Include Makefile.local if present for local build configuration.


Index: Makefile
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/Makefile,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- Makefile	3 Nov 2003 14:13:58 -0000	1.19
+++ Makefile	11 Nov 2003 12:01:21 -0000	1.20
@@ -2,18 +2,24 @@
 
 include $(TOP)/mk/config.mk
 
-MAKE_TOOLS = c2hs tools/typehier tools/signals
+MAKE_TOOLS = tools/typehier tools/signals
+
+ifeq ($(strip $(BUILT_IN_C2HS)),no)
+MAKE_VERB  += c2hs
+else
+MAKE_TOOLS += c2hs
+endif
 
 ifeq ($(strip $(BUILDDOCS)),no)
 MAKE_VERB  =  gendoc doc
 else
-MAKE_TOOLS  +=  gendoc doc
+MAKE_DOCS  =  gendoc doc
 endif
 
 MAKE_LIBS  = gtk sourceview mogul
 
 MAKE_APPS  = demo/concurrent demo/treeList demo/graphic demo/unicode \
-	     demo/hello
+	     demo/hello demo/sourceview
 
 EXTRA_TARFILES = $(strip AUTHORS COPYING.LIB ChangeLog INSTALL Makefile \
 			 TODO VERSION aclocal.m4 acinclude.m4 \
@@ -22,7 +28,7 @@
 		 	 mk/library.mk mk/chsDepend.in install-sh \
 			 config.sub config.guess gtk2hs.spec.in gtk2hs.spec )
 
-dist :
+dist : configure gtk2hs.spec
 	$(RM) -r $(TARNAME)
 	$(RM) $(TARNAME).tar $(TARNAME).tar.gz
 	$(LN) . $(TARNAME)
@@ -32,13 +38,17 @@
 	$(GZIP) $(TARNAME).tar
 	$(RM) $(TARNAME)
 
-rpm: gtk2hs.spec dist
-	rpmbuild -ba gtk2hs.spec
+rpm: dist
+	rpmbuild -ba gtk2hs.spec $(RPMOPTS)
 
-srpm: gtk2hs.spec dist
+srpm: dist
 	rpmbuild -bs gtk2hs.spec
 
-gtk2hs.spec: VERSION gtk2hs.spec.in
+%: %.in
 	./configure
 
+gtk2hs.spec: VERSION
+
 include $(TOP)/mk/recurse.mk
+
+-include $(TOP)/Makefile.local