[ScryMUD] SVN Commit Info r854 - in trunk/mud: . grrmud/server include lib lib/bitfield lib/containers lib/log lib/string2

scrymud at wanfear.com scrymud at wanfear.com
Sat Feb 3 05:16:46 PST 2007


Author: eroper
Date: 2007-02-03 05:16:45 -0800 (Sat, 03 Feb 2007)
New Revision: 854

Modified:
   trunk/mud/Makefile
   trunk/mud/grrmud/server/Makefile
   trunk/mud/grrmud/server/gen_cmds.spec
   trunk/mud/include/README
   trunk/mud/lib/Makefile
   trunk/mud/lib/bitfield/Makefile
   trunk/mud/lib/containers/Makefile
   trunk/mud/lib/log/Makefile
   trunk/mud/lib/string2/Makefile
Log:
Did quite a bit of cleaning on the Makefiles. The top level Makefile in
particular still needs some work, as does the grrmud/server/Makefile library
dependancy.

In general it should be safe to edit away and do another make without cleaning
first (yay!). There is also no need (or support) for an explicit "make depend"

These changes do make us heavily dependant on both GNU Make and GCC, though I'm
pretty sure we already had that dependancy.

Fixed a return() omission in gen_cmds.spec that was causing a compile time
warning.

Fixed a misspelled word in include/README.


Modified: trunk/mud/Makefile
===================================================================
--- trunk/mud/Makefile	2007-01-30 02:16:21 UTC (rev 853)
+++ trunk/mud/Makefile	2007-02-03 13:16:45 UTC (rev 854)
@@ -1,5 +1,5 @@
 # $Id$
-# $Revision: 1.14 $  $Author$ $Date$
+# $Revision$  $Author$ $Date$
 
 #  Makefile for Hegemon and ScryMUD
 
@@ -40,6 +40,7 @@
 #NOTE:  if you are installing for the first time, you will probably want
 #       to use the install target, example:  make install
 
+.PHONY: all
 all: scry_dist_all
 
 
@@ -48,6 +49,7 @@
 # one MUD to another machine.
 # source, world, boards, help, log, etc
 
+.PHONY: scry_dist_all
 scry_dist_all: scry_dist_misc scry_dist_core scry_dist_world
 	rm -f grrmud/server/BuildInfo.cc  #Autogenerated file.
 	rm -f scry_dist_all$(SCRY_VERSION).tar.gz
@@ -59,36 +61,40 @@
 	gzip scry_dist_all${SCRY_VERSION}.tar
 
 
+.PHONY: scry_dist_misc
 scry_dist_misc:
 	rm -f scry_dist_misc$(SCRY_VERSION).tar.gz
 	tar -cvf scry_dist_misc$(SCRY_VERSION).tar ${MISC_FILES}
 	gzip scry_dist_misc$(SCRY_VERSION).tar
 
 #  Build a binary (minus the world DB) distribution.
+.PHONY: scry_dist_core
 scry_dist_core: build_html_pages
 	rm -f scry_dist_core$(SCRY_VERSION).tar.gz
 	tar -cvf scry_dist_core$(SCRY_VERSION).tar ${CORE_FILES}
 	gzip scry_dist_core$(SCRY_VERSION).tar
 
-
+.PHONY: scry_dist_world
 scry_dist_world:
 	${MAKE} -C ./grrmud/World dist
 
+.PHONY: scry_archive_world
 scry_archive_world:
 	${MAKE} -C ./grrmud/World archive
 
-
+.PHONY: archive
 archive: scry_archive_world
 	tar -cvf scry_archive.${CUR_DATE}.tar ${CORE_FILES} \
 		grrmud/World/wrld.${CUR_DATE}.tar.gz \
 		${MISC_FILES}
 	gzip scry_archive.${CUR_DATE}.tar
 
+.PHONY: new_rel
 new_rel:
 	${MAKE} -C ./grrmud/server new_binary
 	${MAKE} -C ./grrmud/World new_db
 
-
+.PHONY: install
 install: build_scry_bin
 	@echo "If you fail after this step, please read this makefile"
 	@echo "and figure out what to do.  It is not complex, just creating"
@@ -107,26 +113,29 @@
 	@echo "startup&, or nohup startup& if you are dialing in.."
 	@echo ""
 
+.PHONY: build_lib_includes
 build_lib_includes:
 	${MAKE} -C ./lib all
 
-
+.PHONY: build_scry_bin
 build_scry_bin: build_lib_includes
 	${MAKE} -C ./grrmud/server all
 
-
+.PHONY: build_html_pages
 build_html_pages: build_help_filter
 	${MAKE} -C ./grrmud/Help all
 
-
+.PHONY: build_help_filter
 build_help_filter:
 	${MAKE} -C ./grrmud/help_filter all
 
+.PHONY: clean
 clean:
 	${MAKE} -C grrmud/server clean
 	rm -f scry_dist*
 	rm -f scry_core$(SCRY_VERSION).tar
 
+.PHONY: purge
 purge: clean
 	${MAKE} -C grrmud/server purge
 	find . -name "*~" -exec rm {} \;

Modified: trunk/mud/grrmud/server/Makefile
===================================================================
--- trunk/mud/grrmud/server/Makefile	2007-01-30 02:16:21 UTC (rev 853)
+++ trunk/mud/grrmud/server/Makefile	2007-02-03 13:16:45 UTC (rev 854)
@@ -4,29 +4,15 @@
 # makefile template
 include ../../MakeInclude
 
+generated_TARGS = lang_strings.h parse_gen.h lang_strings.cc parse_gen.cc
 
-CODE_GEN_SRCS = code_gen.cc
-CODE_GEN_OBJS = code_gen.o
-CODE_GEN_TARG = ./code_gen
+code_gen_OBJS = code_gen.o
+code_gen_TARG = code_gen
 
-AUDIT_SRCS = audit.cc
-AUDIT_OBJS = audit.o
-AUDIT_TARG = ./audit
+audit_OBJS = audit.o
+audit_TARG = audit
 
-GEN_TARGS = lang_strings.h parse_gen.h lang_strings.cc parse_gen.cc
-
-SRCS  = parse_gen.cc lang_strings.cc classes.cc object.cc critter.cc \
-Filters.cc room.cc door.cc skills.cc command3.cc \
-grrmud.cc commands.cc command2.cc socials.cc spells.cc \
-olc.cc load_wld.cc misc.cc misc2.cc parse.cc battle.cc spec_prc.cc \
-login.cc command4.cc olc2.cc command5.cc batl_prc.cc spells2.cc \
-ez_spll.cc dam_spll.cc trv_spll.cc rm_spll.cc dam_skll.cc wep_skll.cc \
-ez_skll.cc social2.cc cr_skll.cc ar_skll.cc pet_spll.cc vehicle.cc \
-script.cc SkillSpell.cc zone.cc rm_parse.cc rm_cmds.cc obj_parse.cc \
-obj_cmds.cc BugEntry.cc MudStats.cc clients.cc ServerConfig.cc mapper.cc \
-regex.cc
-
-OBJS = parse_gen.o lang_strings.o classes.o object.o critter.o \
+grrmud_OBJS = parse_gen.o lang_strings.o classes.o object.o critter.o \
 Filters.o room.o door.o skills.o command3.o \
 grrmud.o commands.o command2.o socials.o spells.o olc.o \
 load_wld.o misc.o misc2.o parse.o battle.o spec_prc.o login.o \
@@ -36,800 +22,97 @@
 script.o SkillSpell.o zone.o rm_parse.o rm_cmds.o obj_parse.o \
 obj_cmds.o BuildInfo.o BugEntry.o MudStats.o clients.o ServerConfig.o \
 mapper.o regex.o
+grrmud_TARG = grrmud
 
 GEN_SPEC = gen_cmds.spec
 LANG_SPEC = translations.spec translations_classes.spec translation2.spec \
 translation4.spec translation_olc.spec translation_spell.spec \
 translation_battle.spec translation_skill.spec translation5.spec
 
-TARG = grrmud                                 #program to be created
+${grrmud_TARG}: libs ${generated_TARGS} $(grrmud_OBJS) 
+	@echo Linking $@
+	@$(CCC) $(CCFLAGS) $(LDFLAGS) -o ${grrmud_TARG} $(grrmud_OBJS) $(LDLIBS)
 
-all: ${TARG} ${AUDIT_TARG}
-
-${TARG}: libs ${GEN_TARGS} $(OBJS) 
-	$(CCC) $(CCFLAGS) $(LDFLAGS) -o ${TARG} $(OBJS) $(LDLIBS)
-
+# TODO (eroper): I haven't tracked down why this note is here yet
 # This should really depend on libs too, but my libs make is lazy,
 # and that causes this to be rebuilt each time.  By making TARG,
 # as above, I think libs will be up to date, but you may have to
-# specifically re-build the CODE_GEN_TARG if changes to the libs
+# specifically re-build the code_gen_TARG if changes to the libs
 # would have affected it. --BEN
