libbonobo2 parallel install fix

["R.I.P. Deaddog" <maddog linuxhall org>]

Hi,

Please can anybody comment if this is a good enough fix for libbonobo to
install in parallel with bonobo 1.0.x ? A large part of patch is actually
due to renaming of samples/echo/echo-client.c to echo-client-2.c . Part
of the patch is from Havoc's parallel install fix...

But this patch may break other things temporarily...

Abel

diff -urN libbonobo2-1.103.0-orig/monikers/Bonobo_Moniker_std.server.in.in libbonobo2-1.103.0/monikers/Bonobo_Moniker_std.server.in.in
--- libbonobo2-1.103.0-orig/monikers/Bonobo_Moniker_std.server.in.in	Wed Aug 15 03:19:49 2001
+++ libbonobo2-1.103.0/monikers/Bonobo_Moniker_std.server.in.in	Fri Oct  5 11:21:03 2001
@@ -1,7 +1,7 @@
 <oaf_info>
 
 <oaf_server iid="OAFIID:Bonobo_Moniker_std_Factory"
-	type="shlib" location="@MONIKER_LIBDIR@/libmoniker_std.so">
+	type="shlib" location="@MONIKER_LIBDIR@/libmoniker_std_2.so">
 	<oaf_attribute name="repo_ids" type="stringv">
 		<item value="IDL:Bonobo/GenericFactory:1.0"/>
 	</oaf_attribute>
diff -urN libbonobo2-1.103.0-orig/monikers/Makefile.am libbonobo2-1.103.0/monikers/Makefile.am
--- libbonobo2-1.103.0-orig/monikers/Makefile.am	Sun Aug 19 05:23:58 2001
+++ libbonobo2-1.103.0/monikers/Makefile.am	Fri Oct  5 11:21:03 2001
@@ -23,9 +23,9 @@
 @XML_I18N_MERGE_SERVER_RULE@
 
 monikerdir = $(libdir)/bonobo/monikers
-moniker_LTLIBRARIES = libmoniker_std.la
+moniker_LTLIBRARIES = libmoniker_std_2.la
 
-libmoniker_std_la_SOURCES =			\
+libmoniker_std_2_la_SOURCES =			\
 	bonobo-moniker-extender-stream.c  	\
 	bonobo-moniker-item.c			\
 	bonobo-moniker-new.c			\
@@ -38,5 +38,7 @@
 	bonobo-moniker-query.h			\
 	bonobo-moniker-std.h            	\
 	bonobo-moniker-std.c			
+
+libmoniker_std_2_la_LDFLAGS = -module -avoid-version 
 
 EXTRA_DIST = Bonobo_Moniker_std.server.in.in
diff -urN libbonobo2-1.103.0-orig/samples/echo/Bonobo_Sample_Echo.server libbonobo2-1.103.0/samples/echo/Bonobo_Sample_Echo.server
--- libbonobo2-1.103.0-orig/samples/echo/Bonobo_Sample_Echo.server	Thu Sep 27 05:56:00 2001
+++ libbonobo2-1.103.0/samples/echo/Bonobo_Sample_Echo.server	Fri Oct  5 11:21:03 2001
@@ -1,7 +1,7 @@
 <oaf_info>
 
 <oaf_server iid="OAFIID:Bonobo_Sample_Echo_Factory" type="exe" 
-	location="bonobo-echo">
+	location="bonobo-echo-2">
 	<oaf_attribute name="repo_ids" type="stringv">
 		<item value="IDL:GNOME/ObjectFactory:1.0"/>
 	</oaf_attribute>
diff -urN libbonobo2-1.103.0-orig/samples/echo/Bonobo_Sample_Echo.server.in libbonobo2-1.103.0/samples/echo/Bonobo_Sample_Echo.server.in
--- libbonobo2-1.103.0-orig/samples/echo/Bonobo_Sample_Echo.server.in	Wed Aug 15 01:32:33 2001
+++ libbonobo2-1.103.0/samples/echo/Bonobo_Sample_Echo.server.in	Fri Oct  5 11:21:03 2001
@@ -1,7 +1,7 @@
 <oaf_info>
 
 <oaf_server iid="OAFIID:Bonobo_Sample_Echo_Factory" type="exe" 
-	location="bonobo-echo">
+	location="bonobo-echo-2">
 	<oaf_attribute name="repo_ids" type="stringv">
 		<item value="IDL:GNOME/ObjectFactory:1.0"/>
 	</oaf_attribute>
diff -urN libbonobo2-1.103.0-orig/samples/echo/Makefile.am libbonobo2-1.103.0/samples/echo/Makefile.am
--- libbonobo2-1.103.0-orig/samples/echo/Makefile.am	Thu Sep 27 05:11:41 2001
+++ libbonobo2-1.103.0/samples/echo/Makefile.am	Fri Oct  5 11:21:43 2001
@@ -2,21 +2,21 @@
 # Makefile for the sample Echo server/client Bonobo components.
 #
 
