[cvslog] Module eggdrop1.7: Change committed

cvslog cvs at tsss.org
Mon Oct 29 17:02:00 CST 2001


CVSROOT    : /usr/local/cvsroot
Module     : eggdrop1.7
Commit time: 2001-10-29 23:01:46 UTC
Commited by: Federico Mennite <ite at techmonkeys.org>

Modified files:
     lib/eggdrop/Makefile.am lib/eggdrop/module.h
     modules/assoc/Makefile.am modules/blowfish/Makefile.am
     modules/channels/Makefile.am modules/compress/Makefile.am
     modules/console/Makefile.am modules/ctcp/Makefile.am
     modules/filesys/Makefile.am modules/irc/Makefile.am
     modules/notes/Makefile.am modules/perlscript/Makefile.am
     modules/server/Makefile.am modules/share/Makefile.am
     modules/tclscript/Makefile.am modules/transfer/Makefile.am
     modules/uptime/Makefile.am modules/woobie/Makefile.am
     src/Makefile.am src/modules.c

Log message:

Created libeggdrop: libadns, libegg and libcompat are now linked in it. Cleaned up some unneeded function exports :)

---------------------- diff included ----------------------
Index: eggdrop1.7/lib/eggdrop/Makefile.am
diff -u eggdrop1.7/lib/eggdrop/Makefile.am:1.1 eggdrop1.7/lib/eggdrop/Makefile.am:1.2
--- eggdrop1.7/lib/eggdrop/Makefile.am:1.1	Sat Oct 27 11:34:47 2001
+++ eggdrop1.7/lib/eggdrop/Makefile.am	Mon Oct 29 17:01:32 2001
@@ -1,3 +1,13 @@
-# $Id: Makefile.am,v 1.1 2001/10/27 16:34:47 ite Exp $
+# $Id: Makefile.am,v 1.2 2001/10/29 23:01:32 ite Exp $
 
 MAINTAINERCLEANFILES	= Makefile.in
+
+INCLUDES		= -I$(top_srcdir)
+
+lib_LTLIBRARIES 	= libeggdrop.la
+
+libeggdrop_la_SOURCES	= 
+libeggdrop_la_LIBADD	= $(top_builddir)/lib/compat/libcompat.la \
+		   	$(top_builddir)/lib/egglib/libegg.la \
+			$(top_builddir)/lib/adns/libadns.la
+
Index: eggdrop1.7/lib/eggdrop/module.h
diff -u eggdrop1.7/lib/eggdrop/module.h:1.1 eggdrop1.7/lib/eggdrop/module.h:1.2
--- eggdrop1.7/lib/eggdrop/module.h:1.1	Sat Oct 27 11:34:47 2001
+++ eggdrop1.7/lib/eggdrop/module.h	Mon Oct 29 17:01:32 2001
@@ -1,7 +1,7 @@
 /*
  * module.h
  *
- * $Id: module.h,v 1.1 2001/10/27 16:34:47 ite Exp $
+ * $Id: module.h,v 1.2 2001/10/29 23:01:32 ite Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -176,9 +176,7 @@
 #define open_telnet ((int (*) (char *, int))global[87])
 /* 88 - 91 */
 #define check_bind_event ((void * (*) (const char *))global[88])
-#ifndef HAVE_MEMCPY
-# define memcpy ((void * (*) (void *, const void *, size_t))global[89])
-#endif
+/* #define memcpy ((void * (*) (void *, const void *, size_t))global[89]) */
 /* #define my_atoul ((IP(*)(char *))global[90]) */
 #define my_strcpy ((int (*)(char *, const char *))global[91])
 /* 92 - 95 */
@@ -384,26 +382,14 @@
 #define sock_has_data ((int(*)(int, int))global[248])
 #define bots_in_subtree ((int (*)(tand_t *))global[249])
 #define users_in_subtree ((int (*)(tand_t *))global[250])
-#ifndef HAVE_INET_ATON
-# define inet_aton ((int (*)(const char *cp, struct in_addr *addr))global[251])
-#endif
+/* #define inet_aton ((int (*)(const char *cp, struct in_addr *addr))global[251]) */
 /* 252 - 255 */
