summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMadCamel <madcamel@gmail.com>2010-05-05 08:05:21 -0400
committerMadCamel <madcamel@gmail.com>2010-05-05 08:05:21 -0400
commit6f0093e5ef500c13fbb532a6fc7bac7265f0b456 (patch)
treecc0ed14c0ebfb085f68a069fd9184103651a512c /src
parent51e87379c9d532cafc98b96178709b8b8c88e1ae (diff)
downloadtmwa-6f0093e5ef500c13fbb532a6fc7bac7265f0b456.tar.gz
tmwa-6f0093e5ef500c13fbb532a6fc7bac7265f0b456.tar.bz2
tmwa-6f0093e5ef500c13fbb532a6fc7bac7265f0b456.tar.xz
tmwa-6f0093e5ef500c13fbb532a6fc7bac7265f0b456.zip
map-server and char-server build again on a fresh checkout
Oops :(
Diffstat (limited to 'src')
-rw-r--r--src/char/Makefile2
-rw-r--r--src/map/Makefile2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/char/Makefile b/src/char/Makefile
index 271aafd..5eb4b51 100644
--- a/src/char/Makefile
+++ b/src/char/Makefile
@@ -6,7 +6,7 @@ txt: char-server
COMMON_OBJ = ../common/core.o ../common/socket.o ../common/timer.o ../common/db.o ../common/lock.o ../common/malloc.o ../common/mt_rand.o
COMMON_H = ../common/core.h ../common/socket.h ../common/timer.h ../common/mmo.h ../common/db.h ../common/lock.h ../common/timer.h ../common/malloc.h ../common/mt_rand.h
char-server: char.o inter.o int_party.o int_guild.o int_storage.o $(COMMON_OBJ)
- $(CC) $(CFLAGS) -o ../../$@ $>
+ $(CC) $(CFLAGS) -o ../../$@ $^
char.o: char.c char.h inter.h $(COMMON_H) ../common/version.h
inter.o: inter.c inter.h int_party.h int_guild.h int_storage.h char.h $(COMMON_H)
diff --git a/src/map/Makefile b/src/map/Makefile
index 730e72f..eb2f5fd 100644
--- a/src/map/Makefile
+++ b/src/map/Makefile
@@ -11,7 +11,7 @@ COMMON_OBJ = ../common/core.o ../common/socket.o ../common/timer.o ../common/grf
LIBS = -lz -lm
map-server: obj/tmw.o obj/magic-interpreter-lexer.o obj/magic-interpreter-parser.o obj/magic-interpreter-base.o obj/magic-expr.o obj/magic-stmt.o obj/magic.o obj/map.o obj/chrif.o obj/clif.o obj/pc.o obj/npc.o obj/chat.o obj/path.o obj/itemdb.o obj/mob.o obj/script.o obj/storage.o obj/skill.o obj/skill-pools.o obj/atcommand.o obj/battle.o obj/intif.o obj/trade.o obj/party.o obj/guild.o $(COMMON_OBJ)
- $(CC) -o ../../$@ $> $(LIBS)
+ $(CC) -o ../../$@ $^ $(LIBS)
obj/%.o: %.c
$(COMPILE.c) $(OUTPUT_OPTION) $<