-bin_PROGRAMS     = bonobo-echo echo-client
+bin_PROGRAMS     = bonobo-echo-2 echo-client-2
 noinst_LIBRARIES = libEcho.a
 
-bonobo_echo_SOURCES =		\
+bonobo_echo_2_SOURCES =		\
 	main.c			\
 	echo.c			\
 	echo.h
 
-bonobo_echo_LDADD =				\
+bonobo_echo_2_LDADD =				\
 	$(top_builddir)/bonobo/libbonobo-2.la	\
 	$(LIBBONOBO_LIBS)			\
 	libEcho.a				\
 	$(INTLLIBS)
 
-echo_client_LDADD =				\
+echo_client_2_LDADD =				\
 	$(top_builddir)/bonobo/libbonobo-2.la	\
 	$(LIBBONOBO_LIBS)			\
 	libEcho.a				\
diff -urN libbonobo2-1.103.0-orig/samples/echo/echo-client-2.c libbonobo2-1.103.0/samples/echo/echo-client-2.c
--- libbonobo2-1.103.0-orig/samples/echo/echo-client-2.c	Thu Jan  1 08:00:00 1970
+++ libbonobo2-1.103.0/samples/echo/echo-client-2.c	Wed Aug 15 01:32:33 2001
@@ -0,0 +1,54 @@
+/*
+ * Sample user for the Echo Bonobo component
+ *
+ * Author:
+ *   Miguel de Icaza  (miguel helixcode com)
+ */
+
+#include <config.h>
+#include <libbonobo.h>
+#include "Bonobo_Sample_Echo.h"
+
+int 
+main (int argc, char *argv [])
+{
+	Bonobo_Sample_Echo echo_server;
+	CORBA_Environment  ev;
+
+	/*
+	 * Initialize bonobo.
+	 */
+	if (!bonobo_init (&argc, argv))
+		g_error (_("I could not initialize Bonobo"));
+	
+	/*
+	 * Enable CORBA/Bonobo to start processing requests
+	 */
+	bonobo_activate ();
+
+	echo_server = bonobo_get_object ("OAFIID:Bonobo_Sample_Echo",
+					 "Bonobo/Sample/Echo", NULL);
+
+	if (echo_server == CORBA_OBJECT_NIL)
+		g_error (_("Could not create an instance of the sample echo component"));
+
+
+	/* Send a message */
+
+	CORBA_exception_init (&ev);
+
+	Bonobo_Sample_Echo_echo (echo_server, "This is the message from the client\n", &ev);
+
+	/* Check for exceptions */
+	if (BONOBO_EX (&ev)) {
+		char *err = bonobo_exception_get_text (&ev);
+		g_warning (_("An exception occured '%s'"), err);
+		g_free (err);
+	}
+
+	CORBA_exception_free (&ev);
+
+	bonobo_object_release_unref (echo_server, NULL);
+	
+	return 0;
+}
diff -urN libbonobo2-1.103.0-orig/samples/echo/echo-client.c libbonobo2-1.103.0/samples/echo/echo-client.c
--- libbonobo2-1.103.0-orig/samples/echo/echo-client.c	Wed Aug 15 01:32:33 2001
+++ libbonobo2-1.103.0/samples/echo/echo-client.c	Thu Jan  1 08:00:00 1970
@@ -1,54 +0,0 @@
-/*
- * Sample user for the Echo Bonobo component
- *
- * Author:
- *   Miguel de Icaza  (miguel helixcode com)
- */
-
-#include <config.h>
-#include <libbonobo.h>
-#include "Bonobo_Sample_Echo.h"
-
-int 
-main (int argc, char *argv [])
-{
-	Bonobo_Sample_Echo echo_server;
-	CORBA_Environment  ev;
-
-	/*
-	 * Initialize bonobo.
-	 */
-	if (!bonobo_init (&argc, argv))
-		g_error (_("I could not initialize Bonobo"));
-	
-	/*
-	 * Enable CORBA/Bonobo to start processing requests
-	 */
-	bonobo_activate ();
-
-	echo_server = bonobo_get_object ("OAFIID:Bonobo_Sample_Echo",
-					 "Bonobo/Sample/Echo", NULL);
-
-	if (echo_server == CORBA_OBJECT_NIL)
-		g_error (_("Could not create an instance of the sample echo component"));
-
-
-	/* Send a message */
-
-	CORBA_exception_init (&ev);
-
-	Bonobo_Sample_Echo_echo (echo_server, "This is the message from the client\n", &ev);
-
-	/* Check for exceptions */
-	if (BONOBO_EX (&ev)) {
-		char *err = bonobo_exception_get_text (&ev);
-		g_warning (_("An exception occured '%s'"), err);
-		g_free (err);
-	}
-
-	CORBA_exception_free (&ev);
-
-	bonobo_object_release_unref (echo_server, NULL);
-	
-	return 0;
-}