-#ifndef HAVE_SNPRINTF
-# define snprintf (global[252])
-#endif
-#ifndef HAVE_VSNPRINTF
-# define vsnprintf ((int (*)(char *, size_t, const char *, va_list))global[253])
-#endif
-#ifndef HAVE_MEMSET
-# define memset ((void *(*)(void *, int, size_t))global[254])
-#endif
-#ifndef HAVE_STRCASECMP
-# define strcasecmp ((int (*)(const char *, const char *))global[255])
-#endif
+/* #define snprintf (global[252]) */
+/* #define vsnprintf ((int (*)(char *, size_t, const char *, va_list))global[253]) */
+/* #define memset ((void *(*)(void *, int, size_t))global[254]) */
+/* #define strcasecmp ((int (*)(const char *, const char *))global[255]) */
 /* 256 - 259 */
-#ifndef HAVE_STRNCASECMP
-# define strncasecmp ((int (*)(const char *, const char *, size_t))global[256])
-#endif
+/* #define strncasecmp ((int (*)(const char *, const char *, size_t))global[256]) */
 #define is_file ((int (*)(const char *))global[257])
 #define must_be_owner (*(int *)(global[258]))
 #define tandbot (*(tand_t **)(global[259]))
@@ -444,28 +430,12 @@
 #define check_bind ((int (*)(bind_table_t *, const char *, struct flag_record *, ...))global[280])
 #define registry_lookup ((int (*)(const char *, const char *, Function *, void **))global[281])
 #define registry_add_simple_chains ((int (*)(registry_simple_chain_t *))global[282])
-#ifndef HAVE_STRFTIME
-# define strftime ((size_t (*)(char *, size_t, const char *, const struct tm *))global[283])
-#endif
+/* #define strftime ((size_t (*)(char *, size_t, const char *, const struct tm *))global[283]) */
 /* 284 - 287 */