-${CODE_GEN_TARG}: ${CODE_GEN_OBJS}
-	$(CCC) $(CCFLAGS) $(LDFLAGS) -o ${CODE_GEN_TARG} $(CODE_GEN_OBJS) $(LDLIBS)
+${code_gen_TARG}: ${code_gen_OBJS}
+	@echo Linking $@
+	@$(CCC) $(CCFLAGS) $(LDFLAGS) -o ${code_gen_TARG} $(code_gen_OBJS) $(LDLIBS)
 
-${AUDIT_TARG}: libs ${AUDIT_OBJS}
-	$(CCC) $(CCFLAGS) $(LDFLAGS) -o ${AUDIT_TARG} $(AUDIT_OBJS) $(LDLIBS)
-	cp ${AUDIT_TARG} ${TOOL_BIN_DIR}/
+${audit_TARG}: libs ${audit_OBJS}
+	@echo Linking $@
+	@$(CCC) $(CCFLAGS) $(LDFLAGS) -o ${audit_TARG} $(audit_OBJS) $(LDLIBS)
+# this should go in an install target
+#@cp ${audit_TARG} ${TOOL_BIN_DIR}/
 
-new_binary: ${TARG}
-	rm -f ${MUD_HOME}/grrmud/gmud.new
-	cp ${TARG} ${MUD_HOME}/grrmud/gmud.new
+Subversion-Revision: 
+	@echo Generating $@
+	@svn info |grep Revision |awk '{print $$2}' >Subversion-Revision
 
-$(OBJS): %.o: %.cc %.h
-	@echo "Making $<"
-	@$(CC) $(CCFLAGS) \
-	-c $<
-
-Subversion-Revision:
-	svn info |grep Revision |awk '{print $$2}' >Subversion-Revision
-
 BuildInfo.cc: $(SRCS) Makefile BuildInfo.prefix Subversion-Revision
-	cat BuildInfo.prefix > BuildInfo.cc
-	echo "const char* BuildInfo::getBuildMachine() { return \"`uname -mrspn`\"; }" >> BuildInfo.cc
-	echo "" >> BuildInfo.cc
-	echo "const char* BuildInfo::getBuilder() { return \"`whoami`\"; }" >> BuildInfo.cc
-	echo "" >> BuildInfo.cc
-	echo "const char* BuildInfo::getBuildDate() { return \"`date`\"; }" >> BuildInfo.cc
-	echo "" >> BuildInfo.cc
-	echo "const char* BuildInfo::getVersion() { return \"${SCRY_VERSION}\"; }" >> BuildInfo.cc
-	echo "" >> BuildInfo.cc
-	echo "const char* BuildInfo::getRevision() { return \"`cat Subversion-Revision`\"; }" >> BuildInfo.cc
+	@echo "Generating $@"
+	@cat BuildInfo.prefix > BuildInfo.cc
+	@echo "const char* BuildInfo::getBuildMachine() { return \"`uname -mrspn`\"; }" >> BuildInfo.cc
+	@echo "" >> BuildInfo.cc
+	@echo "const char* BuildInfo::getBuilder() { return \"`whoami`\"; }" >> BuildInfo.cc
+	@echo "" >> BuildInfo.cc
+	@echo "const char* BuildInfo::getBuildDate() { return \"`date`\"; }" >> BuildInfo.cc
+	@echo "" >> BuildInfo.cc
+	@echo "const char* BuildInfo::getVersion() { return \"${SCRY_VERSION}\"; }" >> BuildInfo.cc
+	@echo "" >> BuildInfo.cc
+	@echo "const char* BuildInfo::getRevision() { return \"`cat Subversion-Revision`\"; }" >> BuildInfo.cc
 
+parse_gen.cc: ${code_gen_TARG} ${GEN_SPEC}
+parse_gen.h: ${code_gen_TARG} ${GEN_SPEC}
+	@echo Generating $@
+	@./${code_gen_TARG} -C ${GEN_SPEC} parse_gen.cc parse_gen.h
 
-parse_gen.cc: ${CODE_GEN_TARG} ${GEN_SPEC}
-parse_gen.h: ${CODE_GEN_TARG} ${GEN_SPEC}
-	@${CODE_GEN_TARG} -C ${GEN_SPEC} parse_gen.cc parse_gen.h
 
+lang_strings.cc: ${code_gen_TARG} ${LANG_SPEC}
+lang_strings.h: ${code_gen_TARG} ${LANG_SPEC}
+	@echo Generating $@
+	@./${code_gen_TARG} -L ${LANG_SPEC} lang_strings.cc lang_strings.h
 
-lang_strings.cc: ${CODE_GEN_TARG} ${LANG_SPEC}
-lang_strings.h: ${CODE_GEN_TARG} ${LANG_SPEC}
-	${CODE_GEN_TARG} -L ${LANG_SPEC} lang_strings.cc lang_strings.h
+%.o : %.cc
+	@echo "Compiling $<"
+	@$(CCC) $(CCFLAGS) -c -MD -o $@ $<
+	@cp $*.d $*.P; \
+		sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
+		    -e '/^$$/ d' -e 's/$$/ :/' < $*.d >> $*.P; \
+		rm -f $*.d
 
+-include $(OBJS:%.o=%.P)
 
-$(CODE_GEN_OBJS): %.o: %.cc %.h
-	@echo "Making $<"
-	@$(CC) $(CCFLAGS) -c $<
-
-$(AUDIT_OBJS): %.o: %.cc %.h
-	@echo "Making $<"
-	@$(CC) $(CCFLAGS) -c $<
-
+.PHONY: libs
 libs:
 	${MAKE} -C ${MUD_HOME}/lib all
 
-
-#depend:
-#makedepend $(SRCS)
-
+.PHONY: clean
 clean:
-	rm -f *.o ${GEN_TARGS} BuildInfo.cc parse_gen.cc parse_gen.h
-	rm -f lang_strings.h lang_strings.cc
-	rm -f Subversion-Revision
-	${MAKE} -C ../../lib clean
+	@echo "Cleaning"
+	@rm -f *.o ${generated_TARGS} BuildInfo.cc parse_gen.cc parse_gen.h
+	@rm -f lang_strings.h lang_strings.cc
+	@rm -f Subversion-Revision
+	@rm -f *.P
+	@echo "Cleaning ../../lib"
+	@${MAKE} -C ../../lib clean
 
+.PHONY: purge
 purge: clean
-	rm -f *~
-	rm -f *.flc
-	rm -f ${TARG} ${CODE_GEN_TARG} ${AUDIT_TARG}
+	@rm -f *~
+	@rm -f *.flc
+	@rm -f ${grrmud_TARG} ${code_gen_TARG} ${audit_TARG}
 
+.PHONY: all
+all: ${grrmud_TARG} ${audit_TARG}
 
-#DO NOT DELETE THIS LINE -- make depend depends on it.
+.PHONY: new_binary
+new_binary: ${grrmud_TARG}
+	# again, maybe an install target
+	#@rm -f ${MUD_HOME}/grrmud/gmud.new
+	#@cp ${grrmud_TARG} ${MUD_HOME}/grrmud/gmud.new
 
