GModule build fixes

[Owen Taylor <otaylor redhat com>]

OK to commit the following which removes gmodule/testgmodule in favor
of tests/module-test? I don't think we need two separate, almost
identical test programs for gmodule.

Thanks,
                                        Owen

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/glib/ChangeLog,v
retrieving revision 1.935
diff -u -p -r1.935 ChangeLog
--- ChangeLog	2001/11/18 15:30:52	1.935
+++ ChangeLog	2001/11/19 21:15:34
@@ -1,3 +1,10 @@
+Mon Nov 19 16:14:05 2001  Owen Taylor  <otaylor redhat com>
+
+	* tests/Makefile.am (libmoduletestplugin_[ab]_la_LDFLAGS): 
+	Add dummy -rpath argument. On some (but not all) platforms,
+	libtool will only build a convenience library without this.
+	(#63486, Dan Winship)
+
 2001-11-18  Hans Breuer  <hans breuer org>
 
 	* glib/glib.def : 
Index: gmodule/.cvsignore
===================================================================
RCS file: /cvs/gnome/glib/gmodule/.cvsignore,v
retrieving revision 1.9
diff -u -p -r1.9 .cvsignore
--- gmodule/.cvsignore	2001/02/21 12:41:27	1.9
+++ gmodule/.cvsignore	2001/11/19 21:15:34
@@ -10,9 +10,6 @@ makefile.mingw
 _libs
 .libs
 so_locations
-libgmodule-1.3.la
-libgplugin_a.la
-libgplugin_b.la
 gmoduleconf.h
 stamp-h
 testgmodule
Index: gmodule/ChangeLog
===================================================================
RCS file: /cvs/gnome/glib/gmodule/ChangeLog,v
retrieving revision 1.67
diff -u -p -r1.67 ChangeLog
--- gmodule/ChangeLog	2001/11/18 22:26:39	1.67
+++ gmodule/ChangeLog	2001/11/19 21:15:34
@@ -1,3 +1,8 @@
+Mon Nov 19 16:12:12 2001  Owen Taylor  <otaylor redhat com>
+
+	* Makefile.am: Remove testgmodule and associated
+	plugin files; we don't need _both_ this and ../tests/module-test.c
+
 2001-11-16  Michael Meeks  <michael ximian com>
 
 	* gmodule.c (parse_libtool_archive): fix leak.
Index: gmodule/Makefile.am
===================================================================
RCS file: /cvs/gnome/glib/gmodule/Makefile.am,v
retrieving revision 1.35
diff -u -p -r1.35 Makefile.am
--- gmodule/Makefile.am	2001/10/31 16:53:25	1.35
+++ gmodule/Makefile.am	2001/11/19 21:15:34
@@ -34,7 +34,6 @@ libglib = $(top_builddir)/glib/libglib-1
 top_builddir_full=`cd \$(top_builddir); pwd`
 
 lib_LTLIBRARIES = libgmodule-1.3.la
-noinst_LTLIBRARIES = libgplugin_a.la libgplugin_b.la
 
 if MS_LIB_AVAILABLE
 noinst_DATA = gmodule-1.3.lib
@@ -55,7 +54,6 @@ endif
 
 if OS_WIN32
 export_symbols = -export-symbols gmodule.def
-plugin_rpath = -rpath `pwd`
 
 install-libtool-import-lib:
 	$(INSTALL) .libs/libgmodule-1.3.dll.a $(DESTDIR)$(libdir)
@@ -75,19 +73,6 @@ libgmodule_1_3_la_LDFLAGS = \
 libgmodule_1_3_la_LIBADD = @G_MODULE_WIN32_RESOURCE@ @G_MODULE_LIBS_EXTRA@ @G_MODULE_LIBS@ $(libglib)
 
 libgmodule_1_3_la_DEPENDENCIES = @G_MODULE_WIN32_RESOURCE@ @GMODULE_DEF@
-
-libgplugin_a_la_SOURCES = libgplugin_a.c
-libgplugin_a_la_LDFLAGS = @G_MODULE_LDFLAGS@ -avoid-version -module $(no_undefined) $(plugin_rpath)
-libgplugin_a_la_LIBADD = @G_MODULE_LIBS@ @G_MODULE_LIBS_EXTRA@ @G_MODULE_PLUGIN_LIBS@ libgmodule-1.3.la $(libglib)
-
-libgplugin_b_la_SOURCES = libgplugin_b.c
-libgplugin_b_la_LDFLAGS = @G_MODULE_LDFLAGS@ -avoid-version -module $(no_undefined) $(plugin_rpath)
-libgplugin_b_la_LIBADD = @G_MODULE_LIBS@ @G_MODULE_LIBS_EXTRA@ @G_MODULE_PLUGIN_LIBS@ libgmodule-1.3.la $(libglib)
-
-noinst_PROGRAMS = testgmodule
-testgmodule_LDFLAGS += @G_MODULE_LDFLAGS@
-testgmodule_LDADD = @TESTGMODULE_EXP@ libgmodule-1.3.la $(libglib) @G_MODULE_LIBS@
-testgmodule_DEPENDENCIES = @TESTGMODULE_EXP@
 
 if OS_WIN32
 @G_MODULE_WIN32_RESOURCE@ : gmodule.rc
Index: tests/Makefile.am
===================================================================
RCS file: /cvs/gnome/glib/tests/Makefile.am,v
retrieving revision 1.49
diff -u -p -r1.49 Makefile.am
--- tests/Makefile.am	2001/11/14 23:41:54	1.49
+++ tests/Makefile.am	2001/11/19 21:15:34
@@ -136,11 +136,11 @@ install-libLTLIBRARIES:
 	:
 
 libmoduletestplugin_a_la_SOURCES = libmoduletestplugin_a.c
-libmoduletestplugin_a_la_LDFLAGS = @G_MODULE_LDFLAGS@ -avoid-version -module $(no_undefined)
+libmoduletestplugin_a_la_LDFLAGS = @G_MODULE_LDFLAGS@ -avoid-version -module $(no_undefined) -rpath $(libdir)
 libmoduletestplugin_a_la_LIBADD = @G_MODULE_LIBS@ $(libadd_libgmodule) $(libadd_libglib)
 
 libmoduletestplugin_b_la_SOURCES = libmoduletestplugin_b.c
-libmoduletestplugin_b_la_LDFLAGS = @G_MODULE_LDFLAGS@ -avoid-version -module $(no_undefined)
+libmoduletestplugin_b_la_LDFLAGS = @G_MODULE_LDFLAGS@ -avoid-version -module $(no_undefined) -rpath $(libdir)
 libmoduletestplugin_b_la_LIBADD = @G_MODULE_LIBS@ $(libadd_libgmodule) $(libadd_libglib)
 
 makefile.mingw: $(top_builddir)/config.status $(top_srcdir)/tests/makefile.mingw.in