same here.

2003-07-20  James Henstridge  <james@daa.com.au>

    * gtk/Makefile.am: same here.

    * Makefile.am: change *module.so to *.so.  Seems to be the
    preferred extension these days ...

4 files changed, 45 insertions, 38 deletions

diff --git a/ChangeLog b/ChangeLog
index 7fd01ae0..ae6283f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-07-20  James Henstridge  <james@daa.com.au>
+
+	* gtk/Makefile.am: same here.
+
+	* Makefile.am: change *module.so to *.so.  Seems to be the
+	preferred extension these days ...
+
 2003-07-12  John Finlay  <finlay@moeraki.com>
 
 	* pango.override (_wrap_PANGO_ASCENT, _wrap_PANGO_DESCENT)
diff --git a/Makefile.am b/Makefile.am
index a091e46d..481598fc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -37,9 +37,9 @@ uninstall-local:
 	rm -f $(DESTDIR)$(pythondir)/pygtk.pth $(DESTDIR)$(pyexecdir)/pygtk.pth
 
 pkgpyexec_LTLIBRARIES = \
-  gobjectmodule.la \
-  pangomodule.la \
-  atkmodule.la
+  gobject.la \
+  pango.la \
+  atk.la
 
 if PLATFORM_WIN32
 common_ldflags = -module -avoid-version -no-undefined
@@ -48,27 +48,27 @@ common_ldflags = -module -avoid-version
 endif
 
 # gobject module
-gobjectmodule_la_LDFLAGS = $(common_ldflags) -export-symbols-regex initgobject
-gobjectmodule_la_LIBADD = $(GLIB_LIBS)
-gobjectmodule_la_SOURCES = \
+gobject_la_LDFLAGS = $(common_ldflags) -export-symbols-regex initgobject
+gobject_la_LIBADD = $(GLIB_LIBS)
+gobject_la_SOURCES = \
   pygobject.h pygobject-private.h \
   gobjectmodule.c pygtype.c pygobject.c pygboxed.c
 
 # pango module
-pangomodule_la_LDFLAGS = $(common_ldflags) -export-symbols-regex initpango
-pangomodule_la_LIBADD = $(PANGO_LIBS)
-pangomodule_la_SOURCES = pangomodule.c
-nodist_pangomodule_la_SOURCES = pango.c
+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
 CLEANFILES += pango.c
 EXTRA_DIST += pango.override
 defs_DATA += pango.defs pango-types.defs
 
 # atk module
-atkmodule_la_LDFLAGS = $(common_ldflags) -export-symbols-regex initatk
-atkmodule_la_LIBADD = $(ATK_LIBS)
-atkmodule_la_SOURCES = atkmodule.c
-nodist_atkmodule_la_SOURCES = atk.c
+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
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 31057d50..550a0026 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -28,11 +28,11 @@ common_ldflags = -module -avoid-version
 endif
 
 # gtk module
-pygtkexec_LTLIBRARIES = _gtkmodule.la
-_gtkmodule_la_CFLAGS = $(GTK_CFLAGS)
-_gtkmodule_la_LDFLAGS = $(common_ldflags) -export-symbols-regex init_gtk
-_gtkmodule_la_LIBADD = $(GTK_LIBS)
-_gtkmodule_la_SOURCES = \
+pygtkexec_LTLIBRARIES = _gtk.la
+_gtk_la_CFLAGS = $(GTK_CFLAGS)
+_gtk_la_LDFLAGS = $(common_ldflags) -export-symbols-regex init_gtk
+_gtk_la_LIBADD = $(GTK_LIBS)
+_gtk_la_SOURCES = \
   pygtk.h \
   pygtk-private.h \
   gtkmodule.c \
@@ -74,30 +74,30 @@ EXTRA_DIST += 			\
 
 # libglade module
 if BUILD_LIBGLADE
-glademodule_la = glademodule.la
+glade_la = glade.la
 endif