-#ifndef HAVE_INET_NTOP
-# define inet_ntop ((const char (*)(int, const void *, char *, socklen_t size))global[284])
-#endif
-#ifndef HAVE_INET_PTON
-# define inet_pton ((int (*)(int, const char *, void *))global[285])
-#endif
-#ifndef HAVE_VASPRINTF
-# define vasprintf ((int (*)(char **, const char *, va_list))global[286])
-#endif
-#ifndef HAVE_ASPRINTF
-# define asprintf ((int (*)(char **, const char *, ...))global[287])
-#endif
-
-/* 288 - 291 */
-#define msprintf ((char *(*)())global[288])
-#define mstack_new ((mstack_t *(*)())global[289])
-#define mstack_push ((void *(*)())global[290])
-#define mstack_destroy ((void *(*)())global[291])
+/* #define inet_ntop ((const char (*)(int, const void *, char *, socklen_t size))global[284]) */
+/* #define inet_pton ((int (*)(int, const char *, void *))global[285]) */
+/* #define vasprintf ((int (*)(char **, const char *, va_list))global[286]) */
+/* #define asprintf ((int (*)(char **, const char *, ...))global[287]) */
 
 /* This is for blowfish module, couldnt be bothered making a whole new .h
  * file for it ;)
Index: eggdrop1.7/modules/assoc/Makefile.am
diff -u eggdrop1.7/modules/assoc/Makefile.am:1.1 eggdrop1.7/modules/assoc/Makefile.am:1.2
--- eggdrop1.7/modules/assoc/Makefile.am:1.1	Sat Oct 27 11:34:47 2001
+++ eggdrop1.7/modules/assoc/Makefile.am	Mon Oct 29 17:01:33 2001
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.1 2001/10/27 16:34:47 ite Exp $
+# $Id: Makefile.am,v 1.2 2001/10/29 23:01:33 ite Exp $
 
 # FIXME: optionally allow a system wide install by ignoring the line below.
 pkglibdir		= $(exec_prefix)/modules
@@ -6,7 +6,8 @@
 pkglib_LTLIBRARIES	= assoc.la
 assoc_la_SOURCES	= assoc.c
 assoc_la_LDFLAGS	= -module -avoid-version -no-undefined
-assoc_la_LIBADD		= @TCL_LIBS@ @LIBS@
+assoc_la_LIBADD		= @TCL_LIBS@ @LIBS@ \
+			$(top_builddir)/lib/eggdrop/libeggdrop.la
 
 MAINTAINERCLEANFILES	= Makefile.in
 
Index: eggdrop1.7/modules/blowfish/Makefile.am
diff -u eggdrop1.7/modules/blowfish/Makefile.am:1.1 eggdrop1.7/modules/blowfish/Makefile.am:1.2
--- eggdrop1.7/modules/blowfish/Makefile.am:1.1	Sat Oct 27 11:34:47 2001
+++ eggdrop1.7/modules/blowfish/Makefile.am	Mon Oct 29 17:01:33 2001
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.1 2001/10/27 16:34:47 ite Exp $
+# $Id: Makefile.am,v 1.2 2001/10/29 23:01:33 ite Exp $
 
 # FIXME: optionally allow a system wide install by ignoring the line below.
 pkglibdir		= $(exec_prefix)/modules
@@ -6,7 +6,8 @@
 pkglib_LTLIBRARIES	= blowfish.la
 blowfish_la_SOURCES	= blowfish.c
 blowfish_la_LDFLAGS	= -module -avoid-version -no-undefined
-blowfish_la_LIBADD	= @TCL_LIBS@ @LIBS@
+blowfish_la_LIBADD	= @TCL_LIBS@ @LIBS@ \
+			$(top_builddir)/lib/eggdrop/libeggdrop.la
 
 MAINTAINERCLEANFILES	= Makefile.in
 
Index: eggdrop1.7/modules/channels/Makefile.am
diff -u eggdrop1.7/modules/channels/Makefile.am:1.1 eggdrop1.7/modules/channels/Makefile.am:1.2
--- eggdrop1.7/modules/channels/Makefile.am:1.1	Sat Oct 27 11:34:48 2001
+++ eggdrop1.7/modules/channels/Makefile.am	Mon Oct 29 17:01:33 2001
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.1 2001/10/27 16:34:48 ite Exp $
+# $Id: Makefile.am,v 1.2 2001/10/29 23:01:33 ite Exp $
 
 # FIXME: optionally allow a system wide install by ignoring the line below.
 pkglibdir		= $(exec_prefix)/modules
@@ -6,7 +6,8 @@
 pkglib_LTLIBRARIES	= channels.la
 channels_la_SOURCES	= channels.c
 channels_la_LDFLAGS	= -module -avoid-version -no-undefined
-channels_la_LIBADD	= @TCL_LIBS@ @LIBS@
+channels_la_LIBADD	= @TCL_LIBS@ @LIBS@ \
+			$(top_builddir)/lib/eggdrop/libeggdrop.la
 
 MAINTAINERCLEANFILES	= Makefile.in
 
Index: eggdrop1.7/modules/compress/Makefile.am
diff -u eggdrop1.7/modules/compress/Makefile.am:1.1 eggdrop1.7/modules/compress/Makefile.am:1.2
--- eggdrop1.7/modules/compress/Makefile.am:1.1	Sat Oct 27 11:34:48 2001
+++ eggdrop1.7/modules/compress/Makefile.am	Mon Oct 29 17:01:33 2001
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.1 2001/10/27 16:34:48 ite Exp $
+# $Id: Makefile.am,v 1.2 2001/10/29 23:01:33 ite Exp $
 
 # FIXME: optionally allow a system wide install by ignoring the line below.
 pkglibdir		= $(exec_prefix)/modules
@@ -13,7 +13,8 @@
 pkglib_LTLIBRARIES	= $(EGG_CMP)
 compress_la_SOURCES	= compress.c
 compress_la_LDFLAGS	= -module -avoid-version -no-undefined
-compress_la_LIBADD	= @TCL_LIBS@ @ZLIB@ @LIBS@
+compress_la_LIBADD	= @TCL_LIBS@ @ZLIB@ @LIBS@ \
+			$(top_builddir)/lib/eggdrop/libeggdrop.la
 
 MAINTAINERCLEANFILES	= Makefile.in
 
Index: eggdrop1.7/modules/console/Makefile.am
diff -u eggdrop1.7/modules/console/Makefile.am:1.1 eggdrop1.7/modules/console/Makefile.am:1.2
--- eggdrop1.7/modules/console/Makefile.am:1.1	Sat Oct 27 11:34:49 2001
+++ eggdrop1.7/modules/console/Makefile.am	Mon Oct 29 17:01:33 2001
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.1 2001/10/27 16:34:49 ite Exp $
+# $Id: Makefile.am,v 1.2 2001/10/29 23:01:33 ite Exp $
 
 # FIXME: optionally allow a system wide install by ignoring the line below.
 pkglibdir		= $(exec_prefix)/modules
@@ -6,7 +6,8 @@
 pkglib_LTLIBRARIES	= console.la
 console_la_SOURCES	= console.c
 console_la_LDFLAGS	= -module -avoid-version -no-undefined
-console_la_LIBADD	= @TCL_LIBS@ @LIBS@
+console_la_LIBADD	= @TCL_LIBS@ @LIBS@ \
+			$(top_builddir)/lib/eggdrop/libeggdrop.la
 
 MAINTAINERCLEANFILES	= Makefile.in
 
Index: eggdrop1.7/modules/ctcp/Makefile.am
diff -u eggdrop1.7/modules/ctcp/Makefile.am:1.1 eggdrop1.7/modules/ctcp/Makefile.am:1.2
--- eggdrop1.7/modules/ctcp/Makefile.am:1.1	Sat Oct 27 11:34:49 2001
+++ eggdrop1.7/modules/ctcp/Makefile.am	Mon Oct 29 17:01:33 2001
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.1 2001/10/27 16:34:49 ite Exp $
+# $Id: Makefile.am,v 1.2 2001/10/29 23:01:33 ite Exp $
 
 # FIXME: optionally allow a system wide install by ignoring the line below.
 pkglibdir		= $(exec_prefix)/modules
@@ -6,7 +6,8 @@
 pkglib_LTLIBRARIES	= ctcp.la
 ctcp_la_SOURCES		= ctcp.c
 ctcp_la_LDFLAGS		= -module -avoid-version -no-undefined
-ctcp_la_LIBADD		= @TCL_LIBS@ @LIBS@
+ctcp_la_LIBADD		= @TCL_LIBS@ @LIBS@ \
+			$(top_builddir)/lib/eggdrop/libeggdrop.la
 
 MAINTAINERCLEANFILES	= Makefile.in
 
Index: eggdrop1.7/modules/filesys/Makefile.am
diff -u eggdrop1.7/modules/filesys/Makefile.am:1.1 eggdrop1.7/modules/filesys/Makefile.am:1.2
--- eggdrop1.7/modules/filesys/Makefile.am:1.1	Sat Oct 27 11:34:50 2001
+++ eggdrop1.7/modules/filesys/Makefile.am	Mon Oct 29 17:01:34 2001
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.1 2001/10/27 16:34:50 ite Exp $
+# $Id: Makefile.am,v 1.2 2001/10/29 23:01:34 ite Exp $
 
 # FIXME: optionally allow a system wide install by ignoring the line below.
 pkglibdir		= $(exec_prefix)/modules
@@ -6,7 +6,8 @@
 pkglib_LTLIBRARIES	= filesys.la
 filesys_la_SOURCES	= filesys.c
 filesys_la_LDFLAGS	= -module -avoid-version -no-undefined
-filesys_la_LIBADD	= @TCL_LIBS@ @LIBS@
+filesys_la_LIBADD	= @TCL_LIBS@ @LIBS@ \
+			$(top_builddir)/lib/eggdrop/libeggdrop.la
 
 MAINTAINERCLEANFILES	= Makefile.in
 
Index: eggdrop1.7/modules/irc/Makefile.am
diff -u eggdrop1.7/modules/irc/Makefile.am:1.1 eggdrop1.7/modules/irc/Makefile.am:1.2
--- eggdrop1.7/modules/irc/Makefile.am:1.1	Sat Oct 27 11:34:50 2001
+++ eggdrop1.7/modules/irc/Makefile.am	Mon Oct 29 17:01:34 2001
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.1 2001/10/27 16:34:50 ite Exp $
+# $Id: Makefile.am,v 1.2 2001/10/29 23:01:34 ite Exp $
 
 # FIXME: optionally allow a system wide install by ignoring the line below.
 pkglibdir		= $(exec_prefix)/modules
@@ -6,7 +6,8 @@
 pkglib_LTLIBRARIES	= irc.la
 irc_la_SOURCES		= irc.c
 irc_la_LDFLAGS		= -module -avoid-version -no-undefined
-irc_la_LIBADD		= @TCL_LIBS@ @LIBS@
+irc_la_LIBADD		= @TCL_LIBS@ @LIBS@ \
+			$(top_builddir)/lib/eggdrop/libeggdrop.la
 
 MAINTAINERCLEANFILES	= Makefile.in
 
Index: eggdrop1.7/modules/notes/Makefile.am
diff -u eggdrop1.7/modules/notes/Makefile.am:1.1 eggdrop1.7/modules/notes/Makefile.am:1.2
--- eggdrop1.7/modules/notes/Makefile.am:1.1	Sat Oct 27 11:34:51 2001
+++ eggdrop1.7/modules/notes/Makefile.am	Mon Oct 29 17:01:34 2001
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.1 2001/10/27 16:34:51 ite Exp $
+# $Id: Makefile.am,v 1.2 2001/10/29 23:01:34 ite Exp $
 
 # FIXME: optionally allow a system wide install by ignoring the line below.
 pkglibdir		= $(exec_prefix)/modules
@@ -6,7 +6,8 @@
 pkglib_LTLIBRARIES	= notes.la
 notes_la_SOURCES	= notes.c
 notes_la_LDFLAGS	= -module -avoid-version -no-undefined
-notes_la_LIBADD		= @TCL_LIBS@ @LIBS@
+notes_la_LIBADD		= @TCL_LIBS@ @LIBS@ \
+			$(top_builddir)/lib/eggdrop/libeggdrop.la
 
 MAINTAINERCLEANFILES	= Makefile.in
 
Index: eggdrop1.7/modules/perlscript/Makefile.am
diff -u eggdrop1.7/modules/perlscript/Makefile.am:1.1 eggdrop1.7/modules/perlscript/Makefile.am:1.2
--- eggdrop1.7/modules/perlscript/Makefile.am:1.1	Sat Oct 27 11:34:52 2001
+++ eggdrop1.7/modules/perlscript/Makefile.am	Mon Oct 29 17:01:34 2001
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.1 2001/10/27 16:34:52 ite Exp $
+# $Id: Makefile.am,v 1.2 2001/10/29 23:01:34 ite Exp $
 
 # FIXME: optionally allow a system wide install by ignoring the line below.
 pkglibdir = $(exec_prefix)/modules
@@ -13,7 +13,8 @@
 pkglib_LTLIBRARIES  = $(EGG_PRL)
 perlscript_la_SOURCES = perlscript.c
 perlscript_la_LDFLAGS = -module -avoid-version -no-undefined
-perlscript_la_LIBADD  = @PERL_LDFLAGS@ @LIBS@
+perlscript_la_LIBADD  = @PERL_LDFLAGS@ @LIBS@ \
+			$(top_builddir)/lib/eggdrop/libeggdrop.la
 
 MAINTAINERCLEANFILES    = Makefile.in
 
Index: eggdrop1.7/modules/server/Makefile.am
diff -u eggdrop1.7/modules/server/Makefile.am:1.1 eggdrop1.7/modules/server/Makefile.am:1.2
--- eggdrop1.7/modules/server/Makefile.am:1.1	Sat Oct 27 11:34:52 2001
+++ eggdrop1.7/modules/server/Makefile.am	Mon Oct 29 17:01:34 2001
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.1 2001/10/27 16:34:52 ite Exp $
+# $Id: Makefile.am,v 1.2 2001/10/29 23:01:34 ite Exp $
 
 # FIXME: optionally allow a system wide install by ignoring the line below.
 pkglibdir		= $(exec_prefix)/modules
@@ -6,7 +6,8 @@
 pkglib_LTLIBRARIES	= server.la
 server_la_SOURCES	= server.c
 server_la_LDFLAGS	= -module -avoid-version -no-undefined
-server_la_LIBADD	= @TCL_LIBS@ @LIBS@
+server_la_LIBADD	= @TCL_LIBS@ @LIBS@ \
+			$(top_builddir)/lib/eggdrop/libeggdrop.la
 
 MAINTAINERCLEANFILES	= Makefile.in
 
Index: eggdrop1.7/modules/share/Makefile.am
diff -u eggdrop1.7/modules/share/Makefile.am:1.1 eggdrop1.7/modules/share/Makefile.am:1.2
--- eggdrop1.7/modules/share/Makefile.am:1.1	Sat Oct 27 11:34:53 2001
+++ eggdrop1.7/modules/share/Makefile.am	Mon Oct 29 17:01:34 2001
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.1 2001/10/27 16:34:53 ite Exp $
+# $Id: Makefile.am,v 1.2 2001/10/29 23:01:34 ite Exp $
 
 # FIXME: optionally allow a system wide install by ignoring the line below.
 pkglibdir		= $(exec_prefix)/modules
@@ -6,7 +6,8 @@
 pkglib_LTLIBRARIES	= share.la
 share_la_SOURCES	= share.c
 share_la_LDFLAGS	= -module -avoid-version -no-undefined
-share_la_LIBADD		= @TCL_LIBS@ @LIBS@
+share_la_LIBADD		= @TCL_LIBS@ @LIBS@ \
+			$(top_builddir)/lib/eggdrop/libeggdrop.la
 
 MAINTAINERCLEANFILES	= Makefile.in
 
Index: eggdrop1.7/modules/tclscript/Makefile.am
diff -u eggdrop1.7/modules/tclscript/Makefile.am:1.1 eggdrop1.7/modules/tclscript/Makefile.am:1.2
--- eggdrop1.7/modules/tclscript/Makefile.am:1.1	Sat Oct 27 11:34:53 2001
+++ eggdrop1.7/modules/tclscript/Makefile.am	Mon Oct 29 17:01:35 2001
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.1 2001/10/27 16:34:53 ite Exp $
+# $Id: Makefile.am,v 1.2 2001/10/29 23:01:35 ite Exp $
 
 # FIXME: optionally allow a system wide install by ignoring the line below.
 pkglibdir		= $(exec_prefix)/modules
@@ -6,7 +6,8 @@
 pkglib_LTLIBRARIES	= tclscript.la
 tclscript_la_SOURCES	= tclscript.c
 tclscript_la_LDFLAGS	= -module -avoid-version -no-undefined
-tclscript_la_LIBADD	= @TCL_LIBS@ @LIBS@
+tclscript_la_LIBADD	= @TCL_LIBS@ @LIBS@ \
+			$(top_builddir)/lib/eggdrop/libeggdrop.la
 
 MAINTAINERCLEANFILES	= Makefile.in
 
Index: eggdrop1.7/modules/transfer/Makefile.am
diff -u eggdrop1.7/modules/transfer/Makefile.am:1.1 eggdrop1.7/modules/transfer/Makefile.am:1.2
--- eggdrop1.7/modules/transfer/Makefile.am:1.1	Sat Oct 27 11:34:53 2001
+++ eggdrop1.7/modules/transfer/Makefile.am	Mon Oct 29 17:01:35 2001
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.1 2001/10/27 16:34:53 ite Exp $
+# $Id: Makefile.am,v 1.2 2001/10/29 23:01:35 ite Exp $
 
 # FIXME: optionally allow a system wide install by ignoring the line below.
 pkglibdir		= $(exec_prefix)/modules
@@ -6,7 +6,8 @@
 pkglib_LTLIBRARIES	= transfer.la
 transfer_la_SOURCES	= transfer.c
 transfer_la_LDFLAGS	= -module -avoid-version -no-undefined
-transfer_la_LIBADD	= @TCL_LIBS@ @LIBS@
+transfer_la_LIBADD	= @TCL_LIBS@ @LIBS@ \
+			$(top_builddir)/lib/eggdrop/libeggdrop.la
 
 MAINTAINERCLEANFILES	= Makefile.in
 
Index: eggdrop1.7/modules/uptime/Makefile.am
diff -u eggdrop1.7/modules/uptime/Makefile.am:1.1 eggdrop1.7/modules/uptime/Makefile.am:1.2
--- eggdrop1.7/modules/uptime/Makefile.am:1.1	Sat Oct 27 11:34:54 2001
+++ eggdrop1.7/modules/uptime/Makefile.am	Mon Oct 29 17:01:35 2001
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.1 2001/10/27 16:34:54 ite Exp $
+# $Id: Makefile.am,v 1.2 2001/10/29 23:01:35 ite Exp $
 
 # FIXME: optionally allow a system wide install by ignoring the line below.
 pkglibdir		= $(exec_prefix)/modules
@@ -6,7 +6,8 @@
 pkglib_LTLIBRARIES	= uptime.la
 uptime_la_SOURCES	= uptime.c
 uptime_la_LDFLAGS	= -module -avoid-version -no-undefined
-uptime_la_LIBADD	= @TCL_LIBS@ @LIBS@
+uptime_la_LIBADD	= @TCL_LIBS@ @LIBS@ \
+			$(top_builddir)/lib/eggdrop/libeggdrop.la
 
 MAINTAINERCLEANFILES	= Makefile.in
 
Index: eggdrop1.7/modules/woobie/Makefile.am
diff -u eggdrop1.7/modules/woobie/Makefile.am:1.1 eggdrop1.7/modules/woobie/Makefile.am:1.2
--- eggdrop1.7/modules/woobie/Makefile.am:1.1	Sat Oct 27 11:34:54 2001
+++ eggdrop1.7/modules/woobie/Makefile.am	Mon Oct 29 17:01:35 2001
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.1 2001/10/27 16:34:54 ite Exp $
+# $Id: Makefile.am,v 1.2 2001/10/29 23:01:35 ite Exp $
 
 # FIXME: optionally allow a system wide install by ignoring the line below.
 pkglibdir		= $(exec_prefix)/modules
@@ -6,7 +6,8 @@
 pkglib_LTLIBRARIES	= woobie.la
 woobie_la_SOURCES	= woobie.c
 woobie_la_LDFLAGS	= -module -avoid-version -no-undefined
-woobie_la_LIBADD	= @TCL_LIBS@ @LIBS@
+woobie_la_LIBADD	= @TCL_LIBS@ @LIBS@ \
+			$(top_builddir)/lib/eggdrop/libeggdrop.la
 
 MAINTAINERCLEANFILES	= Makefile.in
 
Index: eggdrop1.7/src/Makefile.am
diff -u eggdrop1.7/src/Makefile.am:1.15 eggdrop1.7/src/Makefile.am:1.16
--- eggdrop1.7/src/Makefile.am:1.15	Sun Oct 28 07:30:33 2001
+++ eggdrop1.7/src/Makefile.am	Mon Oct 29 17:01:35 2001
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.15 2001/10/28 13:30:33 ite Exp $
+# $Id: Makefile.am,v 1.16 2001/10/29 23:01:35 ite Exp $
 
 # FIXME: optionally allow a system wide install by ignoring the line below.
 bindir			= $(exec_prefix)
@@ -110,9 +110,7 @@
 			-dlopen ../modules/transfer/transfer.la \
 			-dlopen ../modules/uptime/uptime.la \
 			-dlopen ../modules/woobie/woobie.la \
-			../lib/compat/libcompat.la \
-			../lib/adns/libadns.la \
-			../lib/egglib/libegg.la \
+			$(top_builddir)/lib/eggdrop/libeggdrop.la \
 			$(XLIBS)
 
 libtcle.a: $(TCLLIB)/lib$(TCLLIBFN)
Index: eggdrop1.7/src/modules.c
diff -u eggdrop1.7/src/modules.c:1.84 eggdrop1.7/src/modules.c:1.85
--- eggdrop1.7/src/modules.c:1.84	Sun Oct 28 07:30:33 2001
+++ eggdrop1.7/src/modules.c	Mon Oct 29 17:01:35 2001
@@ -4,7 +4,7 @@
  * 
  * by Darrin Smith (beldin at light.iinet.net.au)
  * 
- * $Id: modules.c,v 1.84 2001/10/28 13:30:33 ite Exp $
+ * $Id: modules.c,v 1.85 2001/10/29 23:01:35 ite Exp $
  */
 /* 
  * Copyright (C) 1997  Robey Pointer
@@ -253,11 +253,7 @@
   (Function) open_telnet,
   /* 88 - 91 */
   (Function) check_bind_event,
