[Gtk2hs-commit] gtk2hs/glade Makefile,1.4,1.5

[Jens-Ulrik P. <ju...@us...>]

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

Modified Files:
	Makefile 
Log Message:
Use TOP.  Generate GladeType.chs with the same
invocation used by sourceview and gtk.


Index: Makefile
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/glade/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Makefile	30 Apr 2004 12:50:15 -0000	1.4
+++ Makefile	27 Jul 2004 08:21:15 -0000	1.5
@@ -10,11 +10,11 @@
 
 MAIN = Glade.hs
 
-# In order for ghc and c2hs to find .chi and .hi files in ../gtk/* we
+# In order for ghc and c2hs to find .chi and .hi files in $(TOP)/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
+HIDIRS = $(TOP)/gtk/glib $(TOP)/gtk/abstract $(TOP)/gtk/general
 
 HEADER = glade/glade.h
 #EXTRA_HFILES	= 
@@ -41,11 +41,10 @@
 EXTRA_CLEANFILES+= GladeType.chs
 NEEDCHI = GladeType
 
-GladeType.chs : ../tools/hierarchyGen/hierarchy.list
-	$(CPP) $(GTK_CFLAGS) - < $(TOP)/tools/hierarchyGen/hierarchy.list | \
-	$(strip ../tools/hierarchyGen/TypeGenerator - \
-	GladeType.chs \
-	$(addprefix --tag=,$(TYPE_TAGS))) --lib=glade --prefix=glade
+GladeType.chs : $(TOP)/tools/hierarchyGen/hierarchy.list
+	$(strip $(TOP)/tools/hierarchyGen/TypeGenerator \
+	$(TOP)/tools/hierarchyGen/hierarchy.list \
+	GladeType.chs $(addprefix --tag=,$(TYPE_TAGS))) --lib=glade --prefix=glade
 
 
 include $(TOP)/mk/common.mk