Menu
▾
▴
[Gtk2hs-commit] gtk2hs ChangeLog,1.243,1.244 acinclude.m4,1.1,1.2 Makefile.am,1.15,1.16 configure.ac,1.9,1.10
|
From: Duncan C. <dun...@us...> - 2004-12-08 13:01:26
|
Update of /cvsroot/gtk2hs/gtk2hs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8972 Modified Files: ChangeLog acinclude.m4 Makefile.am configure.ac Log Message: add support to build build glade, gconf, sourceview & mogul packages also small quoting fix to acinclude.m4 .pkg.in files do not have the right flags format yet, will fix soon Index: acinclude.m4 =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/acinclude.m4,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- acinclude.m4 21 Jan 2003 15:53:07 -0000 1.1 +++ acinclude.m4 8 Dec 2004 13:01:11 -0000 1.2 @@ -12,7 +12,7 @@ dnl NB: Don't use `+' in sed regexps; Jonas Svensson reports problems with it dnl on Solaris 8. dnl -AC_DEFUN(GTKHS_GHC_VERSION, +AC_DEFUN([GTKHS_GHC_VERSION], [define([GTKHS_CV_GHC_VERSION], [gtkhs_cv_ghc_version])dnl AC_CACHE_CHECK([version of ghc], GTKHS_CV_GHC_VERSION, [dnl ${GHC-ghc} --version > conftestghc 2>&1 @@ -69,7 +69,7 @@ dnl NOTE: the loop could be unrolled within autoconf, but the dnl macro code would be a) longer and b) harder to debug... ;) dnl -AC_DEFUN(GTKHS_PROG_CHECK_VERSION, +AC_DEFUN([GTKHS_PROG_CHECK_VERSION], [if ( IFS="."; a="[$1]"; b="[$3]"; while test -n "$a$b" Index: configure.ac =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/configure.ac,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- configure.ac 1 Dec 2004 15:57:39 -0000 1.9 +++ configure.ac 8 Dec 2004 13:01:11 -0000 1.10 @@ -502,7 +502,11 @@ tools/c2hs/toplevel/C2HSConfig.hs gtk2hs.spec mk/chsDepend - gtk/gtk2hs.pkg], + gtk/gtk2hs.pkg + mogul/mogul.pkg + glade/glade.pkg + gconf/gconf.pkg + sourceview/sourceview.pkg], [chmod a+x mk/chsDepend && chmod a+x install-sh]) dnl ...and chat with the user Index: Makefile.am =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/Makefile.am,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- Makefile.am 1 Dec 2004 16:20:34 -0000 1.15 +++ Makefile.am 8 Dec 2004 13:01:11 -0000 1.16 @@ -3,8 +3,9 @@ MOSTLYCLEANFILES = CLEANFILES = DISTCLEANFILES = *.precomp -CPPFLAGS+= $(GTK_CFLAGS) $(SOURCEVIEW_CFLAGS) $(LIBGLADE_CFLAGS) \ - $(GCONF_CFLAGS) +CPPFLAGS += $(filter -I% -D%, \ + $(GTK_CFLAGS) $(SOURCEVIEW_CFLAGS) \ + $(LIBGLADE_CFLAGS) $(GCONF_CFLAGS)) # Build c2hs before anything else. @@ -17,7 +18,9 @@ tools/c2hs/base/general tools/c2hs/base/graphs \ tools/c2hs/base/state tools/c2hs/base/syms \ tools/c2hs/base/syntax tools/c2hs/base/sysdep tools/c2hs/c \ - tools/c2hs/chs tools/c2hs/gen tools/c2hs/state tools/c2hs/toplevel + tools/c2hs/chs tools/c2hs/gen tools/c2hs/state tools/c2hs/toplevel \ + mogul glade gconf gconf/System/Gnome gconf/System/Gnome/GConf \ + sourceview EXTRA_DIST = \ tools/callbackGen/Signal.chs-boot1 \ @@ -35,7 +38,13 @@ HSC = hsc2hs # all packages and applications -lib_LIBRARIES = libgtk2hs.a +lib_LIBRARIES = \ + libgtk2hs.a \ + libmogul.a \ + libglade.a \ + libgconf.a \ + libsourceview.a + noinst_PROGRAMS = \ tools/hierarchyGen/TypeGenerator \ tools/callbackGen/HookGenerator \ @@ -182,8 +191,8 @@ libgtk2hs_a_PRECOMP = gtk/gtk.precomp libgtk2hs_a_LIBS = @GTK_LIBS@ libgtk2hs_a_HCFLAGS = -fglasgow-exts -libgtk2hs_a_CFLAGS = $(filter-out -I%,$(GTK_CFLAGS)) -libgtk2hs_a_CPPFLAGS = $(filter -I%,$(GTK_CFLAGS)) +libgtk2hs_a_CFLAGS = $(filter-out -I% -D%,$(GTK_CFLAGS)) +libgtk2hs_a_CPPFLAGS = $(filter -I% -D%,$(GTK_CFLAGS)) libgtk2hs_a_SOURCES = \ gtk/general/Hierarchy.chs \ @@ -366,7 +375,207 @@ -include libgtk2hs_a.deps $(libgtk2hs_a_CHSFILES_HS:.hs=.dep) +# mogul package +libmogul_a_NAME = libmogul.a +$(libmogul_a_NAME) : NAME = libmogul_a + +libmogul_a_PACKAGE = mogul/mogul.pkg +libmogul_a_PACKAGEDEPS = +libmogul_a_LIBS = +libmogul_a_HCFLAGS = +libmogul_a_CFLAGS = +libmogul_a_CPPFLAGS = $(CPPFLAGS) + +libmogul_a_SOURCES = \ + mogul/GetWidget.hs \ + mogul/MDialog.hs \ + mogul/Mogul.hs \ + mogul/NewWidget.hs \ + mogul/TreeList.hs \ + mogul/WidgetTable.hs + +libmogul_a_LIBADD = libgtk2hs.a + +am_libmogul_a_OBJECTS = \ + $(addsuffix .$(OBJEXT),$(basename $(basename $(libmogul_a_SOURCES)))) + +libmogul_a_HSFILES = $(libmogul_a_SOURCES) +.PRECIOUS: $(libmogul_a_HSFILES:.hs=hi) + +MOSTLYCLEANFILES+ = $(am_libmogul_a_OBJECTS) +MOSTLYCLEANFILES+ = $(libmogul_a_HSFILES:.hs=.hi) + +DISTCLEANFILES+= libmogul_a.deps +-include libmogul_a.deps + +# glade package +libglade_a_NAME = libglade.a +$(libglade_a_NAME) : NAME = libglade_a + +libglade_a_PACKAGE = glade/glade.pkg +libglade_a_PACKAGEDEPS = +libglade_a_HEADER = glade/glade.h +libglade_a_PRECOMP = glade/glade.precomp +libglade_a_LIBS = $(LIBGLADE_LIBS) +libglade_a_HCFLAGS = -fglasgow-exts +libglade_a_CFLAGS = $(filter-out -I% -D%,$(GTK_CFLAGS) $(LIBGLADE_CFLAGS)) +libglade_a_CPPFLAGS = $(filter -I% -D%,$(GTK_CFLAGS) $(LIBGLADE_CFLAGS)) + +libglade_a_SOURCES = \ + glade/GladeType.chs \ + glade/Glade.chs + +libglade_a_LIBADD = libgtk2hs.a + +glade/GladeType.chs : $(srcdir)/tools/hierarchyGen/hierarchy.list \ + $(srcdir)/tools/hierarchyGen/TypeGenerator + $(strip $(srcdir)/tools/hierarchyGen/TypeGenerator \ + $(srcdir)/tools/hierarchyGen/hierarchy.list \ + $@ --tag=libglade --lib=glade --prefix=glade) + +am_libglade_a_OBJECTS = \ + $(addsuffix .$(OBJEXT),$(basename $(basename $(libglade_a_SOURCES)))) + +libglade_a_CHSPPFILES = $(filter %.chs.pp,$(libglade_a_SOURCES)) +libglade_a_CHSFILES = \ + $(filter %.chs,$(libglade_a_SOURCES:.chs.pp=.chs)) +libglade_a_CHSFILES_HS = $(libglade_a_CHSFILES:.chs=.hs) +libglade_a_HSCFILES = $(filter %.hsc, $(libglade_a_SOURCES)) +libglade_a_HSCFILES_HS = $(libglade_a_HSCFILES:.hsc=.hs) +libglade_a_BUILDSOURCES = \ + $(libglade_a_CHSPPFILES:.chs.pp=.chs) \ + $(libglade_a_CHSFILES_HS) \ + glade/GladeType.chs +libglade_a_HSFILES = \ + $(filter %.hs,$(libglade_a_BUILDSOURCES)) \ + $(filter %.hs,$(libglade_a_SOURCES)) + +MOSTLYCLEANFILES += $(am_libglade_a_OBJECTS) +MOSTLYCLEANFILES += $(libglade_a_HSFILES:.hs=.hi) +CLEANFILES += $(libglade_a_BUILDSOURCES) + +DISTCLEANFILES+= libglade_a.deps $(libglade_a_CHSFILES_HS:.hs=.dep) +-include libglade_a.deps $(libglade_a_CHSFILES:.chs=.dep) + +# gconf package +libgconf_a_NAME = libgconf.a +$(libgconf_a_NAME) : NAME = libgconf_a + +libgconf_a_PACKAGE = gconf/gconf.pkg +libgconf_a_PACKAGEDEPS = +libgconf_a_HEADER = gconf/gconf-client.h +libgconf_a_PRECOMP = gconf/gconf.precomp +libgconf_a_LIBS = $(GCONF_LIBS) +libgconf_a_HCFLAGS = -fglasgow-exts -fallow-overlapping-instances +libgconf_a_CFLAGS = $(filter-out -I% -D%,$(GTK_CFLAGS) $(GCONF_CFLAGS)) +libgconf_a_CPPFLAGS = $(filter -I% -D%,$(GTK_CFLAGS) $(GCONF_CFLAGS)) + +libgconf_a_SOURCES = \ + gconf/System/Gnome/GConf/GConfType.chs \ + gconf/System/Gnome/GConf/GConfValue.chs \ + gconf/System/Gnome/GConf/GConfClient.chs \ + gconf/System/Gnome/GConf.hs + +libgconf_a_LIBADD = libgtk2hs.a + +gconf/System/Gnome/GConf/GConfType.chs : \ + $(srcdir)/tools/hierarchyGen/hierarchy.list \ + $(srcdir)/tools/hierarchyGen/TypeGenerator + $(strip $(srcdir)/tools/hierarchyGen/TypeGenerator \ + $(srcdir)/tools/hierarchyGen/hierarchy.list \ + $@ --tag=gconf --lib=gconf --prefix=gconf \ + --modname=System.Gnome.GConf.GConfType) + +am_libgconf_a_OBJECTS = \ + $(addsuffix .$(OBJEXT),$(basename $(basename $(libgconf_a_SOURCES)))) + +libgconf_a_CHSPPFILES = $(filter %.chs.pp,$(libgconf_a_SOURCES)) +libgconf_a_CHSFILES = \ + $(filter %.chs,$(libgconf_a_SOURCES:.chs.pp=.chs)) +libgconf_a_CHSFILES_HS = $(libgconf_a_CHSFILES:.chs=.hs) +libgconf_a_HSCFILES = $(filter %.hsc, $(libgconf_a_SOURCES)) +libgconf_a_HSCFILES_HS = $(libgconf_a_HSCFILES:.hsc=.hs) +libgconf_a_BUILDSOURCES = \ + $(libgconf_a_CHSPPFILES:.chs.pp=.chs) \ + $(libgconf_a_CHSFILES_HS) \ + gconf/System/Gnome/GConf/GConfType.chs +libgconf_a_HSFILES = \ + $(filter %.hs,$(libgconf_a_BUILDSOURCES)) \ + $(filter %.hs,$(libgconf_a_SOURCES)) + +MOSTLYCLEANFILES += $(am_libgconf_a_OBJECTS) +MOSTLYCLEANFILES += $(libgconf_a_HSFILES:.hs=.hi) +CLEANFILES += $(libgconf_a_BUILDSOURCES) + +DISTCLEANFILES+= libgconf_a.deps $(libgconf_a_CHSFILES_HS:.hs=.dep) +-include libgconf_a.deps $(libgconf_a_CHSFILES:.chs=.dep) + + +# sourceview package +libsourceview_a_NAME = libsourceview.a +$(libsourceview_a_NAME) : NAME = libsourceview_a + +libsourceview_a_PACKAGE = sourceview/sourceview.pkg +libsourceview_a_PACKAGEDEPS = data +libsourceview_a_HEADER = sourceview.h +libsourceview_a_PRECOMP = sourceview/sourceview.precomp +libsourceview_a_LIBS = $(SOURCEVIEW_LIBS) +libsourceview_a_HCFLAGS = -fglasgow-exts +libsourceview_a_CFLAGS = $(filter-out -I% -D%,$(GTK_CFLAGS) $(SOURCEVIEW_CFLAGS)) +libsourceview_a_CPPFLAGS = $(filter -I% -D%,$(GTK_CFLAGS) $(SOURCEVIEW_CFLAGS)) -Isourceview + +libsourceview_a_SOURCES = \ + sourceview/SourceViewType.chs \ + sourceview/SourceBuffer.chs \ + sourceview/SourceIter.chs \ + sourceview/SourceLanguage.chs \ + sourceview/SourceLanguagesManager.chs \ + sourceview/SourceMarker.chs \ + sourceview/SourceStyleScheme.chs \ + sourceview/SourceTag.chs \ + sourceview/SourceTagStyle.hsc \ + sourceview/SourceTagTable.chs \ + sourceview/SourceView.chs + +libsourceview_a_LIBADD = libgtk2hs.a + +sourceview/SourceViewType.chs : \ + $(srcdir)/tools/hierarchyGen/hierarchy.list \ + $(srcdir)/tools/hierarchyGen/TypeGenerator + $(strip $(srcdir)/tools/hierarchyGen/TypeGenerator \ + $(srcdir)/tools/hierarchyGen/hierarchy.list \ + $@ --tag=sourceview) + +am_libsourceview_a_OBJECTS = \ + $(addsuffix .$(OBJEXT),$(basename $(basename $(libsourceview_a_SOURCES)))) + +libsourceview_a_CHSPPFILES = $(filter %.chs.pp,$(libsourceview_a_SOURCES)) +libsourceview_a_CHSFILES = \ + $(filter %.chs,$(libsourceview_a_SOURCES:.chs.pp=.chs)) +libsourceview_a_CHSFILES_HS = $(libsourceview_a_CHSFILES:.chs=.hs) +libsourceview_a_HSCFILES = $(filter %.hsc, $(libsourceview_a_SOURCES)) +libsourceview_a_HSCFILES_HS = $(libsourceview_a_HSCFILES:.hsc=.hs) +libsourceview_a_BUILDSOURCES = \ + $(libsourceview_a_CHSPPFILES:.chs.pp=.chs) \ + $(libsourceview_a_CHSFILES_HS) \ + $(libsourceview_a_HSCFILES_HS) \ + sourceview/SourceViewType.chs +libsourceview_a_HSFILES = \ + $(filter %.hs,$(libsourceview_a_BUILDSOURCES)) \ + $(filter %.hs,$(libsourceview_a_SOURCES)) + +MOSTLYCLEANFILES += $(am_libsourceview_a_OBJECTS) +MOSTLYCLEANFILES += $(libsourceview_a_HSFILES:.hs=.hi) +CLEANFILES += $(libsourceview_a_BUILDSOURCES) + +DISTCLEANFILES+= libsourceview_a.deps $(libsourceview_a_CHSFILES_HS:.hs=.dep) +-include libsourceview_a.deps $(libsourceview_a_CHSFILES:.chs=.dep) + + # All generated source files go here. -BUILDSOURCES = $(libgtk2hs_a_BUILDSOURCES) +BUILDSOURCES = $(libgtk2hs_a_BUILDSOURCES) \ + $(libglade_a_BUILDSOURCES) \ + $(libgconf_a_BUILDSOURCES) \ + $(libsourceview_a_BUILDSOURCES) include mk/common.mk Index: ChangeLog =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v retrieving revision 1.243 retrieving revision 1.244 diff -u -d -r1.243 -r1.244 --- ChangeLog 8 Dec 2004 00:08:12 -0000 1.243 +++ ChangeLog 8 Dec 2004 13:01:10 -0000 1.244 @@ -1,3 +1,14 @@ +2004-12-8 Duncan Coutts <du...@co...> + + * acinclude.m4: fix an automake warning about underquoted definitions + + * Makefile.am: build glade, gconf, sourceview & mogul packages + + * configure.ac: add new .pkg files to AC_OUTPUT list + + * mogul/mogul.pkg, glade/glade.pkg, gconf/gconf.pkg, + sourceview/sourceview.pkg: add new pkg files + 2004-12-7 Duncan Coutts <du...@co...> * mk/common.mk: tiny tidyup |
