From aa5113459041cf86db2243a1e47e6c19f9a57b9a Mon Sep 17 00:00:00 2001
From: Matt Wilson <msw@redhat.com>
Date: Tue, 27 Nov 2001 17:49:53 +0000
Subject: added start of atk wrapper

2001-11-27  Matt Wilson  <msw@redhat.com>

	* atk.defs, atk.override, atkmodule.c: added start of atk wrapper

	* gtk/Makefile.am (DISTCLEANFILES): remove generated files
	($(srcdir)/gtk.c): modify targets to output generated files in the
	builddir, not the srcdir.
	($(srcdir)/gdk.c): likewise.
	($(srcdir)/libglade.c): likewise.

	* codegen/h2def.py (define_func): add check to workaround broken
	string.replace semantics on python 1.5

	* codegen/codegen.py (write_enums): if the enum or flag doesn't
	have a GType, just add those enum values listed in the defs file
	by hand.

	* codegen/argtypes.py (ArgMatcher.register_enum): if defs file
	doesn't specify a GType for the enum, use G_TYPE_NONE.
	(ArgMatcher.register_flag): likewise.

	* gobjectmodule.c (pyg_enum_get_value): allow enums to pass
	G_TYPE_NONE in as the type, disabling the string to value
	conversion.
	(pyg_flags_get_value): likewise.
	(pyg_constant_strip_prefix): new function to combine common
	codepath.
	(pyg_enum_add_constants): use pyg_constant_strip_prefix
	(pyg_flags_add_constants): likewise.
	(functions): make pyg_constant_strip_prefix available to users of
	pygobject

	* pygobject.h: added pyg_constant_strip_prefix wrapper

	* configure.in: added ATK test, subst for ATK_CFLAGS and ATK_LIBS.

	* Makefile.am (%.c): added generic codegen target for pango and
	atk.  Added DISTCLEANFILES so that generated files will be
	removed.  Added atk targets, cflags, ldflags.
---
 Makefile.am | 33 ++++++++++++++++++++++-----------
 1 file changed, 22 insertions(+), 11 deletions(-)

(limited to 'Makefile.am')

diff --git a/Makefile.am b/Makefile.am
index c42c47e7..49154b48 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,9 +3,9 @@ AUTOMAKE_OPTIONS = 1.5
 
 SUBDIRS = codegen gtk
 
-INCLUDES = $(PYTHON_INCLUDES) $(GLIB_CFLAGS) $(PANGO_CFLAGS)
+INCLUDES = $(PYTHON_INCLUDES) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(ATK_CFLAGS)
 
-pyexec_LTLIBRARIES = gobjectmodule.la pangomodule.la
+pyexec_LTLIBRARIES = gobjectmodule.la pangomodule.la atkmodule.la
 
 gobjectmodule_la_LDFLAGS = -module -avoid-version \
  -export-symbols-regex initgobject
@@ -21,15 +21,22 @@ pangomodule_la_SOURCES = \
   pango.c
 pangomodule_la_LIBADD = $(PANGO_LIBS)
 
-$(srcdir)/pango.c: $(srcdir)/pango.defs $(srcdir)/pango-types.defs \
-		   $(srcdir)/pango.override
-	-chmod a+w $(srcdir)
-	cd $(srcdir) \
-	&& $(PYTHON) codegen/codegen.py \
-	    --override pango.override \
-	    --prefix pypango pango.defs > gen-pango.c \
-	&& cp gen-pango.c pango.c \
-	&& rm -f gen-pango.c
+atkmodule_la_LDFLAGS = -module -avoid-version -export-symbols-regex initatk
+atkmodule_la_SOURCES = \
+  atkmodule.c \
+  atk.c
+atkmodule_la_LIBADD = $(ATK_LIBS)
+
+%.c: $(srcdir)/%.defs $(srcdir)/%.override
+	(cd $(srcdir)\
+	 && $(PYTHON) codegen/codegen.py \
+	    --register pango-types.defs \
+	    --register gtk/gdk-types.defs \
+	    --register gtk/gtk-types.defs \
+	    --override $*.override \
+	    --prefix py$* $*.defs) > gen-$*.c \
+	 && cp gen-$*.c $*.c \
+	 && rm -f gen-$*.c
 
 pkginclude_HEADERS = pygobject.h
 pkgincludedir = $(includedir)/pygtk-2.0
@@ -39,6 +46,8 @@ noinst_PYTHON = ltihooks.py
 dist-hook:
 	-rm -f $(distdir)/pango.c
 
+DISTCLEANFILES = pango.c atk.c
+
 defsdir = $(pkgdatadir)/2.0/defs
 defs_DATA = pango.defs pango-types.defs
 
@@ -51,6 +60,8 @@ EXTRA_DIST = \
   pygtk-2.0.pc.in \
   MAPPING \
   THREADS \
+  atk.defs \
+  atk.override \
   pango.defs \
   pango-types.defs \
   pango.override \
-- 
cgit v1.2.1