[Gtk2hs-commit] gtk2hs/mk common.mk,1.42,1.43

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

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

Modified Files:
	common.mk 
Log Message:
Fix linker bug (use haskell98 rather than base as a gtk package dependency)
When registering packages during installation use update rather than add so
that reinstalls do not fail.
Resture use of $(HCFLAGS) provided by ./configure --with-hcflags
small notation fix in Makefile.am


Index: common.mk
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/mk/common.mk,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- common.mk	12 Dec 2004 14:28:12 -0000	1.42
+++ common.mk	12 Dec 2004 21:57:32 -0000	1.43
@@ -10,13 +10,13 @@
 	$(if $(subst .,,$(srcdir)),$(addprefix $(srcdir)/,$(SOURCEDIRS)), \
 	$(SOURCEDIRS))))
 
-LINK = 	$(strip $(HC) -o $@ $($(NAME)_HCFLAGS) \
+LINK = 	$(strip $(HC) -o $@ $(HCFLAGS) $($(NAME)_HCFLAGS) \
 	$(addprefix -package ,$($(NAME)_PACKAGEDEPS)) \
 	$(AM_LDFLAGS) $($(NAME)_LDFLAGS))
 
 .hs.o: $(CONFIG_H)
 	@echo Building for $(NAME)
-	$(strip $(HC) -c $< -o $@ $($(NAME)_HCFLAGS) -i$(VPATH) \
+	$(strip $(HC) -c $< -o $@ $(HCFLAGS) $($(NAME)_HCFLAGS) -i$(VPATH) \
 	$(addprefix -package ,$($(NAME)_PACKAGEDEPS)) \
 	$(addprefix -package-name ,$(notdir $(basename $($(NAME)_PACKAGE)))) \
 	$(addprefix '-\#include<,$(addsuffix >',$(CONFIG_H) \
@@ -114,7 +114,7 @@
 	$(if $(PKGCONF),if test -f $(PKGCONF); then :; \
 	else echo "[]" > $(PKGCONF); fi;)
 	$(foreach pkgname,$(lib_LIBRARIES), \
-	$(GHCPKG) $(addprefix -f ,$(PKGCONF)) -a -g \
+	$(GHCPKG) $(addprefix -f ,$(PKGCONF)) -u -g \
 	-Dprefix=$(prefix) -Dexec_prefix=$(exec_prefix) \
 	-i $(call getVar,$(pkgname),PACKAGE);)