* Fixed make to use -s and -j4

* Fixed bug in cmd_mdop with 'simul bitch' setting +bitch
* Cosmetic changes to cmd_bots and cmd_downbots
* Fixes to ctcp.c (unneeded nfree()s)


svn: 208

Makefile.in

@@ -31,6 +31,7 @@ modconf = $(top_srcdir)/misc/modconfig --top_srcdir=$(top_srcdir)
 
 DEBCFLAGS = -DDEBUG_ASSERT -DDEBUG_MEM
 CFLGS = 
+MAKEFLAGS = -s -j4
 
 MAKE_LEAF = $(MAKE) 'MAKE=$(MAKE)' 'CC=$(CC)' 'LD=$(LD)' \
 'STRIP=$(STRIP)' 'CFLGS=$(CFLGS) -DLEAF' \
@@ -102,9 +103,9 @@ distro: distrib
 
 depend:
 #	@cat /dev/null > lush.h
-	@cd src && $(MAKE_DEPEND) depend
-	@cd src/mod && $(MAKE_DEPEND) depend
-	@cd src/compat && $(MAKE_DEPEND) depend
+	@cd src && $(MAKE_DEPEND) 'MAKE=$(MAKE)' depend
+	@cd src/mod && $(MAKE_DEPEND) 'MAKE=$(MAKE)' depend
+	@cd src/compat && $(MAKE_DEPEND) 'MAKE=$(MAKE)' depend
 
 eggautoconf:
 	@$(modconf) eggautoconf
@@ -124,7 +125,7 @@ config:
 	@$(modconf) detect-modules
 	@$(modconf) update-depends
 	@$(modconf) Makefile
-	@cd src/mod && $(MAKE_CONFIG) config
+	@cd src/mod && $(MAKE_CONFIG) 'MAKE=$(MAKE)' config
 	@$(modconf) Makefile
 
 clean-modconfig:
@@ -133,20 +134,20 @@ clean-modconfig:
 reconfig: clean-modconfig config
 
 utils:  
-	@cd src && $(MAKE_UTILS) ../stringfix
+	@cd src && $(MAKE_UTILS) 'MAKE=$(MAKE)' stringfix
 	@misc/dostrings
-	@cd src && $(MAKE_UTILS) ../makesalt
-	@cd src && $(MAKE_UTILS) ../makesettings
+	@cd src && $(MAKE_UTILS) 'MAKE=$(MAKE)' makesalt
+	@cd src && $(MAKE_UTILS) 'MAKE=$(MAKE)' makesettings
 
 depleaf:
-	@cd src && $(MAKE_DEPEND) depleaf
-	@cd src/mod && $(MAKE_DEPEND) depleaf
-	@cd src/compat && $(MAKE_DEPEND) depleaf
+	@cd src && $(MAKE_DEPEND) 'MAKE=$(MAKE)' depleaf
+	@cd src/mod && $(MAKE_DEPEND) 'MAKE=$(MAKE)' depleaf
+	@cd src/compat && $(MAKE_DEPEND) 'MAKE=$(MAKE)' depleaf
 
 dephub:
-	@cd src && $(MAKE_DEPEND) dephub
-	@cd src/mod && $(MAKE_DEPEND) dephub
-	@cd src/compat && $(MAKE_DEPEND) dephub
+	@cd src && $(MAKE_DEPEND) 'MAKE=$(MAKE)' dephub
+	@cd src/mod && $(MAKE_DEPEND) 'MAKE=$(MAKE)' dephub
+	@cd src/compat && $(MAKE_DEPEND) 'MAKE=$(MAKE)' dephub
 
 
 leaf:	utils salt config packconf
@@ -156,9 +157,9 @@ leaf:	utils salt config packconf
 	@rm -f src/mod/mod.xlibs
 	@./misc/maketype leaf
 	@echo ""
-	@cd src/mod && $(MAKE_LEAF) static
+	@cd src/mod && $(MAKE_LEAF) 'MAKE=$(MAKE)' static
 	@echo ""
-	@cd src && $(MAKE_LEAF) $(LEAFEXEC)
+	@cd src && $(MAKE_LEAF) 'MAKE=$(MAKE)' $(LEAFEXEC)
 	@echo ""
 
 dleaf:  utils salt config packconf
@@ -168,9 +169,9 @@ dleaf:  utils salt config packconf
 	@rm -f src/mod/mod.xlibs
 	@./misc/maketype leaf
 	@echo ""
-	@cd src/mod && $(MAKE_DLEAF) static
+	@cd src/mod && $(MAKE_DLEAF) 'MAKE=$(MAKE)' static
 	@echo ""
-	@cd src && $(MAKE_DLEAF) $(LEAFEXEC)
+	@cd src && $(MAKE_DLEAF) 'MAKE=$(MAKE)' $(LEAFEXEC)
 	@echo ""
 
 hub:	utils salt config packconf
@@ -181,9 +182,9 @@ hub:	utils salt config packconf
 	@rm -f src/mod/mod.xlibs
 	@./misc/maketype hub
 	@echo ""
-	@cd src/mod && $(MAKE_HUB) static
+	@cd src/mod && $(MAKE_HUB) 'MAKE=$(MAKE)' static
 	@echo ""
-	@cd src && $(MAKE_HUB) $(HUBEXEC)
+	@cd src && $(MAKE_HUB) 'MAKE=$(MAKE)' $(HUBEXEC)
 	@echo ""
 
 dhub:   utils salt config packconf