-# DO NOT DELETE
-
-BugEntry.o: BugEntry.cc BugEntry.h critter.h \
-  ${MUD_HOME}/include/bitfield.h \
-  ${MUD_HOME}/include/string2.h \
-  ${MUD_HOME}/include/LogStream.h classes.h \
-  ${MUD_HOME}/include/list2.h script.h const.h \
-  ${MUD_HOME}/include/rb_tree.h \
-  ${MUD_HOME}/include/rb_tree.cc \
-  ${MUD_HOME}/include/PtrArray.h \
-  ${MUD_HOME}/include/PtrArray.cc ServerConfig.h \
-  ${MUD_HOME}/include/KVPair.h object.h door.h room.h \
-  commands.h lang_strings.h battle.h misc2.h
-Filters.o: Filters.cc Filters.h critter.h \
-  ${MUD_HOME}/include/bitfield.h \
-  ${MUD_HOME}/include/string2.h \
-  ${MUD_HOME}/include/LogStream.h classes.h \
-  ${MUD_HOME}/include/list2.h script.h const.h \
-  ${MUD_HOME}/include/rb_tree.h \
-  ${MUD_HOME}/include/rb_tree.cc \
-  ${MUD_HOME}/include/PtrArray.h \
-  ${MUD_HOME}/include/PtrArray.cc ServerConfig.h \
-  ${MUD_HOME}/include/KVPair.h object.h door.h room.h \
-  commands.h lang_strings.h battle.h misc2.h misc.h zone.h \
-  ${MUD_HOME}/include/tree2.h BugEntry.h SkillSpell.h \
-  MudStats.h
-MudStats.o: MudStats.cc MudStats.h const.h \
-  ${MUD_HOME}/include/list2.h \
-  ${MUD_HOME}/include/LogStream.h \
-  ${MUD_HOME}/include/string2.h \
-  ${MUD_HOME}/include/rb_tree.h \
-  ${MUD_HOME}/include/rb_tree.cc \
-  ${MUD_HOME}/include/bitfield.h \
-  ${MUD_HOME}/include/PtrArray.h \
-  ${MUD_HOME}/include/PtrArray.cc ServerConfig.h \
-  critter.h classes.h script.h \
-  ${MUD_HOME}/include/KVPair.h object.h door.h room.h \
-  commands.h lang_strings.h battle.h
-ServerConfig.o: ServerConfig.cc ServerConfig.h \
-  ${MUD_HOME}/include/string2.h \
-  ${MUD_HOME}/include/LogStream.h
-SkillSpell.o: SkillSpell.cc const.h \
-  ${MUD_HOME}/include/list2.h \
-  ${MUD_HOME}/include/LogStream.h \
-  ${MUD_HOME}/include/string2.h \
-  ${MUD_HOME}/include/rb_tree.h \
-  ${MUD_HOME}/include/rb_tree.cc \
-  ${MUD_HOME}/include/bitfield.h \
-  ${MUD_HOME}/include/PtrArray.h \
-  ${MUD_HOME}/include/PtrArray.cc ServerConfig.h \
-  SkillSpell.h object.h classes.h script.h \
-  ${MUD_HOME}/include/KVPair.h critter.h door.h room.h \
-  commands.h lang_strings.h battle.h misc.h zone.h \
-  ${MUD_HOME}/include/tree2.h BugEntry.h MudStats.h \
-  misc2.h dam_spll.h spells.h
-ar_skll.o: ar_skll.cc misc.h \
-  ${MUD_HOME}/include/string2.h \
-  ${MUD_HOME}/include/LogStream.h classes.h \
-  ${MUD_HOME}/include/bitfield.h \
-  ${MUD_HOME}/include/list2.h script.h const.h \
-  ${MUD_HOME}/include/rb_tree.h \
-  ${MUD_HOME}/include/rb_tree.cc \
-  ${MUD_HOME}/include/PtrArray.h \
-  ${MUD_HOME}/include/PtrArray.cc ServerConfig.h \
-  ${MUD_HOME}/include/KVPair.h object.h critter.h \
-  door.h room.h commands.h lang_strings.h battle.h zone.h \
-  ${MUD_HOME}/include/tree2.h BugEntry.h SkillSpell.h \
-  MudStats.h misc2.h spells.h ar_skll.h skills.h batl_prc.h
-audit.o: audit.cc audit.h \
-  ${MUD_HOME}/include/string2.h \
-  ${MUD_HOME}/include/LogStream.h
-batl_prc.o: batl_prc.cc battle.h classes.h \
-  ${MUD_HOME}/include/string2.h \
-  ${MUD_HOME}/include/LogStream.h \
-  ${MUD_HOME}/include/bitfield.h \
-  ${MUD_HOME}/include/list2.h script.h const.h \
-  ${MUD_HOME}/include/rb_tree.h \
-  ${MUD_HOME}/include/rb_tree.cc \
-  ${MUD_HOME}/include/PtrArray.h \
-  ${MUD_HOME}/include/PtrArray.cc ServerConfig.h \
-  ${MUD_HOME}/include/KVPair.h room.h critter.h \
-  object.h door.h lang_strings.h commands.h batl_prc.h command2.h \
-  command3.h command4.h command5.h \
-  ${MUD_HOME}/include/tree2.h misc.h zone.h BugEntry.h \
-  SkillSpell.h MudStats.h misc2.h spells.h trv_spll.h skills.h rm_spll.h \
-  spells2.h wep_skll.h dam_spll.h dam_skll.h ez_spll.h socials.h \
-  social2.h ar_skll.h
-battle.o: battle.cc battle.h classes.h \
-  ${MUD_HOME}/include/string2.h \
-  ${MUD_HOME}/include/LogStream.h \
-  ${MUD_HOME}/include/bitfield.h \
-  ${MUD_HOME}/include/list2.h script.h const.h \
-  ${MUD_HOME}/include/rb_tree.h \
-  ${MUD_HOME}/include/rb_tree.cc \
-  ${MUD_HOME}/include/PtrArray.h \
-  ${MUD_HOME}/include/PtrArray.cc ServerConfig.h \
-  ${MUD_HOME}/include/KVPair.h room.h critter.h \
-  object.h door.h lang_strings.h commands.h misc.h zone.h \
-  ${MUD_HOME}/include/tree2.h BugEntry.h SkillSpell.h \
-  MudStats.h misc2.h spec_prc.h command2.h command3.h spells.h spells2.h \
-  skills.h load_wld.h Filters.h batl_prc.h clients.h
-classes.o: classes.cc classes.h \
-  ${MUD_HOME}/include/string2.h \
-  ${MUD_HOME}/include/LogStream.h \
-  ${MUD_HOME}/include/bitfield.h \
-  ${MUD_HOME}/include/list2.h script.h const.h \
-  ${MUD_HOME}/include/rb_tree.h \
-  ${MUD_HOME}/include/rb_tree.cc \
-  ${MUD_HOME}/include/PtrArray.h \
-  ${MUD_HOME}/include/PtrArray.cc ServerConfig.h \
-  ${MUD_HOME}/include/KVPair.h misc.h object.h \
-  critter.h door.h room.h commands.h lang_strings.h battle.h zone.h \
-  ${MUD_HOME}/include/tree2.h BugEntry.h SkillSpell.h \
-  MudStats.h misc2.h command5.h command4.h BuildInfo.h
-clients.o: clients.cc clients.h \
-  ${MUD_HOME}/include/LogStream.h
-code_gen.o: code_gen.cc ${MUD_HOME}/include/string2.h \
-  ${MUD_HOME}/include/LogStream.h code_gen.h \
-  ${MUD_HOME}/include/list2.h \
-  ${MUD_HOME}/include/PtrArray.h \
-  ${MUD_HOME}/include/bitfield.h \
-  ${MUD_HOME}/include/PtrArray.cc
-command2.o: command2.cc commands.h const.h \
-  ${MUD_HOME}/include/list2.h \
-  ${MUD_HOME}/include/LogStream.h \
-  ${MUD_HOME}/include/string2.h \
-  ${MUD_HOME}/include/rb_tree.h \
-  ${MUD_HOME}/include/rb_tree.cc \
-  ${MUD_HOME}/include/bitfield.h \
-  ${MUD_HOME}/include/PtrArray.h \
-  ${MUD_HOME}/include/PtrArray.cc ServerConfig.h \
-  classes.h script.h ${MUD_HOME}/include/KVPair.h \
-  critter.h object.h door.h room.h lang_strings.h battle.h command2.h \
-  command3.h command4.h command5.h misc.h zone.h \
-  ${MUD_HOME}/include/tree2.h BugEntry.h SkillSpell.h \
-  MudStats.h misc2.h spec_prc.h spells.h skills.h parse.h parse_gen.h \
-  ar_skll.h cr_skll.h social2.h ez_skll.h dam_skll.h olc.h olc2.h \
-  socials.h wep_skll.h load_wld.h clients.h
-command3.o: command3.cc commands.h const.h \
-  ${MUD_HOME}/include/list2.h \
-  ${MUD_HOME}/include/LogStream.h \
-  ${MUD_HOME}/include/string2.h \
-  ${MUD_HOME}/include/rb_tree.h \
-  ${MUD_HOME}/include/rb_tree.cc \
-  ${MUD_HOME}/include/bitfield.h \
-  ${MUD_HOME}/include/PtrArray.h \
-  ${MUD_HOME}/include/PtrArray.cc ServerConfig.h \
-  classes.h script.h ${MUD_HOME}/include/KVPair.h \
-  critter.h object.h door.h room.h lang_strings.h battle.h command2.h \
-  command3.h command4.h misc.h zone.h \
-  ${MUD_HOME}/include/tree2.h BugEntry.h SkillSpell.h \
-  MudStats.h misc2.h spec_prc.h spells.h skills.h command5.h load_wld.h
-command4.o: command4.cc commands.h const.h \
-  ${MUD_HOME}/include/list2.h \
-  ${MUD_HOME}/include/LogStream.h \
-  ${MUD_HOME}/include/string2.h \
-  ${MUD_HOME}/include/rb_tree.h \
-  ${MUD_HOME}/include/rb_tree.cc \
-  ${MUD_HOME}/include/bitfield.h \
-  ${MUD_HOME}/include/PtrArray.h \
-  ${MUD_HOME}/include/PtrArray.cc ServerConfig.h \
-  classes.h script.h ${MUD_HOME}/include/KVPair.h \
-  critter.h object.h door.h room.h lang_strings.h battle.h command2.h \
-  command3.h command4.h command5.h olc2.h misc.h zone.h \
-  ${MUD_HOME}/include/tree2.h BugEntry.h SkillSpell.h \
-  MudStats.h misc2.h spec_prc.h spells.h skills.h load_wld.h vehicle.h \
-  regex.h
-command5.o: command5.cc commands.h const.h \
-  ${MUD_HOME}/include/list2.h \
-  ${MUD_HOME}/include/LogStream.h \
-  ${MUD_HOME}/include/string2.h \
-  ${MUD_HOME}/include/rb_tree.h \
-  ${MUD_HOME}/include/rb_tree.cc \
-  ${MUD_HOME}/include/bitfield.h \
-  ${MUD_HOME}/include/PtrArray.h \
-  ${MUD_HOME}/include/PtrArray.cc ServerConfig.h \
-  classes.h script.h ${MUD_HOME}/include/KVPair.h \
-  critter.h object.h door.h room.h lang_strings.h battle.h command2.h \
-  command3.h command4.h command5.h misc.h zone.h \
-  ${MUD_HOME}/include/tree2.h BugEntry.h SkillSpell.h \
-  MudStats.h misc2.h spec_prc.h spells.h skills.h batl_prc.h load_wld.h \
-  olc.h BuildInfo.h clients.h vehicle.h
-commands.o: commands.cc rm_spll.h const.h \
-  ${MUD_HOME}/include/list2.h \
-  ${MUD_HOME}/include/LogStream.h \
-  ${MUD_HOME}/include/string2.h \
-  ${MUD_HOME}/include/rb_tree.h \
-  ${MUD_HOME}/include/rb_tree.cc \
-  ${MUD_HOME}/include/bitfield.h \
-  ${MUD_HOME}/include/PtrArray.h \
-  ${MUD_HOME}/include/PtrArray.cc ServerConfig.h \
-  classes.h script.h ${MUD_HOME}/include/KVPair.h \
-  command4.h room.h critter.h object.h door.h lang_strings.h battle.h \
-  commands.h dam_spll.h spells.h ez_spll.h trv_spll.h command2.h \
-  command5.h misc.h zone.h ${MUD_HOME}/include/tree2.h \
-  BugEntry.h SkillSpell.h MudStats.h misc2.h spec_prc.h batl_prc.h \
-  spells2.h skills.h pet_spll.h load_wld.h Filters.h clients.h
-const.o: const.cc ${MUD_HOME}/include/string2.h \
-  ${MUD_HOME}/include/LogStream.h const.h \
-  ${MUD_HOME}/include/list2.h \
-  ${MUD_HOME}/include/rb_tree.h \
-  ${MUD_HOME}/include/rb_tree.cc \
-  ${MUD_HOME}/include/bitfield.h \
-  ${MUD_HOME}/include/PtrArray.h \
-  ${MUD_HOME}/include/PtrArray.cc ServerConfig.h \
-  critter.h classes.h script.h \
-  ${MUD_HOME}/include/KVPair.h object.h door.h room.h \
-  commands.h lang_strings.h battle.h
-cr_skll.o: cr_skll.cc misc.h \
-  ${MUD_HOME}/include/string2.h \
-  ${MUD_HOME}/include/LogStream.h classes.h \
-  ${MUD_HOME}/include/bitfield.h \
-  ${MUD_HOME}/include/list2.h script.h const.h \
-  ${MUD_HOME}/include/rb_tree.h \
-  ${MUD_HOME}/include/rb_tree.cc \
-  ${MUD_HOME}/include/PtrArray.h \
-  ${MUD_HOME}/include/PtrArray.cc ServerConfig.h \
-  ${MUD_HOME}/include/KVPair.h object.h critter.h \
-  door.h room.h commands.h lang_strings.h battle.h zone.h \
-  ${MUD_HOME}/include/tree2.h BugEntry.h SkillSpell.h \
-  MudStats.h misc2.h spells.h skills.h batl_prc.h cr_skll.h load_wld.h
-critter.o: critter.cc script.h const.h \
-  ${MUD_HOME}/include/list2.h \
-  ${MUD_HOME}/include/LogStream.h \
-  ${MUD_HOME}/include/string2.h \
-  ${MUD_HOME}/include/rb_tree.h \
-  ${MUD_HOME}/include/rb_tree.cc \
-  ${MUD_HOME}/include/bitfield.h \
-  ${MUD_HOME}/include/PtrArray.h \
-  ${MUD_HOME}/include/PtrArray.cc ServerConfig.h \
-  classes.h ${MUD_HOME}/include/KVPair.h critter.h \
-  object.h door.h room.h commands.h lang_strings.h battle.h misc.h zone.h \
-  ${MUD_HOME}/include/tree2.h BugEntry.h SkillSpell.h \
-  MudStats.h misc2.h command2.h command3.h command5.h batl_prc.h \
-  clients.h
-dam_skll.o: dam_skll.cc misc.h \
-  ${MUD_HOME}/include/string2.h \
-  ${MUD_HOME}/include/LogStream.h classes.h \
-  ${MUD_HOME}/include/bitfield.h \
-  ${MUD_HOME}/include/list2.h script.h const.h \
-  ${MUD_HOME}/include/rb_tree.h \
-  ${MUD_HOME}/include/rb_tree.cc \
-  ${MUD_HOME}/include/PtrArray.h \
-  ${MUD_HOME}/include/PtrArray.cc ServerConfig.h \
-  ${MUD_HOME}/include/KVPair.h object.h critter.h \
-  door.h room.h commands.h lang_strings.h battle.h zone.h \
-  ${MUD_HOME}/include/tree2.h BugEntry.h SkillSpell.h \
-  MudStats.h misc2.h spells.h skills.h batl_prc.h dam_skll.h
-dam_spll.o: dam_spll.cc dam_spll.h const.h \
-  ${MUD_HOME}/include/list2.h \
-  ${MUD_HOME}/include/LogStream.h \
-  ${MUD_HOME}/include/string2.h \
-  ${MUD_HOME}/include/rb_tree.h \
-  ${MUD_HOME}/include/rb_tree.cc \
-  ${MUD_HOME}/include/bitfield.h \
-  ${MUD_HOME}/include/PtrArray.h \
-  ${MUD_HOME}/include/PtrArray.cc ServerConfig.h \
-  classes.h script.h ${MUD_HOME}/include/KVPair.h \
-  spells.h room.h critter.h object.h door.h lang_strings.h battle.h \
-  commands.h command2.h misc.h zone.h \
-  ${MUD_HOME}/include/tree2.h BugEntry.h SkillSpell.h \
-  MudStats.h misc2.h skills.h
-door.o: door.cc door.h ${MUD_HOME}/include/bitfield.h \
-  ${MUD_HOME}/include/string2.h \
-  ${MUD_HOME}/include/LogStream.h \
-  ${MUD_HOME}/include/list2.h classes.h script.h \
-  const.h ${MUD_HOME}/include/rb_tree.h \
-  ${MUD_HOME}/include/rb_tree.cc \
-  ${MUD_HOME}/include/PtrArray.h \
-  ${MUD_HOME}/include/PtrArray.cc ServerConfig.h \
-  ${MUD_HOME}/include/KVPair.h room.h critter.h \
-  object.h lang_strings.h battle.h commands.h misc.h zone.h \
-  ${MUD_HOME}/include/tree2.h BugEntry.h SkillSpell.h \
-  MudStats.h misc2.h
-ez_skll.o: ez_skll.cc misc.h \
-  ${MUD_HOME}/include/string2.h \
-  ${MUD_HOME}/include/LogStream.h classes.h \
-  ${MUD_HOME}/include/bitfield.h \
-  ${MUD_HOME}/include/list2.h script.h const.h \
-  ${MUD_HOME}/include/rb_tree.h \
-  ${MUD_HOME}/include/rb_tree.cc \
-  ${MUD_HOME}/include/PtrArray.h \
-  ${MUD_HOME}/include/PtrArray.cc ServerConfig.h \
-  ${MUD_HOME}/include/KVPair.h object.h critter.h \
-  door.h room.h commands.h lang_strings.h battle.h zone.h \
-  ${MUD_HOME}/include/tree2.h BugEntry.h SkillSpell.h \
-  MudStats.h misc2.h spells.h skills.h batl_prc.h ez_skll.h
-ez_spll.o: ez_spll.cc ez_spll.h const.h \
-  ${MUD_HOME}/include/list2.h \
-  ${MUD_HOME}/include/LogStream.h \
-  ${MUD_HOME}/include/string2.h \
-  ${MUD_HOME}/include/rb_tree.h \
-  ${MUD_HOME}/include/rb_tree.cc \
-  ${MUD_HOME}/include/bitfield.h \
-  ${MUD_HOME}/include/PtrArray.h \
-  ${MUD_HOME}/include/PtrArray.cc ServerConfig.h \
-  classes.h script.h ${MUD_HOME}/include/KVPair.h \
-  commands.h critter.h object.h door.h room.h lang_strings.h battle.h \
-  command2.h misc.h zone.h ${MUD_HOME}/include/tree2.h \
-  BugEntry.h SkillSpell.h MudStats.h misc2.h spells.h skills.h spec_prc.h \
-  clients.h
-grrmud.o: grrmud.cc ${MUD_HOME}/include/string2.h \
-  ${MUD_HOME}/include/LogStream.h \
-  ${MUD_HOME}/include/list2.h \
-  ${MUD_HOME}/include/PtrArray.h \
-  ${MUD_HOME}/include/bitfield.h \
-  ${MUD_HOME}/include/PtrArray.cc classes.h script.h \
-  const.h ${MUD_HOME}/include/rb_tree.h \
-  ${MUD_HOME}/include/rb_tree.cc ServerConfig.h \
-  ${MUD_HOME}/include/KVPair.h misc.h object.h \
-  critter.h door.h room.h commands.h lang_strings.h battle.h zone.h \
-  ${MUD_HOME}/include/tree2.h BugEntry.h SkillSpell.h \
-  MudStats.h misc2.h command2.h command3.h command4.h spec_prc.h grrmud.h \
-  load_wld.h login.h BuildInfo.h Filters.h spells.h telnet.h
-lang_strings.o: lang_strings.cc lang_strings.h \
-  ${MUD_HOME}/include/string2.h \
-  ${MUD_HOME}/include/LogStream.h
-load_wld.o: load_wld.cc misc.h \
-  ${MUD_HOME}/include/string2.h \
-  ${MUD_HOME}/include/LogStream.h classes.h \
-  ${MUD_HOME}/include/bitfield.h \
-  ${MUD_HOME}/include/list2.h script.h const.h \
-  ${MUD_HOME}/include/rb_tree.h \
-  ${MUD_HOME}/include/rb_tree.cc \
-  ${MUD_HOME}/include/PtrArray.h \
-  ${MUD_HOME}/include/PtrArray.cc ServerConfig.h \
-  ${MUD_HOME}/include/KVPair.h object.h critter.h \
-  door.h room.h commands.h lang_strings.h battle.h zone.h \
-  ${MUD_HOME}/include/tree2.h BugEntry.h SkillSpell.h \
-  MudStats.h olc2.h load_wld.h vehicle.h misc2.h
-login.o: login.cc commands.h const.h \
-  ${MUD_HOME}/include/list2.h \
-  ${MUD_HOME}/include/LogStream.h \
-  ${MUD_HOME}/include/string2.h \
-  ${MUD_HOME}/include/rb_tree.h \
-  ${MUD_HOME}/include/rb_tree.cc \
-  ${MUD_HOME}/include/bitfield.h \
-  ${MUD_HOME}/include/PtrArray.h \
-  ${MUD_HOME}/include/PtrArray.cc ServerConfig.h \
-  classes.h script.h ${MUD_HOME}/include/KVPair.h \
-  critter.h object.h door.h room.h lang_strings.h battle.h misc.h zone.h \
-  ${MUD_HOME}/include/tree2.h BugEntry.h SkillSpell.h \
-  MudStats.h spells.h skills.h command2.h command5.h load_wld.h Filters.h \
-  clients.h
-mapper.o: mapper.cc mapper.h \
-  ${MUD_HOME}/include/list2.h \
-  ${MUD_HOME}/include/LogStream.h \
-  ${MUD_HOME}/include/string2.h
-misc.o: misc.cc command4.h const.h \
-  ${MUD_HOME}/include/list2.h \
-  ${MUD_HOME}/include/LogStream.h \
-  ${MUD_HOME}/include/string2.h \
-  ${MUD_HOME}/include/rb_tree.h \
-  ${MUD_HOME}/include/rb_tree.cc \
-  ${MUD_HOME}/include/bitfield.h \
-  ${MUD_HOME}/include/PtrArray.h \
-  ${MUD_HOME}/include/PtrArray.cc ServerConfig.h \
-  classes.h script.h ${MUD_HOME}/include/KVPair.h \
-  room.h critter.h object.h door.h lang_strings.h battle.h commands.h \
-  misc.h zone.h ${MUD_HOME}/include/tree2.h BugEntry.h \
-  SkillSpell.h MudStats.h misc2.h spells.h vehicle.h load_wld.h \
-  command3.h skills.h Filters.h
-misc2.o: misc2.cc misc.h ${MUD_HOME}/include/string2.h \
-  ${MUD_HOME}/include/LogStream.h classes.h \
-  ${MUD_HOME}/include/bitfield.h \
-  ${MUD_HOME}/include/list2.h script.h const.h \
-  ${MUD_HOME}/include/rb_tree.h \
-  ${MUD_HOME}/include/rb_tree.cc \
-  ${MUD_HOME}/include/PtrArray.h \
-  ${MUD_HOME}/include/PtrArray.cc ServerConfig.h \
-  ${MUD_HOME}/include/KVPair.h object.h critter.h \
-  door.h room.h commands.h lang_strings.h battle.h zone.h \
-  ${MUD_HOME}/include/tree2.h BugEntry.h SkillSpell.h \
-  MudStats.h misc2.h command2.h command3.h spec_prc.h batl_prc.h spells.h \
-  skills.h vehicle.h
-obj_cmds.o: obj_cmds.cc misc.h \
-  ${MUD_HOME}/include/string2.h \
-  ${MUD_HOME}/include/LogStream.h classes.h \
-  ${MUD_HOME}/include/bitfield.h \
-  ${MUD_HOME}/include/list2.h script.h const.h \
-  ${MUD_HOME}/include/rb_tree.h \
-  ${MUD_HOME}/include/rb_tree.cc \
-  ${MUD_HOME}/include/PtrArray.h \
-  ${MUD_HOME}/include/PtrArray.cc ServerConfig.h \
-  ${MUD_HOME}/include/KVPair.h object.h critter.h \
-  door.h room.h commands.h lang_strings.h battle.h zone.h \
-  ${MUD_HOME}/include/tree2.h BugEntry.h SkillSpell.h \
-  MudStats.h misc2.h rm_cmds.h
-obj_parse.o: obj_parse.cc misc.h \
-  ${MUD_HOME}/include/string2.h \
-  ${MUD_HOME}/include/LogStream.h classes.h \
-  ${MUD_HOME}/include/bitfield.h \
-  ${MUD_HOME}/include/list2.h script.h const.h \
-  ${MUD_HOME}/include/rb_tree.h \
-  ${MUD_HOME}/include/rb_tree.cc \
-  ${MUD_HOME}/include/PtrArray.h \
-  ${MUD_HOME}/include/PtrArray.cc ServerConfig.h \
-  ${MUD_HOME}/include/KVPair.h object.h critter.h \
-  door.h room.h commands.h lang_strings.h battle.h zone.h \
-  ${MUD_HOME}/include/tree2.h BugEntry.h SkillSpell.h \
-  MudStats.h misc2.h rm_parse.h obj_cmds.h parse.h parse_gen.h ar_skll.h \
-  spells.h cr_skll.h social2.h ez_skll.h dam_skll.h skills.h command2.h \
-  command3.h command4.h command5.h olc.h olc2.h socials.h wep_skll.h
-object.o: object.cc object.h const.h \
-  ${MUD_HOME}/include/list2.h \
-  ${MUD_HOME}/include/LogStream.h \
-  ${MUD_HOME}/include/string2.h \
-  ${MUD_HOME}/include/rb_tree.h \
-  ${MUD_HOME}/include/rb_tree.cc \
-  ${MUD_HOME}/include/bitfield.h \
-  ${MUD_HOME}/include/PtrArray.h \
-  ${MUD_HOME}/include/PtrArray.cc ServerConfig.h \
-  classes.h script.h ${MUD_HOME}/include/KVPair.h \
-  critter.h door.h room.h commands.h lang_strings.h battle.h misc.h \
-  zone.h ${MUD_HOME}/include/tree2.h BugEntry.h \
-  SkillSpell.h MudStats.h misc2.h batl_prc.h load_wld.h
-olc.o: olc.cc commands.h const.h \
-  ${MUD_HOME}/include/list2.h \
-  ${MUD_HOME}/include/LogStream.h \
-  ${MUD_HOME}/include/string2.h \
-  ${MUD_HOME}/include/rb_tree.h \
-  ${MUD_HOME}/include/rb_tree.cc \
-  ${MUD_HOME}/include/bitfield.h \
-  ${MUD_HOME}/include/PtrArray.h \
-  ${MUD_HOME}/include/PtrArray.cc ServerConfig.h \
-  classes.h script.h ${MUD_HOME}/include/KVPair.h \
-  critter.h object.h door.h room.h lang_strings.h battle.h misc.h zone.h \
-  ${MUD_HOME}/include/tree2.h BugEntry.h SkillSpell.h \
-  MudStats.h command2.h command3.h command4.h command5.h misc2.h olc.h \
-  olc2.h vehicle.h load_wld.h
-olc2.o: olc2.cc commands.h const.h \
-  ${MUD_HOME}/include/list2.h \
-  ${MUD_HOME}/include/LogStream.h \
-  ${MUD_HOME}/include/string2.h \
-  ${MUD_HOME}/include/rb_tree.h \
-  ${MUD_HOME}/include/rb_tree.cc \
-  ${MUD_HOME}/include/bitfield.h \
-  ${MUD_HOME}/include/PtrArray.h \
-  ${MUD_HOME}/include/PtrArray.cc ServerConfig.h \
-  classes.h script.h ${MUD_HOME}/include/KVPair.h \
-  critter.h object.h door.h room.h lang_strings.h battle.h command2.h \
-  command3.h command4.h command5.h misc.h zone.h \
-  ${MUD_HOME}/include/tree2.h BugEntry.h SkillSpell.h \
-  MudStats.h misc2.h spec_prc.h spells.h skills.h olc2.h olc.h vehicle.h
-parse.o: parse.cc ar_skll.h const.h \
-  ${MUD_HOME}/include/list2.h \
-  ${MUD_HOME}/include/LogStream.h \
-  ${MUD_HOME}/include/string2.h \
-  ${MUD_HOME}/include/rb_tree.h \
-  ${MUD_HOME}/include/rb_tree.cc \
-  ${MUD_HOME}/include/bitfield.h \
-  ${MUD_HOME}/include/PtrArray.h \
-  ${MUD_HOME}/include/PtrArray.cc ServerConfig.h \
-  classes.h script.h ${MUD_HOME}/include/KVPair.h \
-  spells.h room.h critter.h object.h door.h lang_strings.h battle.h \
-  commands.h cr_skll.h social2.h ez_skll.h dam_skll.h skills.h misc.h \
-  zone.h ${MUD_HOME}/include/tree2.h BugEntry.h \
-  SkillSpell.h MudStats.h misc2.h command2.h command3.h command4.h \
-  command5.h olc.h olc2.h socials.h wep_skll.h parse.h parse_gen.h
-parse_gen.o: parse_gen.cc code_gen.h \
-  ${MUD_HOME}/include/string2.h \
-  ${MUD_HOME}/include/LogStream.h \
-  ${MUD_HOME}/include/list2.h parse.h classes.h \
-  ${MUD_HOME}/include/bitfield.h script.h const.h \
-  ${MUD_HOME}/include/rb_tree.h \
-  ${MUD_HOME}/include/rb_tree.cc \
-  ${MUD_HOME}/include/PtrArray.h \
-  ${MUD_HOME}/include/PtrArray.cc ServerConfig.h \
-  ${MUD_HOME}/include/KVPair.h parse_gen.h ar_skll.h \
-  spells.h room.h critter.h object.h door.h lang_strings.h battle.h \
-  commands.h cr_skll.h social2.h ez_skll.h dam_skll.h skills.h misc.h \
-  zone.h ${MUD_HOME}/include/tree2.h BugEntry.h \
-  SkillSpell.h MudStats.h misc2.h command2.h command3.h command4.h \
-  command5.h olc.h olc2.h socials.h wep_skll.h
-pet_spll.o: pet_spll.cc commands.h const.h \
-  ${MUD_HOME}/include/list2.h \
-  ${MUD_HOME}/include/LogStream.h \
-  ${MUD_HOME}/include/string2.h \
-  ${MUD_HOME}/include/rb_tree.h \
-  ${MUD_HOME}/include/rb_tree.cc \
-  ${MUD_HOME}/include/bitfield.h \
-  ${MUD_HOME}/include/PtrArray.h \
-  ${MUD_HOME}/include/PtrArray.cc ServerConfig.h \
-  classes.h script.h ${MUD_HOME}/include/KVPair.h \
-  critter.h object.h door.h room.h lang_strings.h battle.h command2.h \
-  misc.h zone.h ${MUD_HOME}/include/tree2.h BugEntry.h \
-  SkillSpell.h MudStats.h misc2.h spells.h skills.h pet_spll.h command3.h \
-  load_wld.h trv_spll.h
-regex.o: regex.cc regex.h \
-  ${MUD_HOME}/include/string2.h \
-  ${MUD_HOME}/include/LogStream.h
-rm_cmds.o: rm_cmds.cc misc.h \
-  ${MUD_HOME}/include/string2.h \
-  ${MUD_HOME}/include/LogStream.h classes.h \
-  ${MUD_HOME}/include/bitfield.h \
-  ${MUD_HOME}/include/list2.h script.h const.h \
-  ${MUD_HOME}/include/rb_tree.h \
-  ${MUD_HOME}/include/rb_tree.cc \
-  ${MUD_HOME}/include/PtrArray.h \
-  ${MUD_HOME}/include/PtrArray.cc ServerConfig.h \
-  ${MUD_HOME}/include/KVPair.h object.h critter.h \
-  door.h room.h commands.h lang_strings.h battle.h zone.h \
-  ${MUD_HOME}/include/tree2.h BugEntry.h SkillSpell.h \
-  MudStats.h misc2.h rm_cmds.h
-rm_parse.o: rm_parse.cc misc.h \
-  ${MUD_HOME}/include/string2.h \
-  ${MUD_HOME}/include/LogStream.h classes.h \
-  ${MUD_HOME}/include/bitfield.h \
-  ${MUD_HOME}/include/list2.h script.h const.h \
-  ${MUD_HOME}/include/rb_tree.h \
-  ${MUD_HOME}/include/rb_tree.cc \
-  ${MUD_HOME}/include/PtrArray.h \
-  ${MUD_HOME}/include/PtrArray.cc ServerConfig.h \
-  ${MUD_HOME}/include/KVPair.h object.h critter.h \
-  door.h room.h commands.h lang_strings.h battle.h zone.h \
-  ${MUD_HOME}/include/tree2.h BugEntry.h SkillSpell.h \
-  MudStats.h misc2.h rm_parse.h rm_cmds.h parse.h parse_gen.h ar_skll.h \
-  spells.h cr_skll.h social2.h ez_skll.h dam_skll.h skills.h command2.h \
-  command3.h command4.h command5.h olc.h olc2.h socials.h wep_skll.h
-rm_spll.o: rm_spll.cc rm_spll.h const.h \
-  ${MUD_HOME}/include/list2.h \
-  ${MUD_HOME}/include/LogStream.h \
-  ${MUD_HOME}/include/string2.h \
-  ${MUD_HOME}/include/rb_tree.h \
-  ${MUD_HOME}/include/rb_tree.cc \
-  ${MUD_HOME}/include/bitfield.h \
-  ${MUD_HOME}/include/PtrArray.h \
-  ${MUD_HOME}/include/PtrArray.cc ServerConfig.h \
-  classes.h script.h ${MUD_HOME}/include/KVPair.h \
-  command4.h room.h critter.h object.h door.h lang_strings.h battle.h \
-  commands.h command2.h misc.h zone.h \
-  ${MUD_HOME}/include/tree2.h BugEntry.h SkillSpell.h \
-  MudStats.h misc2.h spells.h skills.h
-room.o: room.cc door.h ${MUD_HOME}/include/bitfield.h \
-  ${MUD_HOME}/include/string2.h \
-  ${MUD_HOME}/include/LogStream.h \
-  ${MUD_HOME}/include/list2.h classes.h script.h \
-  const.h ${MUD_HOME}/include/rb_tree.h \
-  ${MUD_HOME}/include/rb_tree.cc \
-  ${MUD_HOME}/include/PtrArray.h \
-  ${MUD_HOME}/include/PtrArray.cc ServerConfig.h \
-  ${MUD_HOME}/include/KVPair.h room.h critter.h \
-  object.h lang_strings.h battle.h commands.h misc.h zone.h \
-  ${MUD_HOME}/include/tree2.h BugEntry.h SkillSpell.h \
-  MudStats.h misc2.h load_wld.h Filters.h
-script.o: script.cc commands.h const.h \
-  ${MUD_HOME}/include/list2.h \
-  ${MUD_HOME}/include/LogStream.h \
-  ${MUD_HOME}/include/string2.h \
-  ${MUD_HOME}/include/rb_tree.h \
-  ${MUD_HOME}/include/rb_tree.cc \
-  ${MUD_HOME}/include/bitfield.h \
-  ${MUD_HOME}/include/PtrArray.h \
-  ${MUD_HOME}/include/PtrArray.cc ServerConfig.h \
-  classes.h script.h ${MUD_HOME}/include/KVPair.h \
-  critter.h object.h door.h room.h lang_strings.h battle.h command2.h \
-  command3.h command4.h command5.h misc.h zone.h \
-  ${MUD_HOME}/include/tree2.h BugEntry.h SkillSpell.h \
-  MudStats.h misc2.h spec_prc.h spells.h skills.h batl_prc.h load_wld.h
-skills.o: skills.cc misc.h \
-  ${MUD_HOME}/include/string2.h \
-  ${MUD_HOME}/include/LogStream.h classes.h \
-  ${MUD_HOME}/include/bitfield.h \
-  ${MUD_HOME}/include/list2.h script.h const.h \
-  ${MUD_HOME}/include/rb_tree.h \
-  ${MUD_HOME}/include/rb_tree.cc \
-  ${MUD_HOME}/include/PtrArray.h \
-  ${MUD_HOME}/include/PtrArray.cc ServerConfig.h \
-  ${MUD_HOME}/include/KVPair.h object.h critter.h \
-  door.h room.h commands.h lang_strings.h battle.h zone.h \
-  ${MUD_HOME}/include/tree2.h BugEntry.h SkillSpell.h \
-  MudStats.h misc2.h spells.h skills.h batl_prc.h socials.h social2.h \
-  load_wld.h spells2.h
-social2.o: social2.cc misc.h \
-  ${MUD_HOME}/include/string2.h \
-  ${MUD_HOME}/include/LogStream.h classes.h \
-  ${MUD_HOME}/include/bitfield.h \
-  ${MUD_HOME}/include/list2.h script.h const.h \
-  ${MUD_HOME}/include/rb_tree.h \
-  ${MUD_HOME}/include/rb_tree.cc \
-  ${MUD_HOME}/include/PtrArray.h \
-  ${MUD_HOME}/include/PtrArray.cc ServerConfig.h \
-  ${MUD_HOME}/include/KVPair.h object.h critter.h \
-  door.h room.h commands.h lang_strings.h battle.h zone.h \
-  ${MUD_HOME}/include/tree2.h BugEntry.h SkillSpell.h \
-  MudStats.h misc2.h command2.h spec_prc.h social2.h
-socials.o: socials.cc misc.h \
-  ${MUD_HOME}/include/string2.h \
-  ${MUD_HOME}/include/LogStream.h classes.h \
-  ${MUD_HOME}/include/bitfield.h \
-  ${MUD_HOME}/include/list2.h script.h const.h \
-  ${MUD_HOME}/include/rb_tree.h \
-  ${MUD_HOME}/include/rb_tree.cc \
-  ${MUD_HOME}/include/PtrArray.h \
-  ${MUD_HOME}/include/PtrArray.cc ServerConfig.h \
-  ${MUD_HOME}/include/KVPair.h object.h critter.h \
-  door.h room.h commands.h lang_strings.h battle.h zone.h \
-  ${MUD_HOME}/include/tree2.h BugEntry.h SkillSpell.h \
-  MudStats.h misc2.h command2.h spec_prc.h
-spec_prc.o: spec_prc.cc spells.h const.h \
-  ${MUD_HOME}/include/list2.h \
-  ${MUD_HOME}/include/LogStream.h \
-  ${MUD_HOME}/include/string2.h \
-  ${MUD_HOME}/include/rb_tree.h \
-  ${MUD_HOME}/include/rb_tree.cc \
-  ${MUD_HOME}/include/bitfield.h \
-  ${MUD_HOME}/include/PtrArray.h \
-  ${MUD_HOME}/include/PtrArray.cc ServerConfig.h \
-  classes.h script.h ${MUD_HOME}/include/KVPair.h \
-  room.h critter.h object.h door.h lang_strings.h battle.h commands.h \
-  spells2.h skills.h pet_spll.h rm_spll.h command4.h dam_spll.h ez_spll.h \
-  trv_spll.h batl_prc.h spec_prc.h misc.h zone.h \
-  ${MUD_HOME}/include/tree2.h BugEntry.h SkillSpell.h \
-  MudStats.h misc2.h command2.h command3.h command5.h socials.h \
-  load_wld.h
-spells.o: spells.cc commands.h const.h \
-  ${MUD_HOME}/include/list2.h \
-  ${MUD_HOME}/include/LogStream.h \
-  ${MUD_HOME}/include/string2.h \
-  ${MUD_HOME}/include/rb_tree.h \
-  ${MUD_HOME}/include/rb_tree.cc \
-  ${MUD_HOME}/include/bitfield.h \
-  ${MUD_HOME}/include/PtrArray.h \
-  ${MUD_HOME}/include/PtrArray.cc ServerConfig.h \
-  classes.h script.h ${MUD_HOME}/include/KVPair.h \
-  critter.h object.h door.h room.h lang_strings.h battle.h command2.h \
-  command3.h misc.h zone.h ${MUD_HOME}/include/tree2.h \
-  BugEntry.h SkillSpell.h MudStats.h misc2.h spells.h spells2.h skills.h \
-  ez_spll.h dam_spll.h pet_spll.h rm_spll.h command4.h trv_spll.h \
-  clients.h
-spells2.o: spells2.cc commands.h const.h \
-  ${MUD_HOME}/include/list2.h \
-  ${MUD_HOME}/include/LogStream.h \
-  ${MUD_HOME}/include/string2.h \
-  ${MUD_HOME}/include/rb_tree.h \
-  ${MUD_HOME}/include/rb_tree.cc \
-  ${MUD_HOME}/include/bitfield.h \
-  ${MUD_HOME}/include/PtrArray.h \
-  ${MUD_HOME}/include/PtrArray.cc ServerConfig.h \
-  classes.h script.h ${MUD_HOME}/include/KVPair.h \
-  critter.h object.h door.h room.h lang_strings.h battle.h command2.h \
-  misc.h zone.h ${MUD_HOME}/include/tree2.h BugEntry.h \
-  SkillSpell.h MudStats.h misc2.h spells.h skills.h spells2.h socials.h
-tmp_socials.o: tmp_socials.cc misc.h \
-  ${MUD_HOME}/include/string2.h \
-  ${MUD_HOME}/include/LogStream.h classes.h \
-  ${MUD_HOME}/include/bitfield.h \
-  ${MUD_HOME}/include/list2.h script.h const.h \
-  ${MUD_HOME}/include/rb_tree.h \
-  ${MUD_HOME}/include/rb_tree.cc \
-  ${MUD_HOME}/include/PtrArray.h \
-  ${MUD_HOME}/include/PtrArray.cc ServerConfig.h \
-  ${MUD_HOME}/include/KVPair.h object.h critter.h \
-  door.h room.h commands.h lang_strings.h battle.h zone.h \
-  ${MUD_HOME}/include/tree2.h BugEntry.h SkillSpell.h \
-  MudStats.h misc2.h command2.h spec_prc.h
-trv_spll.o: trv_spll.cc trv_spll.h const.h \
-  ${MUD_HOME}/include/list2.h \
-  ${MUD_HOME}/include/LogStream.h \
-  ${MUD_HOME}/include/string2.h \
-  ${MUD_HOME}/include/rb_tree.h \
-  ${MUD_HOME}/include/rb_tree.cc \
-  ${MUD_HOME}/include/bitfield.h \
-  ${MUD_HOME}/include/PtrArray.h \
-  ${MUD_HOME}/include/PtrArray.cc ServerConfig.h \
-  classes.h script.h ${MUD_HOME}/include/KVPair.h \
-  commands.h critter.h object.h door.h room.h lang_strings.h battle.h \
-  command2.h misc.h zone.h ${MUD_HOME}/include/tree2.h \
-  BugEntry.h SkillSpell.h MudStats.h misc2.h spells.h skills.h
-vehicle.o: vehicle.cc vehicle.h room.h critter.h \
-  ${MUD_HOME}/include/bitfield.h \
-  ${MUD_HOME}/include/string2.h \
-  ${MUD_HOME}/include/LogStream.h classes.h \
-  ${MUD_HOME}/include/list2.h script.h const.h \
-  ${MUD_HOME}/include/rb_tree.h \
-  ${MUD_HOME}/include/rb_tree.cc \
-  ${MUD_HOME}/include/PtrArray.h \
-  ${MUD_HOME}/include/PtrArray.cc ServerConfig.h \
-  ${MUD_HOME}/include/KVPair.h object.h door.h \
-  lang_strings.h battle.h commands.h misc.h zone.h \
-  ${MUD_HOME}/include/tree2.h BugEntry.h SkillSpell.h \
-  MudStats.h misc2.h
-wep_skll.o: wep_skll.cc misc.h \
-  ${MUD_HOME}/include/string2.h \
-  ${MUD_HOME}/include/LogStream.h classes.h \
-  ${MUD_HOME}/include/bitfield.h \
-  ${MUD_HOME}/include/list2.h script.h const.h \
-  ${MUD_HOME}/include/rb_tree.h \
-  ${MUD_HOME}/include/rb_tree.cc \
-  ${MUD_HOME}/include/PtrArray.h \
-  ${MUD_HOME}/include/PtrArray.cc ServerConfig.h \
-  ${MUD_HOME}/include/KVPair.h object.h critter.h \
-  door.h room.h commands.h lang_strings.h battle.h zone.h \
-  ${MUD_HOME}/include/tree2.h BugEntry.h SkillSpell.h \
-  MudStats.h misc2.h spells.h skills.h batl_prc.h wep_skll.h
-zone.o: zone.cc zone.h ${MUD_HOME}/include/PtrArray.h \
-  ${MUD_HOME}/include/bitfield.h \
-  ${MUD_HOME}/include/string2.h \
-  ${MUD_HOME}/include/LogStream.h \
-  ${MUD_HOME}/include/PtrArray.cc \
-  ${MUD_HOME}/include/tree2.h \
-  ${MUD_HOME}/include/list2.h const.h \
-  ${MUD_HOME}/include/rb_tree.h \
-  ${MUD_HOME}/include/rb_tree.cc ServerConfig.h misc.h \
-  classes.h script.h ${MUD_HOME}/include/KVPair.h \
-  object.h critter.h door.h room.h commands.h lang_strings.h battle.h \
-  BugEntry.h SkillSpell.h MudStats.h misc2.h command4.h command5.h \
-  mapper.h

