Re: libbonobo2 parallel install fix

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

On Fri, 5 Oct 2001, Michael Meeks wrote:

> > 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...
>
> 	The patch looks fine; Jacob should have just committed Havoc's
> patch though - and it is not neccessary to rename the files; simply build
> the versioned executable from them;

So hopefully the attached patch can be final fix.

Abel

diff -ur 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 13:15:04 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 -ur 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 13:15:04 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 -ur 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 13:15:04 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 -ur 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 13:15:04 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 -ur 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 13:17:00 2001
@@ -2,21 +2,22 @@
 # 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_SOURCES = echo-client.c
+echo_client_2_LDADD =				\
 	$(top_builddir)/bonobo/libbonobo-2.la	\
 	$(LIBBONOBO_LIBS)			\
 	libEcho.a				\