Przeglądaj źródła

Exported degarble() to modules
Fixed a Makefile bug
Exported stringfix to blowfish.mod for testing


svn: 96

Bryan Drewery 23 lat temu
rodzic
commit
aaaefcd21b
4 zmienionych plików z 9 dodań i 7 usunięć
  1. 4 4
      Makefile.in
  2. 2 2
      src/Makefile.in
  3. 1 0
      src/mod/module.h
  4. 2 1
      src/modules.c

+ 4 - 4
Makefile.in

@@ -200,7 +200,7 @@ dephub:
 	@cd src/compat && $(MAKE_DEPEND) dephub
 
 
-leaf:	packconf salt config
+leaf:	utils salt config
 	@echo ""
 	@echo "Making leaf"
 	@echo ""
@@ -212,7 +212,7 @@ leaf:	packconf salt config
 	@cd src && $(MAKE_LEAF) $(LEAFEXEC)
 	@echo ""
 
-dleaf:  packconf salt config
+dleaf:  utils salt config
 	@echo ""
 	@echo "Making debug leaf"
 	@echo ""
@@ -224,7 +224,7 @@ dleaf:  packconf salt config
 	@cd src; $(MAKE_DLEAF) $(LEAFEXEC)
 	@echo ""
 
-hub:	packconf salt config
+hub:	utils salt config
 	@echo ""
 	@echo "Making hub"
 	@echo ""
@@ -237,7 +237,7 @@ hub:	packconf salt config
 	@cd src && $(MAKE_HUB) $(HUBEXEC)
 	@echo ""
 
-dhub:   packconf salt config
+dhub:   utils salt config
 	@echo ""
 	@echo "Making debug hub"
 	@echo ""

+ 2 - 2
src/Makefile.in

@@ -65,7 +65,7 @@ build_msg:
 
 
 main.o: ../stringfix
-	cp -f main.c xmain.c
+	@cp -f main.c xmain.c
 	../stringfix xmain.c
 	$(CC) $(CFLAGS) -I$(top_srcdir) $(CPPFLAGS) '-DCCFLAGS="$(CC) $(CFLAGS) $(CPPFLAGS)"' \
 	'-DLDFLAGS="$(LD)"' '-DSTRIPFLAGS="$(STRIP)"' -c $(srcdir)/xmain.c -o main.o
@@ -93,7 +93,7 @@ eggdrop.h:
 
 
 .c.o:   ../stringfix
-	cp -f $< x$<
+	@cp -f $< x$<
 	../stringfix x$<
 	$(CC) $(CFLAGS) -I$(top_srcdir) $(CPPFLAGS) '-DCCFLAGS="$(CC) $(CFLAGS) -I$(top_srcdir) \
         $(CPPFLAGS)"' '-DLDFLAGS="$(LD)"' \

+ 1 - 0
src/mod/module.h

@@ -522,6 +522,7 @@
 /* 325 - 328 */
 #define cmdprefix ((char *)(global[325]))
 #define replace ((char*(*)(char *, char *, char *))global[326])
+#define degarble ((char *(*)(int, char *))global[327])
 
 
 /* This is for blowfish module, couldnt be bothered making a whole new .h

+ 2 - 1
src/modules.c

@@ -561,7 +561,8 @@ Function global_table[] =
   (Function) myip,
   (Function) myip6,
   (Function) cmdprefix,
-  (Function) replace
+  (Function) replace,
+  (Function) degarble
 
 
 };