Modified: trunk/mud/grrmud/server/gen_cmds.spec
===================================================================
--- trunk/mud/grrmud/server/gen_cmds.spec	2007-01-30 02:16:21 UTC (rev 853)
+++ trunk/mud/grrmud/server/gen_cmds.spec	2007-02-03 13:16:45 UTC (rev 854)
@@ -881,7 +881,7 @@
 tap socials ~
 tap(i, &(cooked_strs[1]), pc, (*(pc.getCurRoom()))); return 0;
 test ~
-test(pc);
+test(pc); return 0;
 thank socials ~
 thank(i, &(cooked_strs[1]), pc, (*(pc.getCurRoom()))); return 0;
 thpppt socials ~

Modified: trunk/mud/include/README
===================================================================
--- trunk/mud/include/README	2007-01-30 02:16:21 UTC (rev 853)
+++ trunk/mud/include/README	2007-02-03 13:16:45 UTC (rev 854)
@@ -1,2 +1,2 @@
 This is where all the #include files from the ../lib/*
-directories are coppied.
\ No newline at end of file
+directories are copied.

Modified: trunk/mud/lib/Makefile
===================================================================
--- trunk/mud/lib/Makefile	2007-01-30 02:16:21 UTC (rev 853)
+++ trunk/mud/lib/Makefile	2007-02-03 13:16:45 UTC (rev 854)
@@ -1,19 +1,18 @@
 # $Id$
