[Gtk2hs-commit] gtk2hs/mk common.mk,1.30,1.31 library.mk,1.25,1.26 recurse.mk,1.5,1.6

[Axel S. <as...@us...>]

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

Modified Files:
	common.mk library.mk recurse.mk 
Log Message:
Cleaning is now cleaner.


Index: recurse.mk
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/mk/recurse.mk,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- recurse.mk	15 Nov 2003 11:39:07 -0000	1.5
+++ recurse.mk	16 Aug 2004 07:35:55 -0000	1.6
@@ -19,10 +19,11 @@
 
 clean : MAKE_GOALS=$(MAKE_TOOLS) $(MAKE_LIBS) $(MAKE_DOCS) $(MAKE_APPS) $(MAKE_VERB)
 clean : make-clean
+	$(RM) $(EXTRA_CLEANFILES)
 
 distclean : MAKE_GOALS=$(MAKE_TOOLS) $(MAKE_LIBS) $(MAKE_DOCS) $(MAKE_APPS) $(MAKE_VERB)
 distclean : make-distclean
-	$(RM) $(LOCALPKGCONF) $(LOCALPKGCONF).old
+	$(RM) $(LOCALPKGCONF) $(LOCALPKGCONF).old $(EXTRA_DISTCLEANFILES)
 
 install : MAKE_GOALS=$(MAKE_LIBS) $(MAKE_APPS)
 install : make-install

Index: common.mk
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/mk/common.mk,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- common.mk	8 Aug 2004 19:04:37 -0000	1.30
+++ common.mk	16 Aug 2004 07:35:55 -0000	1.31
@@ -336,7 +336,8 @@
 
 distclean : clean
 	$(strip $(RM) $(EXTRA_HSFILES) $(EXTRA_CHSFILES) \
-	  $(ALLCHSFILES:.chs=.dep)) $(LOCALPKGCONF) $(LOCALPKGCONF).old
+	  $(ALLCHSFILES:.chs=.dep) $(LOCALPKGCONF) $(LOCALPKGCONF).old \
+	  $(EXTRA_DISTCLEANFILES))
 
 maintainer-clean : distclean
 

Index: library.mk
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/mk/library.mk,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- library.mk	8 Aug 2004 19:04:37 -0000	1.25
+++ library.mk	16 Aug 2004 07:35:55 -0000	1.26
@@ -7,6 +7,9 @@
 TARGETOK		= $(addprefix $(strip $(LIBPREFIX)),\
 			$(addsuffix $(LIBSUFFIX),$(strip $(LIBNAME))))
 
+EXTRA_CLEANFILES	+= $(addsuffix $(OBJSUFFIX),$(strip $(LIBNAME)))
+
+EXTRA_DISTCLEANFILES	+= $(PACKAGENAME).conf
 
 makeTextList		= $(addprefix \",$(addsuffix \",\
 			$(subst $(SPACE),\"$(COMMA)\",$(sort $(1)))))