Re: TODO #1: GNOME 1.x and 2.0 interoperability

[Sander Vesik <Sander Vesik Sun COM>]

On 15 Jun 2001, Martin Baulig wrote:

> Sander Vesik <Sander Vesik Sun COM> writes:
> 
> > Sounds like there should be an additional high priority item then to keep
> > bonobo-config nice and buildable.... And keep stupid changes that change
> > names of subdirs and libraries and thus break other parts of it out.
> 
> Yes, sorry about this. bonobo-config now has its "final" name, the problem
> was that we renamed it from bonobo-conf to bonobo-config but forgot to rename
> its subdirs and libraries.
> 

Unless there is a newer monikers/Makefile.am than 1.9, apply the attached
patch.

> -- 
> Martin Baulig
> martin gnome org (private)
> baulig suse de (work)
> 

	Sander

One day a tortoise will learn to fly
	-- Terry Pratchett, 'Small Gods'

Index: monikers/Makefile.am
===================================================================
RCS file: /sgnome/cvsroots/GNOME/bonobo-config/monikers/Makefile.am,v
retrieving revision 1.9
diff -c -r1.9 Makefile.am
*** monikers/Makefile.am	2001/05/21 17:09:04	1.9
--- monikers/Makefile.am	2001/06/15 15:28:37
***************
*** 35,41 ****
  	bonobo-config-xmldb.h			\
  	bonobo-moniker-xmldb.c
  
! bonobo_moniker_xmldb_LDADD = $(BONOBO_LIBS) ../bonobo-config/libbonobo_conf.la
  
  monikerdir = $(libdir)/bonobo/monikers
  
--- 35,41 ----
  	bonobo-config-xmldb.h			\
  	bonobo-moniker-xmldb.c
  
! bonobo_moniker_xmldb_LDADD = $(BONOBO_LIBS) ../bonobo-config/libbonobo_config.la
  
  monikerdir = $(libdir)/bonobo/monikers
  
***************
*** 53,64 ****
  	bonobo-moniker-config.c 		
  
  libmoniker_config_la_LIBADD = $(BONOBO_LIBS) \
! 	../bonobo-config/libbonobo_conf.la
  
  
  noinst_PROGRAMS = test-xmldb
  test_xmldb_SOURCES = test-xmldb.c bonobo-config-xmldb.h bonobo-config-xmldb.c
! test_xmldb_LDADD = $(BONOBO_LIBS) ../bonobo-config/libbonobo_conf.la
  
  EXTRA_DIST = 					\
  	Bonobo_Moniker_config.oaf.in		\
--- 53,64 ----
  	bonobo-moniker-config.c 		
  
  libmoniker_config_la_LIBADD = $(BONOBO_LIBS) \
! 	../bonobo-config/libbonobo_config.la
  
  
  noinst_PROGRAMS = test-xmldb
  test_xmldb_SOURCES = test-xmldb.c bonobo-config-xmldb.h bonobo-config-xmldb.c
! test_xmldb_LDADD = $(BONOBO_LIBS) ../bonobo-config/libbonobo_config.la
  
  EXTRA_DIST = 					\
  	Bonobo_Moniker_config.oaf.in		\