-# $Revision: 1.2 $  $Author$ $Date$
+# $Revision$  $Author$ $Date$
 
 include ../MakeInclude
 
+.PHONY: all
 all:
-	${MAKE} -C log all
-	${MAKE} -C string2 all
-	${MAKE} -C containers all
-	${MAKE} -C bitfield all
+	@${MAKE} -C log all
+	@${MAKE} -C string2 all
+	@${MAKE} -C containers all
+	@${MAKE} -C bitfield all
 
+.PHONY: clean
 clean:
-	${MAKE} -C containers clean
-	${MAKE} -C bitfield clean
-	${MAKE} -C log clean
-	${MAKE} -C string2 clean
-
-
-
+	@${MAKE} -C containers clean
+	@${MAKE} -C bitfield clean
+	@${MAKE} -C log clean
+	@${MAKE} -C string2 clean

Modified: trunk/mud/lib/bitfield/Makefile
===================================================================
--- trunk/mud/lib/bitfield/Makefile	2007-01-30 02:16:21 UTC (rev 853)
+++ trunk/mud/lib/bitfield/Makefile	2007-02-03 13:16:45 UTC (rev 854)
@@ -1,5 +1,5 @@
 # $Id$
-# $Revision: 1.3 $  $Author$ $Date$
+# $Revision$  $Author$ $Date$
 
 include ../../MakeInclude
 
