diff options
| author | Christopher R. Hertel <crh@samba.org> | 1998-12-28 22:34:08 +0000 |
|---|---|---|
| committer | Christopher R. Hertel <crh@samba.org> | 1998-12-28 22:34:08 +0000 |
| commit | 7bf6e4d6a0e479a0f2fbe0ccee11522d7a19b7b9 (patch) | |
| tree | 7c0c8ef537491d670025aa749265cb072af6f41c | |
| parent | 13ab117535764f7279521ef97d994238e2796143 (diff) | |
| download | samba-7bf6e4d6a0e479a0f2fbe0ccee11522d7a19b7b9.tar.gz samba-7bf6e4d6a0e479a0f2fbe0ccee11522d7a19b7b9.tar.bz2 samba-7bf6e4d6a0e479a0f2fbe0ccee11522d7a19b7b9.zip | |
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.
(This used to be commit d2d6f0bf362d376f39d0ec7e4b6651ca2b8c8819)
| -rw-r--r-- | source3/Makefile.in | 8 | ||||
| -rw-r--r-- | source3/utils/debug2html.c | 4 |
2 files changed, 9 insertions, 3 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index bd9ca8703b..8e00b91657 100644 --- a/source3/Makefile.in +++ b/source3/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/source3/utils/debug2html.c b/source3/utils/debug2html.c index d5d8fb872c..1349da5b28 100644 --- a/source3/utils/debug2html.c +++ b/source3/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. |