Sorry that this is going so slowly.

I've added debug2html to Makefile.in so that it compiles as part of the
normal build.  Fixed a typo in debug2html.c as well.

One problem:  I found it necessary to link with both $(PARAM_OBJ) and
              $(LIB_OBJ).  The result is an executable that is much larger
              than it really needs to be.

diff --git a/source/Makefile.in b/source/Makefile.in
index bd9ca8703b79de9e2ec87c06ab9b84850b8b320f..8e00b9165723cf75e14d85e6d2cc6cfb56108a97 100644 (file)
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -84,7 +84,7 @@ FLAGS  = $(FLAGS5) $(PASSWD_FLAGS)
 
 SPROGS = bin/smbd bin/nmbd bin/swat
 PROGS1 = bin/smbclient bin/testparm bin/testprns bin/smbrun bin/smbstatus 
-PROGS2 = bin/rpcclient bin/smbpasswd bin/make_smbcodepage @WRAP@ @WRAP32@
+PROGS2 = bin/rpcclient bin/smbpasswd bin/make_smbcodepage bin/debug2html @WRAP@ @WRAP32@
 MPROGS = @MPROGS@
 PROGS = $(PROGS1) $(PROGS2) $(MPROGS) bin/nmblookup bin/make_printerdef 
 
@@ -261,6 +261,8 @@ UMOUNT_OBJ = client/smbumount.o \
 NMBLOOKUP_OBJ = utils/nmblookup.o $(PARAM_OBJ) $(UBIQX_OBJ) \
                 $(LIBSMB_OBJ) $(LIB_OBJ)
 
+DEBUG2HTML_OBJ = utils/debug2html.o $(PARAM_OBJ) $(LIB_OBJ)
+
 SMBTORTURE_OBJ = utils/torture.o $(LIBSMB_OBJ) $(PARAM_OBJ) \
                  $(UBIQX_OBJ) $(LIB_OBJ)
 
@@ -430,6 +432,10 @@ bin/rpctorture: $(RPCTORTURE_OBJ) bin/.dummy
        @echo Linking $@
        @$(CC) $(FLAGS) -o $@ $(RPCTORTURE_OBJ) $(LDFLAGS) $(LIBS)
 
+bin/debug2html: $(DEBUG2HTML_OBJ) bin/.dummy
+       @echo Linking $@
+       @$(CC) $(FLAGS) -o $@ $(DEBUG2HTML_OBJ) $(LDFLAGS) $(LIBS)
+
 bin/smbwrapper.so: $(PICOBJS)
        @echo Linking shared library $@
        @$(LD) @LDSHFLAGS@ -o $@ $(PICOBJS) $(LIBS)

diff --git a/source/utils/debug2html.c b/source/utils/debug2html.c
index d5d8fb872ce6320cc2330704ee777ec0ca06d363..1349da5b28410ae3ba012ff5eb6d738d8ee13a06 100644 (file)
--- a/source/utils/debug2html.c
+++ b/source/utils/debug2html.c
@@ -28,12 +28,12 @@
  * does a decent job of converting Samba logs into HTML.
  * -------------------------------------------------------------------------- **
  *
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
  *
  * ========================================================================== **
  */
 
-#include "include.h"
+#include "includes.h"
 
 /* -------------------------------------------------------------------------- **
  * The size of the read buffer.