path to fix some build problems

[Maciej Stachowiak <mjs eazel com>]

Bonobo developped two build problems lately:

* Bonobo would not build unless Bonobo was already installed, because
  moniker-test.c did a #include <bonobo.h> and did not get the right
  -I option on the compile line for that to DTRT.

* Bonobo had a circular dependency with gtkhtml due to
  moniker-control-test.c

I'm committing the patch below which fixes these build problems in the
most obvious way (hope no one minds).

Love,

Maciej

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/bonobo/ChangeLog,v
retrieving revision 1.753
diff -u -r1.753 ChangeLog
--- ChangeLog   2000/11/26 04:01:00     1.753
+++ ChangeLog   2000/11/26 11:43:03
@@ -1,3 +1,10 @@
+2000-11-26  Maciej Stachowiak  <mjs eazel com>
+
+       * monikers/Makefile.am: Add -I$(top_srcdir)/bonobo to INCLUDES so
+       moniker-test.c builds even if Bonobo is not already
+       installed. Comment out moniker-control-test.c from the build to
+       avoid the circular build dependency with gtkhtml.
+
 2000-11-25  Joe Shaw  <joe helixcode com>
 
        * monikers/bonobo-moniker-gunzip.c (resolve_gunzip): Go back to using
Index: monikers/Makefile.am
===================================================================
RCS file: /cvs/gnome/bonobo/monikers/Makefile.am,v
retrieving revision 1.12
diff -u -r1.12 Makefile.am
--- monikers/Makefile.am        2000/11/26 03:20:43     1.12
+++ monikers/Makefile.am        2000/11/26 11:43:04
@@ -3,6 +3,7 @@
        -I.                                             \
        -I$(srcdir) -I$(top_srcdir)                     \
        -I$(top_builddir)                               \
+       -I$(top_srcdir)/bonobo                          \
         -I$(includedir)                                 \
        $(BONOBO_TEST_CFLAGS)
 
@@ -15,7 +16,8 @@
 
 # bonobo-moniker-untar
 
-noinst_PROGRAMS = moniker-control-test moniker-test
+#noinst_PROGRAMS = moniker-control-test moniker-test
+noinst_PROGRAMS = moniker-test
 
 moniker_ldadd =                                \
        $(top_builddir)/bonobo/libbonobo.la     \