[gtk-mac-integration] Fix up pygtk bindings in out-of-source builds



commit 907a66f9d57c346ac9cb0253b18a27f8d6ad806c
Author: John Ralls <jralls ceridwen us>
Date:   Fri Sep 27 16:11:04 2013 -0700

    Fix up pygtk bindings in out-of-source builds

 acinclude.m4                                   |    4 ++--
 bindings/python/gtkosx_application/Makefile.am |    5 ++---
 configure.ac                                   |    2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)
---
diff --git a/acinclude.m4 b/acinclude.m4
index 1495653..63117a1 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -47,8 +47,8 @@ AC_DEFUN([GTK_PYTHON_CHECK],
 
   AC_ARG_ENABLE([python],
     AS_HELP_STRING([--enable-python=@<:@no/yes/all/auto@:>@],
-                   [build Python bindings [[default=auto]]]),,
-    [enable_python=auto])
+                   [build Python bindings [[default=all]]]),,
+    [enable_python=all])
 
   have_python=no
 
diff --git a/bindings/python/gtkosx_application/Makefile.am b/bindings/python/gtkosx_application/Makefile.am
index a41ff08..efeac9c 100644
--- a/bindings/python/gtkosx_application/Makefile.am
+++ b/bindings/python/gtkosx_application/Makefile.am
@@ -10,7 +10,7 @@ headers = $(top_srcdir)/src/gtkosxapplication.h
 gtkosx_application.defs: $(headers)
        $(PYTHON) $(datadir)/pygobject/2.0/codegen/h2def.py $(headers) > $@
 
-gtkosx_application.c: gtkosx_application.defs gtkosx_application.override
+gtkosx_application.c: gtkosx_application.defs
 
 _gtkosx_application_la_CFLAGS =                                \
        $(MAC_CFLAGS)                                   \
@@ -28,7 +28,7 @@ _gtkosx_application_la_SOURCES =                              \
        ($(PYGOBJECT_CODEGEN)                           \
            --register $(PYGTK_DEFSDIR)/gdk-types.defs  \
            --register $(PYGTK_DEFSDIR)/gtk-types.defs  \
-           --override $*.override                      \
+           --override $(srcdir)/$*.override                    \
            --prefix $* $<) > gen-$*.c                  \
        && cp gen-$*.c $*.c                             \
        && rm -f gen-$*.c
@@ -38,5 +38,4 @@ CLEANFILES =                                          \
        gtkosx_application.c
 
 EXTRA_DIST =                                           \
-       gtkosx_application.defs                         \
        gtkosx_application.override
diff --git a/configure.ac b/configure.ac
index 3b05657..78e684c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@ GTK_MAC_INTEGRATION_LT_VERSION=2:1:0
 AC_SUBST(GTK_MAC_INTEGRATION_LT_VERSION)
 AC_CONFIG_SRCDIR(src/gtk-mac-menu.c)
 AC_CONFIG_MACRO_DIR(m4)
-AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
+AM_INIT_AUTOMAKE
 
 AC_CONFIG_HEADERS(config.h)
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]