[Gtk2hs-commit] gtk2hs/sourceview sourceview.pkg.in,1.1,1.2

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

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

Modified Files:
	sourceview.pkg.in 
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: sourceview.pkg.in
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/sourceview/sourceview.pkg.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- sourceview.pkg.in	8 Dec 2004 13:01:13 -0000	1.1
+++ sourceview.pkg.in	9 Dec 2004 18:45:00 -0000	1.2
@@ -3,18 +3,18 @@
      auto            = False,
      import_dirs     = ["@hidir@"],
      source_dirs     = [],
-     library_dirs    = [],
-     hs_libraries    = ["sourceview"],
-     extra_libraries = [@GCONF_LIBS@],
-     include_dirs    = [@GCONF_CFLAGS@],
+     library_dirs    = [@SOURCEVIEW_LIBDIR_CQ@],
+     hs_libraries    = ["HSsourceview"],
+     extra_libraries = [@SOURCEVIEW_LIBS_CQ@],
+     include_dirs    = [@SOURCEVIEW_CFLAGS_CQ@],
      c_includes      = ["gtksourceview/gtksourceview.h",
                         "gtksourceview/gtksourcemarker.h",
 			"gtksourceview/gtksourcelanguagesmanager.h",
 			"gtksourceview/gtksourcetag.h",
 			"gtksourceview/gtksourcemarker.h",
 			"gtksourceview/gtksourceiter.h"]
-     package_deps    = ["gtk2hs"],
+     package_deps    = ["gtk"],
      extra_ghc_opts  = [],
      extra_cc_opts   = [],
-     extra_ld_opts   = []
+     extra_ld_opts   = [@SOURCEVIEW_LIBEXTRA_CQ@]
 }