diff options
| author | Johan Dahlin <johan@src.gnome.org> | 2005-07-22 21:30:20 +0000 |
|---|---|---|
| committer | Johan Dahlin <johan@src.gnome.org> | 2005-07-22 21:30:20 +0000 |
| commit | 723d96a727da1d752ff50a362a66ec92a0991b7f (patch) | |
| tree | 785cd8f61f67221caeb6dae4051d6c79989ed61b /Makefile.am | |
| parent | b3322fc949bdbc28ce09aee1885fc312521eda2a (diff) | |
| download | pygtk-723d96a727da1d752ff50a362a66ec92a0991b7f.tar.gz | |
Clean up, add some new files to EXTRA_DIST
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 87 |
1 files changed, 45 insertions, 42 deletions
diff --git a/Makefile.am b/Makefile.am index 9848b3a6..d00f3192 100644 --- a/Makefile.am +++ b/Makefile.am @@ -14,7 +14,12 @@ EXTRA_DIST = $(defs_DATA) pyexec_LTLIBRARIES = defsdir = $(pkgdatadir)/$(PLATFORM_VERSION)/defs -defs_DATA = +defs_DATA = \ + $(top_srcdir)/atk.defs \ + $(top_srcdir)/atk-types.defs \ + $(top_srcdir)/pango.defs \ + $(top_srcdir)/pango-types.defs \ + $(top_srcdir)/pangocairo.defs pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = \ @@ -24,18 +29,19 @@ if BUILD_GTK pkgconfig_DATA += pygtk-$(PLATFORM_VERSION).pc endif -INCLUDES = \ - $(PYTHON_INCLUDES) \ - $(GLIB_CFLAGS) \ - $(PANGO_CFLAGS) \ - $(ATK_CFLAGS) \ +INCLUDES = \ + $(PYTHON_INCLUDES) \ + $(GLIB_CFLAGS) \ + $(PANGO_CFLAGS) \ + $(ATK_CFLAGS) \ -I$(top_srcdir)/gobject -COMMONDEFS = \ - atk-types.defs \ - pango-types.defs \ - gtk/gdk-types.defs \ - gtk/gtk-types.defs +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 @@ -59,12 +65,12 @@ 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 endif common_ldflags = -module -avoid-version @@ -72,6 +78,15 @@ if PLATFORM_WIN32 common_ldflags += -no-undefined endif +# atk module +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 +CLEANFILES += atk.c +EXTRA_DIST += atk.override + # pango module pango_la_LDFLAGS = $(common_ldflags) -export-symbols-regex initpango pango_la_LIBADD = $(PANGO_LIBS) @@ -82,10 +97,6 @@ CLEANFILES += pango.c EXTRA_DIST += pango.override # pangocairo module -if BUILD_PANGOCAIRO - pkgpyexec_LTLIBRARIES += pangocairo.la - defs_DATA += pangocairo.defs -endif pangocairo_la_LDFLAGS = $(common_ldflags) -export-symbols-regex initpangocairo pangocairo_la_LIBADD = $(PANGOCAIRO_LIBS) pangocairo_la_CFLAGS = $(PANGOCAIRO_CFLAGS) @@ -95,15 +106,6 @@ pangocairo.c: $(COMMONDEFS) pangocairo.override CLEANFILES += pangocairo.c EXTRA_DIST += pangocairo.override -# atk module -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 -CLEANFILES += atk.c -EXTRA_DIST += atk.override - .defs.c: (cd $(srcdir)\ && $(PYTHON) codegen/codegen.py \ @@ -118,21 +120,22 @@ EXTRA_DIST += atk.override noinst_PYTHON = ltihooks.py -EXTRA_DIST += \ - pygtk.spec \ - pygtk.spec.in \ - pygtk-$(PLATFORM_VERSION).pc.in \ - MAPPING \ - THREADS \ - config.h.win32 \ - makefile.msc \ - setup.py \ - dsextras.py \ - pygtk_postinstall.py \ - MANIFEST.in \ - PKG-INFO \ - PKG-INFO.in \ - ChangeLog.pre-2-0 +EXTRA_DIST += \ + ChangeLog.pre-2-0 \ + ChangeLog.pre-2-6 \ + config.h.win32 \ + dsextras.py \ + makefile.msc \ + MANIFEST.in \ + MAPPING \ + pygtk.spec \ + pygtk.spec.in \ + pygtk-$(PLATFORM_VERSION).pc.in \ + pygtk_postinstall.py \ + PKG-INFO \ + PKG-INFO.in \ + setup.py \ + THREADS snap: $(MAKE) dist distdir=$(PACKAGE)-SNAP-`date +"%Y%m%d"` |