-#ifndef HAVE_MEMCPY
-  (Function) memcpy,
-#else
-  (Function) 0,
-#endif
+  (Function) 0,			/* memcpy				*/
   (Function) 0,
   (Function) my_strcpy,
   /* 92 - 95 */
@@ -463,38 +459,14 @@
   (Function) sock_has_data,
   (Function) bots_in_subtree,
   (Function) users_in_subtree,
-#ifndef HAVE_INET_ATON
-  (Function) inet_aton,
-#else
-  (Function) 0,
-#endif
+  (Function) 0,			/* inet_aton				*/
   /* 252 - 255 */
-#ifndef HAVE_SNPRINTF
-  (Function) snprintf,
-#else
-  (Function) 0,
-#endif
-#ifndef HAVE_VSNPRINTF
-  (Function) vsnprintf,
-#else
-  (Function) 0,
-#endif
-#ifndef HAVE_MEMSET
-  (Function) memset,
-#else
-  (Function) 0,
-#endif
-#ifndef HAVE_STRCASECMP
-  (Function) strcasecmp,
-#else
-  (Function) 0,
-#endif
+  (Function) 0,			/* snprintf				*/
+  (Function) 0,			/* vsnprintf				*/
+  (Function) 0,			/* memset				*/
+  (Function) 0,			/* strcasecmp				*/
   /* 256 - 259 */
