From 391fe3b7764c6a77a2c1f26ba6d956e201134bfe Mon Sep 17 00:00:00 2001 From: Rumble Date: Thu, 28 Dec 2006 02:44:46 +0000 Subject: [PATCH] Updated Makefile.* to not include olc.c - thanks to Rumble for doing this. --- src/Makefile.amiga | 5 +---- src/Makefile.arc | 2 +- src/Makefile.bcc | 7 ------- src/Makefile.bcc55 | 7 ------- src/Makefile.in | 8 ++++---- src/Makefile.lcc | 15 --------------- src/Makefile.msvc | 5 +---- src/Makefile.os2 | 5 +---- 8 files changed, 8 insertions(+), 46 deletions(-) diff --git a/src/Makefile.amiga b/src/Makefile.amiga index 95bdb66..4e9b8d0 100644 --- a/src/Makefile.amiga +++ b/src/Makefile.amiga @@ -23,7 +23,7 @@ OBJFILES = comm.o act.comm.o act.informative.o act.movement.o act.item.o \ act.offensive.o act.other.o act.social.o act.wizard.o ban.o boards.o \ castle.o class.o config.o constants.o db.o fight.o graph.o handler.o \ house.o interpreter.o limits.o magic.o mail.o mobact.o modify.o \ - objsave.o olc.o shop.o spec_assign.o spec_procs.o spell_parser.o \ + objsave.o shop.o spec_assign.o spec_procs.o spell_parser.o \ spells.o utils.o weather.o alias.o players.o default: .accepted @@ -169,9 +169,6 @@ modify.o: modify.c conf.h sysdep.h structs.h utils.h interpreter.h handler.h db. objsave.o: objsave.c conf.h sysdep.h structs.h comm.h handler.h db.h \ interpreter.h utils.h spells.h $(CC) -c $(CFLAGS) objsave.c -olc.o: olc.c conf.h sysdep.h structs.h utils.h comm.h interpreter.h handler.h db.h \ - olc.h - $(CC) -c $(CFLAGS) olc.c players.o: players.c conf.h sysdep.h structs.h utils.h db.h handler.h pfdefaults.h $(CC) -c $(CFLAGS) players.c random.o: random.c diff --git a/src/Makefile.arc b/src/Makefile.arc index 96f8da9..f60e9e0 100644 --- a/src/Makefile.arc +++ b/src/Makefile.arc @@ -25,7 +25,7 @@ OBJFILES = o.comm act.o.comm act.o.informative act.o.movement act.o.item \ act.o.offensive act.o.other act.o.social act.o.wizard o.ban o.boards \ o.castle o.class o.config o.constants o.db o.fight o.graph o.handler \ o.house o.interpreter o.limits o.magic o.mail o.mobact o.modify \ - o.objsave o.olc o.random o.shop o.spec_assign o.spec_procs \ + o.objsave o.random o.shop o.spec_assign o.spec_procs \ o.spell_parser o.spells o.utils o.weather o.players o.alias default: all diff --git a/src/Makefile.bcc b/src/Makefile.bcc index 0efc97c..3d13968 100644 --- a/src/Makefile.bcc +++ b/src/Makefile.bcc @@ -68,7 +68,6 @@ Dep_circledexe = \ handler.obj\ magic.obj\ mail.obj\ - olc.obj\ objsave.obj\ players.obj\ modify.obj\ @@ -111,7 +110,6 @@ house.obj+ handler.obj+ magic.obj+ mail.obj+ -olc.obj+ objsave.obj+ players.obj+ modify.obj+ @@ -256,11 +254,6 @@ mail.obj : mail.c $(CompOptsAt_circledexe) $(CompInheritOptsAt_circledexe) -o$@ mail.c | -olc.obj : olc.c - $(BCC32) -P- -c @&&| - $(CompOptsAt_circledexe) $(CompInheritOptsAt_circledexe) -o$@ olc.c -| - objsave.obj : objsave.c $(BCC32) -P- -c @&&| $(CompOptsAt_circledexe) $(CompInheritOptsAt_circledexe) -o$@ objsave.c diff --git a/src/Makefile.bcc55 b/src/Makefile.bcc55 index c068999..b7df4f9 100644 --- a/src/Makefile.bcc55 +++ b/src/Makefile.bcc55 @@ -69,7 +69,6 @@ Dep_circledexe = \ handler.obj\ magic.obj\ mail.obj\ - olc.obj\ objsave.obj\ players.obj\ modify.obj\ @@ -112,7 +111,6 @@ house.obj+ handler.obj+ magic.obj+ mail.obj+ -olc.obj+ objsave.obj+ players.obj+ modify.obj+ @@ -255,11 +253,6 @@ mail.obj : mail.c $(CompOptsAt_circledexe) $(CompInheritOptsAt_circledexe) -o$@ mail.c | -olc.obj : olc.c - $(BCC32) -P- -c @&&| - $(CompOptsAt_circledexe) $(CompInheritOptsAt_circledexe) -o$@ olc.c -| - objsave.obj : objsave.c $(BCC32) -P- -c @&&| $(CompOptsAt_circledexe) $(CompInheritOptsAt_circledexe) -o$@ objsave.c diff --git a/src/Makefile.in b/src/Makefile.in index 7aed56d..580c190 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -29,8 +29,8 @@ OBJFILES = act.comm.o act.informative.o act.item.o act.movement.o \ fight.o genmob.o genobj.o genolc.o genshp.o genwld.o genzon.o graph.o \ handler.o house.o improved-edit.o interpreter.o limits.o magic.o mail.o \ medit.o mobact.o modify.o oasis.o oasis_copy.o oasis_delete.o \ - oasis_list.o objsave.o oedit.o random.o redit.o sedit.o tedit.o \ - shop.o spec_assign.o spec_procs.o spell_parser.o spells.o \ + oasis_list.o objsave.o oedit.o random.o redit.o sedit.o \ + shop.o spec_assign.o spec_procs.o spell_parser.o spells.o tedit.o \ utils.o weather.o zedit.o bsd-snprintf.o \ dg_comm.o dg_db_scripts.o dg_event.o dg_handler.o dg_mobcmd.o \ dg_misc.o dg_objcmd.o dg_scripts.o dg_triggers.o dg_wldcmd.o dg_olc.o \ @@ -43,8 +43,8 @@ CXREF_FILES = act.comm.c act.informative.c act.item.c act.movement.c \ fight.c genmob.c genobj.c genolc.c genshp.c genwld.c genzon.c graph.c \ handler.c house.c improved-edit.c interpreter.c limits.c magic.c mail.c \ medit.c mobact.c modify.c oasis.c oasis_copy.o oasis_delete.c \ - oasis_list.o objsave.c oedit.c random.c redit.c sedit.c \ - shop.c spec_assign.c spec_procs.c spell_parser.c spells.c \ + oasis_list.o objsave.c oedit.c olc.c random.c redit.c sedit.c \ + shop.c spec_assign.c spec_procs.c spell_parser.c spells.c tedit.c \ utils.c weather.c zedit.c hedit.c bsd-snprintf.c players.c default: all diff --git a/src/Makefile.lcc b/src/Makefile.lcc index 6ff4720..e748b42 100644 --- a/src/Makefile.lcc +++ b/src/Makefile.lcc @@ -25,7 +25,6 @@ OBJS=\ shop.obj \ random.obj \ players.obj \ - olc.obj \ objsave.obj \ modify.obj \ mobact.obj \ @@ -172,20 +171,6 @@ PLAYERS_C=\ players.o: $(PLAYERS_C) $(DISTDIR)\src\players.c $(CC) $(CFLAGS) $(DISTDIR)\src\players.c -# Build OLC.C -OLC_C=\ - $(DISTDIR)\src\sysdep.h\ - $(DISTDIR)\src\structs.h\ - $(DISTDIR)\src\utils.h\ - $(DISTDIR)\src\comm.h\ - $(DISTDIR)\src\interpreter.h\ - $(DISTDIR)\src\handler.h\ - $(DISTDIR)\src\db.h\ - $(DISTDIR)\src\olc.h\ - -olc.obj: $(OLC_C) $(DISTDIR)\src\olc.c - $(CC) $(CFLAGS) $(DISTDIR)\src\olc.c - # Build OBJSAVE.C OBJSAVE_C=\ $(DISTDIR)\src\sysdep.h\ diff --git a/src/Makefile.msvc b/src/Makefile.msvc index 0680d47..9f3d5b3 100644 --- a/src/Makefile.msvc +++ b/src/Makefile.msvc @@ -39,7 +39,7 @@ OBJFILES = comm.obj act.comm.obj act.informative.obj act.movement.obj act.item.o act.offensive.obj act.other.obj act.social.obj act.wizard.obj ban.obj boards.obj \ castle.obj class.obj config.obj constants.obj db.obj fight.obj graph.obj handler.obj \ house.obj interpreter.obj limits.obj magic.obj mail.obj mobact.obj modify.obj \ - objsave.obj olc.obj shop.obj spec_assign.obj spec_procs.obj spell_parser.obj \ + objsave.obj shop.obj spec_assign.obj spec_procs.obj spell_parser.obj \ spells.obj utils.obj weather.obj random.obj alias.obj players.obj default: circle.exe @@ -130,9 +130,6 @@ modify.obj: modify.c conf.h sysdep.h structs.h utils.h interpreter.h handler.h d objsave.obj: objsave.c conf.h sysdep.h structs.h comm.h handler.h db.h \ interpreter.h utils.h spells.h $(CC) -c $(CFLAGS) objsave.c -olc.obj: olc.c conf.h sysdep.h structs.h utils.h comm.h interpreter.h handler.h db.h \ - olc.h - $(CC) -c $(CFLAGS) olc.c players.o: players.c conf.h sysdep.h structs.h utils.h db.h handler.h pfdefaults.h $(CC) -c $(CFLAGS) players.c random.obj: random.c diff --git a/src/Makefile.os2 b/src/Makefile.os2 index 7c9cda3..60931fd 100644 --- a/src/Makefile.os2 +++ b/src/Makefile.os2 @@ -25,7 +25,7 @@ OBJFILES = comm.o act.comm.o act.informative.o act.movement.o act.item.o \ act.offensive.o act.other.o act.social.o act.wizard.o ban.o boards.o \ castle.o class.o config.o constants.o db.o fight.o graph.o handler.o \ house.o interpreter.o limits.o magic.o mail.o mobact.o modify.o \ - objsave.o olc.o shop.o spec_assign.o spec_procs.o spell_parser.o \ + objsave.o shop.o spec_assign.o spec_procs.o spell_parser.o \ spells.o utils.o weather.o random.o alias.o players.o default: .accepted @@ -171,9 +171,6 @@ modify.o: modify.c conf.h sysdep.h structs.h utils.h interpreter.h handler.h db. objsave.o: objsave.c conf.h sysdep.h structs.h comm.h handler.h db.h \ interpreter.h utils.h spells.h $(CC) -c $(CFLAGS) objsave.c -olc.o: olc.c conf.h sysdep.h structs.h utils.h comm.h interpreter.h handler.h db.h \ - olc.h - $(CC) -c $(CFLAGS) olc.c players.o: players.c conf.h sysdep.h structs.h utils.h db.h handler.h pfdefaults.h $(CC) -c $(CFLAGS) players.c random.o: random.c