@@ -27,19 +27,26 @@
 	@echo "Making Archive Library $@ ..."
 	rm -f $@
 	$(AR) $(ARFLAGS) $@ $^ 
-	cp bitfield.h ${PROG_HOME}/include
 	@echo "done"        #public_include.
 
-${PROG_HOME}/include/bitfield.h:
-	cp bitfield.h ${PROG_HOME}/include/bitfield.h
+${PROG_HOME}/include/bitfield.h: bitfield.h
+	cp $< $@
 
-bitfield.o:   bitfield.cc bitfield.h
-	@echo " "
-	@echo "Making $@..."
-	$(CC) $(CCFLAGS) -c $<
+.PHONY: clean
+clean:
+	@echo "Cleaning"
+	@rm -f *.o
+	@rm -f *~
+	@rm -f ${ARCHIVE}
+	@rm -f ${PROG_HOME}/include/bitfield.h
+	@rm -f *.P
 
-clean:
-	rm -f *.o
-	rm -f *~
-	rm -f ${ARCHIVE}
-	rm -f ${PROG_HOME}/include/bitfield.h
\ No newline at end of file
+%.o : %.cc
+	@echo "Compiling $<"
+	@$(CCC) $(CCFLAGS) -c -MD -o $@ $<
+	@cp $*.d $*.P; \
+		sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
+		    -e '/^$$/ d' -e 's/$$/ :/' < $*.d >> $*.P; \
+		rm -f $*.d
+
+-include $(OBJS:%.o=%.P)

