From: Duncan C. <dun...@us...> - 2004-12-09 18:45:10
|
Update of /cvsroot/gtk2hs/gtk2hs/mk In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31883/mk Modified Files: common.mk Log Message: Rename package libs to libHS{pkg}.a, ie follow ghc convention and prefix them with HS so we do not get name clashes with system libraries. Rename the gtk2hs package to be just gtk. Get the flags to put into the *pkg.in files to work properly for packages other than the main gtk pacakge by adding a couple macros to aclocal.m4 and changing all the *.pkg.in files appropriately. Eliminate use of compat/* modules and lang & data pacakges in Makefile.am. Small fix to install-data-hook target in mk/common.mk. Index: common.mk =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/mk/common.mk,v retrieving revision 1.40 retrieving revision 1.41 diff -u -d -r1.40 -r1.41 --- common.mk 8 Dec 2004 00:08:13 -0000 1.40 +++ common.mk 9 Dec 2004 18:45:01 -0000 1.41 @@ -59,7 +59,7 @@ # Same for .chi .PRECIOUS: %.chi -HSTOOLFLAGS = -H500m +HSTOOLFLAGS = -H500m -M650m .PHONY: debug debug : @@ -116,7 +116,7 @@ $(foreach pkgname,$(lib_LIBRARIES), \ $(GHCPKG) $(addprefix -f ,$(PKGCONF)) -a -g \ -Dprefix=$(prefix) -Dexec_prefix=$(exec_prefix) \ - -i $(call getVar,$(pkgname),PACKAGE)) + -i $(call getVar,$(pkgname),PACKAGE);) uninstall-hook : $(foreach pkgname,$(lib_LIBRARIES), \ |