libbonoboui distcheck patch

[Havoc Pennington <hp redhat com>]

Hi,

Some minor fixage.

Havoc

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/libbonoboui/ChangeLog,v
retrieving revision 1.230
diff -u -p -u -r1.230 ChangeLog
--- ChangeLog	2002/01/07 13:35:13	1.230
+++ ChangeLog	2002/01/07 21:49:57
@@ -1,3 +1,12 @@
+2002-01-07  Havoc Pennington  <hp redhat com>
+
+	* bonobo/Makefile.am ($(srcdir)/bonobo-ui-marshal.c): redirect to
+	fixed filenames, not $@, $@ was a relative path but we already did
+	"cd ($srcdir)"
+
+	* samples/controls/Makefile.am (server_DATA): make sure we dist
+	in.in files
+
 2002-01-07  Michael Meeks  <michael ximian com>
 
 	* bonobo/bonobo-widget.c (bonobo_widget_construct_control):
Index: bonobo/Makefile.am
===================================================================
RCS file: /cvs/gnome/libbonoboui/bonobo/Makefile.am,v
retrieving revision 1.198
diff -u -p -u -r1.198 Makefile.am
--- bonobo/Makefile.am	2001/12/13 12:38:25	1.198
+++ bonobo/Makefile.am	2002/01/07 21:49:57
@@ -142,11 +142,11 @@ libbonoboinclude_HEADERS = \
 
 $(srcdir)/bonobo-ui-marshal.h: bonobo-ui-marshal.list $(GLIB_GENMARSHAL)
 	cd $(srcdir) \
-	&& $(GLIB_GENMARSHAL) $< --header --prefix=bonobo_ui_marshal > $@
+	&& $(GLIB_GENMARSHAL) $< --header --prefix=bonobo_ui_marshal > bonobo-ui-marshal.h
 
 $(srcdir)/bonobo-ui-marshal.c: bonobo-ui-marshal.list $(GLIB_GENMARSHAL)
 	cd $(srcdir) \
-	&& $(GLIB_GENMARSHAL) $< --body --prefix=bonobo_ui_marshal > $@
+	&& $(GLIB_GENMARSHAL) $< --body --prefix=bonobo_ui_marshal > bonobo-ui-marshal.c
 
 $(srcdir)/bonobo-ui-type-builtins.c: $(libbonoboui_h_sources) $(GLIB_MKENUMS)
 	cd $(srcdir) \
Index: glade/Makefile.am
===================================================================
RCS file: /cvs/gnome/libbonoboui/glade/Makefile.am,v
retrieving revision 1.2
diff -u -p -u -r1.2 Makefile.am
--- glade/Makefile.am	2001/11/07 20:37:02	1.2
+++ glade/Makefile.am	2002/01/07 21:49:57
@@ -14,7 +14,7 @@ libbonobo_la_LIBADD = \
 	$(BONOBOUI_GLADE_LIBS)
 
 libbonobo_la_LDFLAGS = \
-	-export-dynamic -module -avoid-version
+	-module -avoid-version
 
 libbonobo_la_SOURCES = \
 	glade-bonobo.c
Index: po/POTFILES.in
===================================================================
RCS file: /cvs/gnome/libbonoboui/po/POTFILES.in,v
retrieving revision 1.8
diff -u -p -u -r1.8 POTFILES.in
--- po/POTFILES.in	2002/01/07 12:51:21	1.8
+++ po/POTFILES.in	2002/01/07 21:49:57
@@ -10,4 +10,3 @@ samples/bonoboui/hello.c
 monikers/Bonobo_Moniker_extra.server.in.in
 monikers/bonobo-moniker-conf-indirect.c
 samples/bonoboui/Bonobo_Sample_Hello.xml
-samples/compound-doc/container/embeddable-io.c
Index: samples/controls/Makefile.am
===================================================================
RCS file: /cvs/gnome/libbonoboui/samples/controls/Makefile.am,v
retrieving revision 1.21
diff -u -p -u -r1.21 Makefile.am
--- samples/controls/Makefile.am	2001/12/07 13:21:09	1.21
+++ samples/controls/Makefile.am	2002/01/07 21:49:57
@@ -18,9 +18,10 @@ bonobo_sample_controls_2_LDADD =			\
 	$(INTLLIBS)
 
 serverdir = $(libdir)/bonobo/servers
-server_in_files = Bonobo_Sample_Controls.server.in
+server_in_in_files = Bonobo_Sample_Controls.server.in.in
+server_in_files = $(server_in_in_files:.server.in.in=.server.in)
 server_DATA = $(server_in_files:.server.in=.server)
 
 @INTLTOOL_SERVER_RULE@
 
-EXTRA_DIST = $(server_in_files) $(server_DATA)
+EXTRA_DIST = $(server_in_files) $(server_in_in_files) $(server_DATA)