Removed some old module support code

svn: 94

Makefile.in

@@ -46,7 +46,6 @@ MOD_STRIP = @MOD_STRIP@
 SHLIB_CC = @SHLIB_CC@
 SHLIB_LD = @SHLIB_LD@
 SHLIB_STRIP = @SHLIB_STRIP@
-MOD_EXT = @MOD_EXT@
 
 # programs make install uses
 LN_S = @LN_S@
@@ -128,7 +127,7 @@ clean:  cleanutils cleanpack
 	@cd src && $(MAKE) clean
 	@cd src/md5 && $(MAKE) clean
 	@cd src/compat && $(MAKE) clean
-	@rm -f $(HUBEXEC) $(LEAFEXEC) *.$(MOD_EXT) *.so *.stamp core DEBUG *~ key configure.temp makesalt 
+	@rm -f $(HUBEXEC) $(LEAFEXEC) *.so *.stamp core DEBUG *~ key configure.temp makesalt 
 	@rm -f $(HUBEXEC).* $(LEAFEXEC).* src/makesalt
 
 distclean: clean clean-modconfig

acconfig.h

@@ -49,9 +49,6 @@
 /* Defines the current eggdrop version  */
 #undef EGG_VERSION
 
-/* Defines extension of eggdrop modules  */
-#undef EGG_MOD_EXT
-
 @BOTTOM@
 
 #endif /* !_EGG_CONFIG_H */

aclocal.m4

@@ -116,7 +116,6 @@ SHLIB_LD="$CC"
 SHLIB_STRIP="$STRIP"
 NEED_DL=1
 DEFAULT_MAKE=eggdrop
-MOD_EXT=so
 
 AC_CACHE_CHECK(system type, egg_cv_var_system_type, egg_cv_var_system_type=`$UNAME -s`)
 AC_CACHE_CHECK(system release, egg_cv_var_system_release, egg_cv_var_system_release=`$UNAME -r`)
@@ -164,7 +163,6 @@ case "$egg_cv_var_system_type" in
           AC_MSG_RESULT(no)
           AC_MSG_WARN(Make sure the directory Eggdrop is installed into is mounted in binary mode.)
         fi
-        MOD_EXT=dll
         AC_DEFINE(MODULES_OK)dnl
       ;;
       *)
@@ -333,8 +331,6 @@ AC_SUBST(SHLIB_LD)dnl
 AC_SUBST(SHLIB_CC)dnl
 AC_SUBST(SHLIB_STRIP)dnl
 AC_SUBST(DEFAULT_MAKE)dnl
-AC_SUBST(MOD_EXT)dnl
-AC_DEFINE_UNQUOTED(EGG_MOD_EXT, "$MOD_EXT")dnl
 ])dnl
 
 

config.h.in

@@ -49,10 +49,6 @@
 /* Defines the current eggdrop version  */
 #undef EGG_VERSION
 
-/* Defines extension of eggdrop modules  */
-#undef EGG_MOD_EXT
-
-
 /* Define if you have the `clock' function. */
 #undef HAVE_CLOCK
 

src/mod/Makefile.in

@@ -21,7 +21,6 @@ MOD_CFLAGS = @CFLAGS@ -I. -I../../.. -I$(MOD_UPDIR)$(top_srcdir) \
   -I$(MOD_UPDIR)$(top_srcdir)/src/mod @DEFS@ $(CFLGS)
 MOD_CPPFLAGS = @CPPFLAGS@
 XLIBS = @XLIBS@
-MOD_EXT = @MOD_EXT@
 
 # Note: The following three lines are automatically adjusted by
 #       misc/modconfig. They have to be present here.
@@ -35,7 +34,7 @@ egg_ac_parameters = @egg_ac_parameters@
 
 MAKE_MOD = $(MAKE) 'MAKE=$(MAKE)' 'CC=$(CC)' 'LD=$(LD)' \
 'STRIP=$(STRIP)' 'CFLAGS=$(MOD_CFLAGS)' 'CPPFLAGS=$(MOD_CPPFLAGS)' \