-#ifndef HAVE_STRNCASECMP
-  (Function) strncasecmp,
-#else
-  (Function) 0,
-#endif
+  (Function) 0,			/* strncasecmp				*/
   (Function) is_file,
   (Function) & must_be_owner,	/* int					*/
   (Function) & tandbot,		/* tand_t *				*/
@@ -535,38 +507,12 @@
   (Function) check_bind,
   (Function) registry_lookup,
   (Function) registry_add_simple_chains,
-#ifndef HAVE_STRFTIME
-  (Function) strftime,
-#else
-  (Function) 0,
-#endif
+  (Function) 0,			/* strftime				*/
   /* 284 - 287 */
-#ifndef HAVE_INET_NTOP
-  (Function) inet_ntop,
-#else
-  (Function) 0,
-#endif
-#ifndef HAVE_INET_PTON
-  (Function) inet_pton,
-#else
-  (Function) 0,
-#endif
-#ifndef HAVE_VASPRINTF
-  (Function) vasprintf,
-#else
-  (Function) 0,
-#endif
-#ifndef HAVE_ASPRINTF
-  (Function) asprintf,
-#else
-  (Function) 0,
-#endif
-
-	/* 288 - 291 -- egglib stuff */
-	(Function) msprintf,
-	(Function) mstack_new,
-	(Function) mstack_push,
-	(Function) mstack_destroy
+  (Function) 0,			/* inet_ntop				*/
+  (Function) 0,			/* inet_pton				*/
+  (Function) 0,			/* vasprintf				*/
+  (Function) 0			/* asprintf				*/
 };
 
 static bind_table_t *BT_load, *BT_unload;
----------------------- End of diff -----------------------



More information about the Changes mailing list