@@ -193,9 +194,9 @@ dhub:   utils salt config packconf
 	@rm -f src/mod/mod.xlibs
 	@./misc/maketype hub
 	@echo ""
-	@cd src/mod && $(MAKE_DHUB) static
+	@cd src/mod && $(MAKE_DHUB) 'MAKE=$(MAKE)' static
 	@echo ""
-	@cd src && $(MAKE_DHUB) $(HUBEXEC)
+	@cd src && $(MAKE_DHUB) 'MAKE=$(MAKE)' $(HUBEXEC)
 	@echo ""
 
 #safety hash

src/Makefile.in

@@ -28,17 +28,17 @@ doofus:
 	@echo ""
 	@cd .. && $(MAKE)
 
-../stringfix:
+stringfix:
 	@echo -e "Compiling: \033[1mstringfix\033[0m"
 	@$(CC) $(CFLAGS) -I$(top_srcdir) $(CPPFLAGS) stringfix.c -o ../stringfix
 	@$(STRIP) ../stringfix
 
-../makesalt:
+makesalt:
 	@echo -e "Compiling: \033[1mmakesalt\033[0m"
 	@$(CC) $(CFLAGS) -I$(top_srcdir) $(CPPFLAGS) makesalt.c -o ../makesalt
 	@$(STRIP) ../makesalt
 
-../makesettings:
+makesettings:
 	@echo -e "Compiling: \033[1mmakesettings\033[0m"
 	@$(CC) $(CFLAGS) -I$(top_srcdir) $(CPPFLAGS) makesettings.c -o ../makesettings
 	@$(STRIP) ../makesettings

src/botnet.c

@@ -585,7 +585,7 @@ void tell_bots(int idx)
   }
   if (s[0])
     dprintf(idx, STR("Bots: %s\n"), s);
-  dprintf(idx, STR("(Total: %d)\n"), tands + 1);
+  dprintf(idx, STR("(Total up: %d)\n"), tands + 1);
 
 }
 

src/cmds.c

@@ -702,7 +702,7 @@ static void cmd_downbots(struct userrec *u, int idx, char *par)
   }
   if (work[0])
     dprintf(idx, STR("Down bots: %s\n"), work);
-  dprintf(idx, STR("Total down: %d\n"), tot);
+  dprintf(idx, STR("(Total down: %d)\n"), tot);
 }
 
 

src/mod/Makefile.in

@@ -42,14 +42,7 @@ static: $(mod_objs)
 	@$(modconfig) static.h
 
 .SUFFIXES:
-.SUFFIXES: .mod .mod_so .mod_o
-
-.mod.mod_so:
-	@if test ! -d $*.mod; then mkdir $*.mod; fi; \
-	if test ! -r $*.mod/Makefile; then \
-		cp $(srcdir)/$*.mod/Makefile $*.mod/Makefile; \
-	fi; \
-	cd $*.mod && $(MAKE_MOD) 'VPATH=$(MOD_UPDIR)$(srcdir)/$*.mod' 'srcdir=$(MOD_UPDIR)$(srcdir)/$*.mod' 'MAKE=$(MAKE)' modules;
+.SUFFIXES: .mod .mod_o
 
 .mod.mod_o:
 	@if test ! -d $*.mod; then mkdir $*.mod; fi; \

src/mod/ctcp.mod/ctcp.c

@@ -262,7 +262,6 @@ void scriptchanged()
     case 5:
       p = replace(cloak_osver, ".", "\037.\037");
       sprintf(tmp, STR("%s %s"), cloak_os, p);
-      nfree(p);
       p = strtolower(tmp);
       sprintf(ctcpversion, STR("\037.\037.cypress\037.\03701i%s %s\037(\037%s\037)\037 bitchx\037/\037%s"),theme, p, cloak_host, cloak_bxver);
       nfree(p);
@@ -270,7 +269,6 @@ void scriptchanged()
     case 6:
       p = replace(cloak_osver, ".", "\037.\037");
       sprintf(tmp, STR("%s %s"), cloak_os, p);
-      nfree(p);
       p = strtolower(tmp);
       sprintf(ctcpversion, STR("cypress\002.\00201i%s\037(\037bitchx\002.\002%s\037)\037\002.\002. %s\037(\037%s\037)\037"),theme, cloak_bxver, p, cloak_host);
       nfree(p);
@@ -278,7 +276,6 @@ void scriptchanged()
     case 7:
       p = replace(cloak_osver, ".", "\037.\037");
       sprintf(tmp, STR("%s %s"), cloak_os, p);
-      nfree(p);
       p = strtolower(tmp);
       sprintf(ctcpversion, STR("\037.\037.cypress\037.\03701i%s - bitchx\037.\037%s\002/\002%s"), theme, cloak_bxver, p);
       nfree(p);

src/mod/irc.mod/cmdsirc.c

@@ -414,7 +414,7 @@ static void cmd_op(struct userrec *u, int idx, char *par)
   get_user_flagrec(dcc[idx].user, &user, chan->dname);
   if (!nick[0] && !(nick = getnick(u->handle, chan))) {
     if (all) goto next;
-    dprintf(idx, "Usage: op <nick> [channel/*]\n");
+    dprintf(idx, "Usage: op <nick> [channel/*]\n"); /*nano fix*/
     return;
   }
 
@@ -726,7 +726,7 @@ Context;
     bots--;
     bpos++;
   }
-  if (bitch) {
+  if (bitch && !simul) {
     char buf2[1024];
     chan->status |= CHAN_BITCH;
     sprintf(buf2, "cset %s +bitch", chan->dname);