Modified: trunk/mud/lib/containers/Makefile
===================================================================
--- trunk/mud/lib/containers/Makefile	2007-01-30 02:16:21 UTC (rev 853)
+++ trunk/mud/lib/containers/Makefile	2007-02-03 13:16:45 UTC (rev 854)
@@ -1,23 +1,48 @@
 # $Id$
-# $Revision: 1.5 $  $Author$ $Date$
+# $Revision$  $Author$ $Date$
+#
+# TODO: I'm pretty sure there's a more sane way to do this. Re-evaluate when
+# I'm not so sleepy.
 
 include ../../MakeInclude
 
-INC_FILES = \
-	KVPair.h \
-	PtrArray.h \
-	PtrArray.cc \
-	ProtectedList.h \
-	list2.h \
-	rb_tree.h \
-	rb_tree.cc \
-	tree2.h
+TARGS = ${PROG_HOME}/include/KVPair.h \
+		${PROG_HOME}/include/PtrArray.h \
+		${PROG_HOME}/include/PtrArray.cc \
+		${PROG_HOME}/include/ProtectedList.h \
+		${PROG_HOME}/include/list2.h \
+		${PROG_HOME}/include/rb_tree.h \
+		${PROG_HOME}/include/rb_tree.cc \
+		${PROG_HOME}/include/tree2.h \
 
