[Gtk2hs-commit] gtk2hs/mk common.mk,1.51,1.52 chsDepend.in,1.12,1.13

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

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

Modified Files:
	common.mk chsDepend.in 
Log Message:
Do the ghc-pkg registering in a way that works for older ghc versions too.
Make the build a little less chatty.


Index: chsDepend.in
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/mk/chsDepend.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- chsDepend.in	15 Jan 2005 13:12:05 -0000	1.12
+++ chsDepend.in	16 Jan 2005 21:25:57 -0000	1.13
@@ -50,7 +50,7 @@
     if test -n "$DEPNAMES"; then
       echo "$FULLNAMEHS : $DEPNAMES" >> $FULLNAMEDEP;
     fi;
-    echo Writing dependency information for $FULLNAME
+#    echo Writing dependency information for $FULLNAME
   else
     echo Warning: $FULLNAME not found.
   fi;

Index: common.mk
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/mk/common.mk,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- common.mk	15 Jan 2005 13:12:04 -0000	1.51
+++ common.mk	16 Jan 2005 21:25:41 -0000	1.52
@@ -33,7 +33,6 @@
 #file even though the object files will be in different directories.
 #Obviously the 'subdir-objects' option only works for C/C++ files.
 %.o : %.hs $(CONFIG_H)
-	@echo Building for $(PKG)
 	$(strip $(HC) -c $< -o $@ $(HCFLAGS) $($(PKG)_HCFLAGS) \
 	$(call getVar,$<,HCFLAGS) -i$(pkgVPATH) \
 	$(addprefix -package-name ,$(notdir $(basename $($(PKG)_PACKAGE)))) \
@@ -43,7 +42,6 @@
 .DELETE_ON_ERROR : %.deps
 
 %.deps :
-	@echo Checking if deps up to date for $@
 	$(strip if test -f $@; then touch $@; else \
 	  touch $@; $(MAKE) $(AM_MAKEFLAGS) NAME="$*" depend; fi;)
 
@@ -58,7 +56,7 @@
 	$($(NAME)_HSFILES))
 
 .chs.dep :
-	@$(CHSDEPEND) -i$(pkgVPATH) $<
+	$(CHSDEPEND) -i$(pkgVPATH) $<
 
 .hs.chi :
 	@:
@@ -91,7 +89,6 @@
 	--precomp=$($(PKG)_PRECOMP) $($(PKG)_HEADER))
 
 .chs.pp.chs: $(CONFIG_H)
-	@echo Preprocessing for $(PKG)
 	$(strip $(HSCPP) $(AM_CPPFLAGS) \
 	$($(PKG)_CPPFLAGS) $($(PKG)_CFLAGS) \
 	$(addprefix -include ,$(CONFIG_H)) \
@@ -109,7 +106,6 @@
         --cc=$(HC) --lflag=-no-hs-main $<)
 
 .chs.hs: 
-	@echo Building .hs file for $(PKG)
 	$(if $(subst no,,$(BUILT_IN_C2HS)),$(strip \
 	if test -x $(C2HS); then :; else \
 	  $(MAKE) $(AM_MAKEFLAGS) \
@@ -129,8 +125,8 @@
 	$(if $(PKGCONF),if test -f $(PKGCONF); then :; \
 	else echo "[]" > $(PKGCONF); fi;)
 	$(foreach pkgname,$(pkglib_LIBRARIES), \
+	prefix=$(prefix) exec_prefix=$(exec_prefix) pkglibdir=$(pkglibdir) \
 	$(GHCPKG) $(addprefix -f ,$(PKGCONF)) -u -g \
-	-Dprefix=$(prefix) -Dexec_prefix=$(exec_prefix) -Dpkglibdir=$(pkglibdir)\
 	-i $(call getVar,$(pkgname),PACKAGE);)
 
 uninstall-hook :