[Gtk2hs-commit] gtk2hs/mk common.mk,1.52,1.53

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

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

Modified Files:
	common.mk 
Log Message:
Add an extra option --without-pkgreg to allow distributors to install without
registering any packages with ghc-pkg.
Move the register package hook to Makefile.am file from mk/common.mk and make
it conditional on the new configure flag.
Install all the %.pkg files and also ghci HS%.o files for each libHS%.a file.

Also a fix for the C library deps of the glib package which was stopping ghci
from loading the glib package (and thus all our other packages).


Index: common.mk
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/mk/common.mk,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- common.mk	16 Jan 2005 21:25:41 -0000	1.52
+++ common.mk	17 Jan 2005 18:33:57 -0000	1.53
@@ -23,6 +23,7 @@
 tools_PKGNAME = $(call tools_$(word 2,$(subst /, ,$(1)))_PKGNAME,$(1))
 
 pkgVPATH = $(subst $(SPACE),:,$($(PKG)_SOURCESDIRS))
+getVar   = $($(subst .,_,$(subst /,_,$(1)))_$(2))
 
 LINK = 	$(strip $(HC) -o $@ $(HCFLAGS) $($(PKG)_HCFLAGS) \
 	$(addprefix -package ,$($(PKG)_PACKAGEDEPS)) \
@@ -116,25 +117,3 @@
 	+RTS $(HSTOOLFLAGS) -RTS \
 	-i$(pkgVPATH) --precomp=$($(PKG)_PRECOMP) -o $@ $<)
 
-
-# installation of packages
-
-getVar			= $($(subst .,_,$(subst /,_,$(1)))_$(2))
-
-install-data-hook :
-	$(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 \
-	-i $(call getVar,$(pkgname),PACKAGE);)
-
-uninstall-hook :
-	$(foreach pkgname,$(lib_LIBRARIES), \
-	  $(GHCPKG) $(addprefix -f ,$(PKGCONF)) \
-	  -r `cat $(call getVar,$(pkgname),PACKAGE) | $(GREP) name | $(SED) "s/ *name *= *\"\([a-zA-Z0-9]*\)\",/\1/"`;) \
-	$(if $(PKGCONF),if test -f $(PKGCONF); then \
-	  if test -n `head $(PKGCONF) | $(GREP) -e "\[\]"`; then \
-	  $(RM) $(PKGCONF) $(PKGCONF).old; fi; \
-	fi)
-