-'XLIBS=$(XLIBS)' 'MOD_EXT=$(MOD_EXT)' 'SHELL=$(SHELL)'
+'XLIBS=$(XLIBS)' 'SHELL=$(SHELL)'
 
 
 doofus:
@@ -91,7 +90,7 @@ config:
 	echo ""
 
 clean:
-	@rm -f *.o *.$(MOD_EXT) *~ static.h mod.xlibs
+	@rm -f *.o *~ static.h mod.xlibs
 	@for i in *.mod; do \
 		if test ! -d $$i; then mkdir $$i; fi; \
 		if (test ! -r $$i/Makefile) && \
@@ -104,7 +103,7 @@ clean:
 	done
 
 distclean:
-	@rm -f *.o *.$(MOD_EXT) *~ static.h mod.xlibs
+	@rm -f *.o *~ static.h mod.xlibs
 	@for i in *.mod; do \
 		if test ! -d $$i; then mkdir $$i; fi; \
 		if (test ! -r $$i/Makefile) && \

src/mod/channels.mod/Makefile

@@ -11,22 +11,16 @@ doofus:
 
 static: ../channels.o
 
-modules: ../../../channels.$(MOD_EXT)
-
 ../channels.o:
 	$(CC) $(CFLAGS) $(CPPFLAGS) -DMAKING_MODS -c $(srcdir)/channels.c
 	@rm -f ../channels.o
 	mv channels.o ../
 
-../../../channels.$(MOD_EXT): ../channels.o
-	$(LD) -static -o ../../../channels.$(MOD_EXT) ../channels.o $(XLIBS)
-	$(STRIP) ../../../channels.$(MOD_EXT)
-
 depend:
 	$(CC) $(CFLAGS) $(CPPFLAGS) -MM $(srcdir)/channels.c > .depend
 
 clean:
-	@rm -f .depend *.o *.$(MOD_EXT) *~
+	@rm -f .depend *.o *~
 distclean: clean
 
 #safety hash

src/mod/compress.mod/Makefile.in

@@ -13,22 +13,16 @@ doofus:
 static: ../compress.o
 	@echo "$(ZLIB)" >> ../mod.xlibs
 
-modules: ../../../compress.$(MOD_EXT)
-
 ../compress.o:
 	$(CC) $(CFLAGS) $(CPPFLAGS) -DMAKING_MODS -c $(srcdir)/compress.c
 	rm -f ../compress.o
 	mv compress.o ../
 
-../../../compress.$(MOD_EXT): ../compress.o
-	$(LD) -static -o ../../../compress.$(MOD_EXT) ../compress.o $(ZLIB) $(XLIBS)
-	$(STRIP) ../../../compress.$(MOD_EXT)
-
 depend:
 	$(CC) $(CFLAGS) $(CPPFLAGS) -MM $(srcdir)/compress.c > .depend
 
 clean:
-	@rm -f .depend *.o *.$(MOD_EXT) *~
+	@rm -f .depend *.o *~
 
 distclean: clean
 	@rm -f Makefile config.cache config.log config.status config.h compress_config.h

src/mod/console.mod/Makefile

@@ -11,22 +11,16 @@ doofus:
 
 static: ../console.o
 
-modules: ../../../console.$(MOD_EXT)
-
 ../console.o:
 	$(CC) $(CFLAGS) $(CPPFLAGS) -DMAKING_MODS -c $(srcdir)/console.c
 	@rm -f ../console.o
 	mv console.o ../
 
-../../../console.$(MOD_EXT): ../console.o
-	$(LD) -static -o ../../../console.$(MOD_EXT) ../console.o $(XLIBS)
-	$(STRIP) ../../../console.$(MOD_EXT)
-
 depend:
 	$(CC) $(CFLAGS) $(CPPFLAGS) -MM $(srcdir)/console.c > .depend
 
 clean:
-	@rm -f .depend *.o *.$(MOD_EXT) *~
+	@rm -f .depend *.o *~
 distclean: clean
 
 #safety hash

src/mod/ctcp.mod/Makefile

@@ -11,22 +11,16 @@ doofus:
 
 static: ../ctcp.o
 
-modules: ../../../ctcp.$(MOD_EXT)
-
 ../ctcp.o:
 	$(CC) $(CFLAGS) $(CPPFLAGS) -DMAKING_MODS -c $(srcdir)/ctcp.c
 	@rm -f ../ctcp.o
 	mv ctcp.o ../
 
-../../../ctcp.$(MOD_EXT): ../ctcp.o
-	$(LD) -static -o ../../../ctcp.$(MOD_EXT) ../ctcp.o
-	$(STRIP) ../../../ctcp.$(MOD_EXT)
-
 depend:
 	$(CC) $(CFLAGS) $(CPPFLAGS) -MM $(srcdir)/ctcp.c > .depend
 
 clean:
-	@rm -f .depend *.o *.$(MOD_EXT) *~
+	@rm -f .depend *.o *~
 distclean: clean
 
 #safety hash

src/mod/dns.mod/Makefile.in

@@ -14,22 +14,16 @@ doofus:
 static: ../dns.o
 	@echo "$(RESLIB)" >> ../mod.xlibs
 
-modules: ../../../dns.$(MOD_EXT)
-
 ../dns.o:
 	$(CC) $(CFLAGS) $(CPPFLAGS) $(RESINCLUDE) -DMAKING_MODS -c $(srcdir)/dns.c
 	@rm -f ../dns.o
 	mv dns.o ../
 
-../../../dns.$(MOD_EXT): ../dns.o
-	$(LD) -static -o ../../../dns.$(MOD_EXT) ../dns.o $(RESLIB)
-	$(STRIP) ../../../dns.$(MOD_EXT)
-
 depend:
 	$(CC) $(CFLAGS) $(CPPFLAGS) -MM $(srcdir)/dns.c > .depend
 
 clean:
-	@rm -f .depend *.o *.$(MOD_EXT) *~
+	@rm -f .depend *.o *~
 
 distclean: clean
 	@rm -f Makefile config.cache config.log config.status

src/mod/irc.mod/Makefile

@@ -11,22 +11,16 @@ doofus:
 
 static: ../irc.o
 
-modules: ../../../irc.$(MOD_EXT)
-
 ../irc.o:
 	$(CC) $(CFLAGS) $(CPPFLAGS) -DMAKING_MODS -c $(srcdir)/irc.c
 	@rm -f ../irc.o
 	mv irc.o ../
 
-../../../irc.$(MOD_EXT): ../irc.o
-	$(LD) -static -o ../../../irc.$(MOD_EXT) ../irc.o $(XLIBS)
-	$(STRIP) ../../../irc.$(MOD_EXT)
-
 depend:
 	$(CC) $(CFLAGS) $(CPPFLAGS) -MM $(srcdir)/irc.c > .depend
 
 clean:
-	@rm -f .depend *.o *.$(MOD_EXT) *~
+	@rm -f .depend *.o *~
 distclean: clean
 
 #safety hash

src/mod/notes.mod/Makefile

@@ -11,22 +11,16 @@ doofus:
 
 static: ../notes.o
 
-modules: ../../../notes.$(MOD_EXT)
-
 ../notes.o:
 	$(CC) $(CFLAGS) $(CPPFLAGS) -DMAKING_MODS -c $(srcdir)/notes.c
 	@rm -f ../notes.o
 	mv notes.o ../
 
-../../../notes.$(MOD_EXT): ../notes.o
-	$(LD) -static -o ../../../notes.$(MOD_EXT) ../notes.o $(XLIBS)
-	$(STRIP) ../../../notes.$(MOD_EXT)
-
 depend:
 	$(CC) $(CFLAGS) $(CPPFLAGS) -MM $(srcdir)/notes.c > .depend
 
 clean:
-	@rm -f .depend *.o *.$(MOD_EXT) *~
+	@rm -f .depend *.o *~
 distclean: clean
 
 #safety hash

src/mod/server.mod/Makefile

@@ -11,22 +11,16 @@ doofus:
 
 static: ../server.o
 
-modules: ../../../server.$(MOD_EXT)
-
 ../server.o:
 	$(CC) $(CFLAGS) $(CPPFLAGS) -DMAKING_MODS -c $(srcdir)/server.c
 	@rm -f ../server.o
 	mv server.o ../
 
-../../../server.$(MOD_EXT): ../server.o
-	$(LD) -static -o ../../../server.$(MOD_EXT) ../server.o $(XLIBS)
-	$(STRIP) ../../../server.$(MOD_EXT)
-
 depend:
 	$(CC) $(CFLAGS) $(CPPFLAGS) -MM $(srcdir)/server.c > .depend
 
 clean:
-	@rm -f .depend *.o *.$(MOD_EXT) *~
+	@rm -f .depend *.o *~
 distclean: clean
 
 #safety hash

src/mod/share.mod/Makefile

@@ -11,22 +11,16 @@ doofus:
 
 static: ../share.o
 
-modules: ../../../share.$(MOD_EXT)
-
 ../share.o:
 	$(CC) $(CFLAGS) $(CPPFLAGS) -DMAKING_MODS -c $(srcdir)/share.c
 	@rm -f ../share.o
 	mv share.o ../
 
-../../../share.$(MOD_EXT): ../share.o
-	$(LD) -static -o ../../../share.$(MOD_EXT) ../share.o
-	$(STRIP) ../../../share.$(MOD_EXT)
-
 depend:
 	$(CC) $(CFLAGS) $(CPPFLAGS) -MM $(srcdir)/share.c > .depend
 
 clean:
-	@rm -f .depend *.o *.$(MOD_EXT) *~
+	@rm -f .depend *.o *~
 distclean: clean
 
 #safety hash

src/mod/transfer.mod/Makefile

@@ -11,22 +11,16 @@ doofus:
 
 static: ../transfer.o
 
-modules: ../../../transfer.$(MOD_EXT)
-
 ../transfer.o:
 	$(CC) $(CFLAGS) $(CPPFLAGS) -DMAKING_MODS -c $(srcdir)/transfer.c
 	@rm -f ../transfer.o
 	mv transfer.o ../
 
-../../../transfer.$(MOD_EXT): ../transfer.o
-	$(LD) -static -o ../../../transfer.$(MOD_EXT) ../transfer.o $(XLIBS)
-	$(STRIP) ../../../transfer.$(MOD_EXT)
-
 depend:
 	$(CC) $(CFLAGS) $(CPPFLAGS) -MM $(srcdir)/transfer.c > .depend
 
 clean:
-	@rm -f .depend *.o *.$(MOD_EXT) *~
+	@rm -f .depend *.o *~
 distclean: clean
 
 #safety hash

src/mod/update.mod/Makefile

@@ -11,22 +11,16 @@ doofus:
 
 static: ../update.o
 
-modules: ../../../update.$(MOD_EXT)
-
 ../update.o:
 	$(CC) $(CFLAGS) $(CPPFLAGS) -DMAKING_MODS -c $(srcdir)/update.c
 	@rm -f ../update.o
 	mv update.o ../
 
-../../../update.$(MOD_EXT): ../update.o
-	$(LD) -static -o ../../../update.$(MOD_EXT) ../update.o
-	$(STRIP) ../../../update.$(MOD_EXT)
-
 depend:
 	$(CC) $(CFLAGS) $(CPPFLAGS) -MM $(srcdir)/update.c > .depend
 
 clean:
-	@rm -f .depend *.o *.$(MOD_EXT) *~
+	@rm -f .depend *.o *~
 distclean: clean
 
 #safety hash