+.PHONY: all
+all: $(TARGS)
+		
+${PROG_HOME}/include/KVPair.h: KVPair.h
+	cp $< $@
 
+${PROG_HOME}/include/PtrArray.h: PtrArray.h
+	cp $< $@
 
-all: ${INC_FILES}
-	cp -f ${INC_FILES} ${PROG_HOME}/include/
+${PROG_HOME}/include/PtrArray.cc: PtrArray.cc
+	cp $< $@
 
+${PROG_HOME}/include/ProtectedList.h: ProtectedList.h
+	cp $< $@
+
+${PROG_HOME}/include/list2.h: list2.h
+	cp $< $@
+
+${PROG_HOME}/include/rb_tree.h: rb_tree.h
+	cp $< $@
+
+${PROG_HOME}/include/rb_tree.cc: rb_tree.cc
+	cp $< $@
+
+${PROG_HOME}/include/tree2.h: tree2.h
+	cp $< $@
+
+.PHONY: clean
 clean:
 	rm -f *.o
 	rm -f ${PROG_HOME}/include/PtrArray.h
@@ -29,6 +54,7 @@
 	rm -f ${PROG_HOME}/include/tree2.h
 	rm -f ${PROG_HOME}/include/KVPair.h
 
+.PHONY: purge
 purge: clean
 	rm -f *~
-	rm -f *.flc
\ No newline at end of file
+	rm -f *.flc

Modified: trunk/mud/lib/log/Makefile
===================================================================
--- trunk/mud/lib/log/Makefile	2007-01-30 02:16:21 UTC (rev 853)
+++ trunk/mud/lib/log/Makefile	2007-02-03 13:16:45 UTC (rev 854)
@@ -1,5 +1,5 @@
 # $Id$
-# $Revision: 1.4 $  $Author$ $Date$
+# $Revision$  $Author$ $Date$
 
 #ARCHIVE      = /home/greear/mud/lib/liblog.a
 
@@ -19,15 +19,17 @@
 
 include ../../MakeInclude
 
-all: test1
-	@echo " "
-	cp LogStream.h ${PROG_HOME}/include
+.PHONY: all
+all: test1 ${PROG_HOME}/include/LogStream.h
 
+${PROG_HOME}/include/LogStream.h: LogStream.h
+	cp $< $@
+
 test1:
 	g++ -g -fhuge-objects -o test1 test1.cc
 
-
 clean:
 	rm -f test1
 	rm -f *~
-	rm -f ${PROG_HOME}/include/LogStream.h
\ No newline at end of file
+	rm -f ${PROG_HOME}/include/LogStream.h
+	rm -f *.P

Modified: trunk/mud/lib/string2/Makefile
===================================================================
--- trunk/mud/lib/string2/Makefile	2007-01-30 02:16:21 UTC (rev 853)
+++ trunk/mud/lib/string2/Makefile	2007-02-03 13:16:45 UTC (rev 854)
@@ -1,5 +1,5 @@
 # $Id$
-# $Revision: 1.3 $  $Author$ $Date$
+# $Revision$  $Author$ $Date$
 
 include ../../MakeInclude
 
@@ -17,6 +17,7 @@
 #  directly in the lib directory
 #-----------------------
 
+.PHONY: all
 all: ${ARCHIVE} ${PROG_HOME}/include/string2.h
 
 ${ARCHIVE}:     $(LIBOBJS)
@@ -24,20 +25,26 @@
 	@echo "Making Archive Library $@ ..."
 	rm -f $@
 	$(AR) $(ARFLAGS) $@ $^ 
-	cp string2.h ${PROG_HOME}/include
 	@echo "done"        #public_include.
 
 
-${PROG_HOME}/include/string2.h:
+${PROG_HOME}/include/string2.h: string2.h
 	cp string2.h ${PROG_HOME}/include/string2.h
 
-string2.o:   string2.cc string2.h
-	@echo " "
-	@echo "Making $@..."
-	$(CC) $(CCFLAGS) -c $<
-
+.PHONY: clean
 clean:
 	rm -f ${PROG_HOME}/include/string2.h
 	rm -f *.o
 	rm -f $(ARCHIVE)
 	rm -f *~
+	rm -f *.P
+
+%.o : %.cc
+	@echo "Compiling $<"
+	@$(CCC) $(CCFLAGS) -c -MD -o $@ $<
+	@cp $*.d $*.P; \
+		sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
+		    -e '/^$$/ d' -e 's/$$/ :/' < $*.d >> $*.P; \
+		rm -f $*.d
+
+-include $(OBJS:%.o=%.P)




More information about the ScryMUD mailing list