diff options
| -rw-r--r-- | Makefile.am | 36 | ||||
| -rw-r--r-- | gtk/Makefile.am | 31 | ||||
| -rw-r--r-- | gtk/gtkunixprintmodule.c | 4 |
3 files changed, 37 insertions, 34 deletions
diff --git a/Makefile.am b/Makefile.am index 1cb20ddc..e7f5c5b1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -27,7 +27,8 @@ EXTRA_DIST = \ INCLUDES = \ $(PYTHON_INCLUDES) \ $(PYGOBJECT_CFLAGS) \ - $(GLIB_CFLAGS) + $(GLIB_CFLAGS) \ + -I$(srcdir)/gtk # pkg-config files pkgconfigdir = $(libdir)/pkgconfig @@ -101,12 +102,45 @@ pkgpyexec_LTLIBRARIES += pangocairo.la defs_DATA += $(PANGOCAIRO_DEFS) endif +# libglade module +# XXX: Move libglade to +LIBGLADE_DEFS = gtk/libglade.defs +CLEANFILES += gtk/libglade.c +EXTRA_DIST += $(LIBGLADE_DEFS) gtk/libglade.override +libglade.c: $(LIBGLADE_DEFS) gtk/libglade.override +_glade_la_CFLAGS = $(LIBGLADE_CFLAGS) +_glade_la_LIBADD = $(LIBGLADE_LIBS) +_glade_la_LDFLAGS = $(common_ldflags) -export-symbols-regex init_glade +_glade_la_SOURCES = gtk/libglademodule.c +nodist__glade_la_SOURCES = gtk/libglade.c +if BUILD_LIBGLADE +pkgpyexec_LTLIBRARIES += _glade.la +defs_DATA += $(LIBGLADE_DEFS) +endif + +# gtkunixprint module +GTKUNIXPRINT_DEFS = gtk/gtkunixprint.defs +CLEANFILES += gtk/gtkunixprint.c +EXTRA_DIST += $(GTKUNIXPRINT_DEFS) gtk/gtkunixprint.override +gtkunixprint.c: $(GTKUNIXPRINT_DEFS) gtk/gtkunixprint.override +gtkunixprint_la_CFLAGS = $(PYCAIRO_CFLAGS) $(GTKUNIXPRINT_CFLAGS) +gtkunixprint_la_LIBADD = $(GTKUNIXPRINT_LIBS) +gtkunixprint_la_LDFLAGS = $(common_ldflags) -export-symbols-regex initgtkunixprint +gtkunixprint_la_SOURCES = gtk/gtkgtkunixprintmodule.c +nodist_gtkunixprint_la_SOURCES = gtk/gtkunixprint.c +if BUILD_GTKUNIXPRINT +pkgpyexec_LTLIBRARIES += gtkunixprint.la +defs_DATA += $(GTKUNIXPRINT_DEFS) +endif + + # code generator .defs.c: (cd $(srcdir)\ && $(PYTHON) codegen/codegen.py \ --register pango-types.defs \ --register atk-types.defs \ + --register gtk/gtk-base-types.defs \ --override $*.override \ --prefix py$* $*.defs) > gen-$*.c \ && cp gen-$*.c $*.c \ diff --git a/gtk/Makefile.am b/gtk/Makefile.am index 21c8cd74..bef009e7 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -16,7 +16,6 @@ defs_DATA = # python scripts & extension modules pkgpythondir = $(pyexecdir)/gtk-2.0 pkgpyexecdir = $(pyexecdir)/gtk-2.0 -pkgpyexec_LTLIBRARIES = # gtk python extension modules pygtkexecdir = $(pkgpyexecdir)/gtk @@ -139,36 +138,6 @@ if PLATFORM_WIN32 _gtkimpl_la_CFLAGS += -DPLATFORM_WIN32 endif -# libglade module -LIBGLADE_DEFS = libglade.defs -CLEANFILES += libglade.c -EXTRA_DIST += $(LIBGLADE_DEFS) libglade.override -libglade.c: $(LIBGLADE_DEFS) libglade.override -_glade_la_CFLAGS = $(LIBGLADE_CFLAGS) -_glade_la_LIBADD = $(LIBGLADE_LIBS) -_glade_la_LDFLAGS = $(common_ldflags) -export-symbols-regex init_glade -_glade_la_SOURCES = libglademodule.c -nodist__glade_la_SOURCES = libglade.c -if BUILD_LIBGLADE -pygtkexec_LTLIBRARIES += _glade.la -defs_DATA += $(LIBGLADE_DEFS) -endif - -# gtkunixprint module -GTKUNIXPRINT_DEFS = gtkunixprint.defs -CLEANFILES += gtkunixprint.c -EXTRA_DIST += $(GTKUNIXPRINT_DEFS) gtkunixprint.override -gtkunixprint.c: $(GTKUNIXPRINT_DEFS) gtkunixprint.override -unixprint_la_CFLAGS = $(PYCAIRO_CFLAGS) $(GTKUNIXPRINT_CFLAGS) -unixprint_la_LIBADD = $(GTKUNIXPRINT_LIBS) -unixprint_la_LDFLAGS = $(common_ldflags) -export-symbols-regex initunixprint -unixprint_la_SOURCES = gtkunixprintmodule.c -nodist_unixprint_la_SOURCES = gtkunixprint.c -if BUILD_GTKUNIXPRINT -pygtkexec_LTLIBRARIES += unixprint.la -defs_DATA += $(GTKUNIXPRINT_DEFS) -endif - .defs.c: ($(PYTHON) $(top_srcdir)/codegen/codegen.py \ diff --git a/gtk/gtkunixprintmodule.c b/gtk/gtkunixprintmodule.c index 1c304dbd..55377859 100644 --- a/gtk/gtkunixprintmodule.c +++ b/gtk/gtkunixprintmodule.c @@ -40,11 +40,11 @@ void pygtkunixprint_add_constants(PyObject *module, const gchar *strip_prefix); extern PyMethodDef pygtkunixprint_functions[]; DL_EXPORT(void) -initunixprint(void) +initgtkunixprint(void) { PyObject *m, *d; - m = Py_InitModule("gtk.unixprint", pygtkunixprint_functions); + m = Py_InitModule("gtkunixprint", pygtkunixprint_functions); d = PyModule_GetDict(m); init_pygobject(); |