-pygtkexec_LTLIBRARIES += $(glademodule_la)
-glademodule_la_CFLAGS = $(LIBGLADE_CFLAGS)
-glademodule_la_LDFLAGS = $(common_ldflags) -export-symbols-regex initglade
-glademodule_la_LIBADD = $(LIBGLADE_LIBS)
-glademodule_la_SOURCES = libglademodule.c
+pygtkexec_LTLIBRARIES += $(glade_la)
+glade_la_CFLAGS = $(LIBGLADE_CFLAGS)
+glade_la_LDFLAGS = $(common_ldflags) -export-symbols-regex initglade
+glade_la_LIBADD = $(LIBGLADE_LIBS)
+glade_la_SOURCES = libglademodule.c
 libglade.c: $(COMMONDEFS) libglade.override
-nodist_glademodule_la_SOURCES = libglade.c
+nodist_glade_la_SOURCES = libglade.c
 CLEANFILES += libglade.c
 defs_DATA += libglade.defs
 EXTRA_DIST += libglade.override
 
 # gtkgl module
 if BUILD_GTKGL
-glmodule_la = glmodule.la
+gl_la = gl.la
 endif
-pygtkexec_LTLIBRARIES += $(glmodule_la)
-glmodule_la_CFLAGS = $(GTKGL_CFLAGS)
-glmodule_la_LDFLAGS = $(common_ldflags) -export-symbols-regex initgl
-glmodule_la_LIBADD = $(GTKGL_LIBS)
-glmodule_la_SOURCES = gtkglmodule.c
+pygtkexec_LTLIBRARIES += $(gl_la)
+gl_la_CFLAGS = $(GTKGL_CFLAGS)
+gl_la_LDFLAGS = $(common_ldflags) -export-symbols-regex initgl
+gl_la_LIBADD = $(GTKGL_LIBS)
+gl_la_SOURCES = gtkglmodule.c
 libgl.c: $(COMMONDEFS) gtkgl.override
-nodist_glmodule_la_SOURCES = gtkgl.c
+nodist_gl_la_SOURCES = gtkgl.c
 CLEANFILES += gtkgl.c
 defs_DATA += gtkgl.defs
 EXTRA_DIST += gtkgl.override
diff --git a/pygtk.spec.in b/pygtk.spec.in
index 37b82ffa..b04fa5fb 100644
--- a/pygtk.spec.in
+++ b/pygtk.spec.in
@@ -84,10 +84,10 @@ make DESTDIR=$RPM_BUILD_ROOT install
 %{_prefix}/lib/python?.?/site-packages/gtk-2.0/gtk/keysyms.py*
 
 %defattr(755, root, root, 755)
-%{_prefix}/lib/python?.?/site-packages/gtk-2.0/atkmodule.so
-%{_prefix}/lib/python?.?/site-packages/gtk-2.0/gobjectmodule.so
-%{_prefix}/lib/python?.?/site-packages/gtk-2.0/pangomodule.so
-%{_prefix}/lib/python?.?/site-packages/gtk-2.0/gtk/_gtkmodule.so
+%{_prefix}/lib/python?.?/site-packages/gtk-2.0/atk.so
+%{_prefix}/lib/python?.?/site-packages/gtk-2.0/gobject.so
+%{_prefix}/lib/python?.?/site-packages/gtk-2.0/pango.so
+%{_prefix}/lib/python?.?/site-packages/gtk-2.0/gtk/_gtk.so
 
 %doc AUTHORS NEWS README MAPPING ChangeLog
 %doc examples
@@ -95,7 +95,7 @@ make DESTDIR=$RPM_BUILD_ROOT install
 %if %{buildglade}
 %files libglade
 %defattr(755, root, root, 755)
-%{_prefix}/lib/python?.?/site-packages/gtk-2.0/gtk/glademodule.so
+%{_prefix}/lib/python?.?/site-packages/gtk-2.0/gtk/glade.so
 %endif
 
 %files devel