diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Makefile.am | 23 | ||||
| -rw-r--r-- | gtk/Makefile.am | 13 |
3 files changed, 20 insertions, 22 deletions
@@ -1,3 +1,9 @@ +2005-07-30 Johan Dahlin <jdahlin@async.com.br> + + * Makefile.am: + * gtk/Makefile.am: + Install defs files conditionally, fixes #312037 + 2005-07-25 Johan Dahlin <jdahlin@async.com.br> * tests/test_subtype.py: diff --git a/Makefile.am b/Makefile.am index d00f3192..119f1673 100644 --- a/Makefile.am +++ b/Makefile.am @@ -14,12 +14,7 @@ EXTRA_DIST = $(defs_DATA) pyexec_LTLIBRARIES = defsdir = $(pkgdatadir)/$(PLATFORM_VERSION)/defs -defs_DATA = \ - $(top_srcdir)/atk.defs \ - $(top_srcdir)/atk-types.defs \ - $(top_srcdir)/pango.defs \ - $(top_srcdir)/pango-types.defs \ - $(top_srcdir)/pangocairo.defs +defs_DATA = pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = \ @@ -36,13 +31,6 @@ INCLUDES = \ $(ATK_CFLAGS) \ -I$(top_srcdir)/gobject -COMMONDEFS = \ - $(top_srcdir)/atk-types.defs \ - $(top_srcdir)/pango-types.defs \ - $(top_srcdir)/pangocairo.defs \ - $(top_srcdir)/gtk/gdk-types.defs \ - $(top_srcdir)/gtk/gtk-types.defs - pkgpythondir = $(pyexecdir)/gtk-2.0 pkgpyexecdir = $(pyexecdir)/gtk-2.0 pkgpyexec_LTLIBRARIES = @@ -65,12 +53,15 @@ pkgpython_PYTHON = dsextras.py if BUILD_ATK pkgpyexec_LTLIBRARIES += atk.la +defs_DATA += atk.defs atk-types.defs endif if BUILD_PANGO pkgpyexec_LTLIBRARIES += pango.la +defs_DATA += pango.defs pango-types.defs endif if BUILD_PANGOCAIRO pkgpyexec_LTLIBRARIES += pangocairo.la +defs_DATA += pangocairo.defs endif common_ldflags = -module -avoid-version @@ -83,7 +74,7 @@ atk_la_LDFLAGS = $(common_ldflags) -export-symbols-regex initatk atk_la_LIBADD = $(ATK_LIBS) atk_la_SOURCES = atkmodule.c nodist_atk_la_SOURCES = atk.c -atk.c: $(COMMONDEFS) atk.override +atk.c: atk.defs atk-types.defs atk.override CLEANFILES += atk.c EXTRA_DIST += atk.override @@ -92,7 +83,7 @@ pango_la_LDFLAGS = $(common_ldflags) -export-symbols-regex initpango pango_la_LIBADD = $(PANGO_LIBS) pango_la_SOURCES = pangomodule.c nodist_pango_la_SOURCES = pango.c -pango.c: $(COMMONDEFS) pango.override +pango.c: pango.defs pango-types.defs pango.override CLEANFILES += pango.c EXTRA_DIST += pango.override @@ -102,7 +93,7 @@ pangocairo_la_LIBADD = $(PANGOCAIRO_LIBS) pangocairo_la_CFLAGS = $(PANGOCAIRO_CFLAGS) pangocairo_la_SOURCES = pangocairomodule.c nodist_pangocairo_la_SOURCES = pangocairo.c -pangocairo.c: $(COMMONDEFS) pangocairo.override +pangocairo.c: pangocairo.defs pangocairo.override CLEANFILES += pangocairo.c EXTRA_DIST += pangocairo.override diff --git a/gtk/Makefile.am b/gtk/Makefile.am index 80e0bda7..c627fd03 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -9,12 +9,7 @@ pygtk_PYTHON = __init__.py keysyms.py compat.py pygtkexecdir = $(pkgpyexecdir)/gtk defsdir = $(pkgdatadir)/$(PLATFORM_VERSION)/defs -defs_DATA = \ - gdk.defs \ - gdk-types.defs \ - gtk.defs \ - gtk-types.defs \ - gtk-extrafuncs.defs +defs_DATA = EXTRA_DIST = $(defs_DATA) CLEANFILES = @@ -41,6 +36,12 @@ pygtkexec_LTLIBRARIES = # gtk module if BUILD_GTK pygtkexec_LTLIBRARIES += _gtk.la +defs_DATA += + gdk.defs \ + gdk-types.defs \ + gtk.defs \ + gtk-types.defs \ + gtk-extrafuncs.defs endif _gtk_la_CFLAGS = $(GTK_CFLAGS) |