From 51e87379c9d532cafc98b96178709b8b8c88e1ae Mon Sep 17 00:00:00 2001 From: MadCamel Date: Wed, 5 May 2010 07:34:05 -0400 Subject: Fixed up and slightly simplified the build system It's now possible to run 'make' in any of the src/ subdirs and have it build properly. Moved some tools including eathena-monitor to src/tools - run 'make tools' to build. CFLAGS, etc are now in the 'make.defs' file. Requires GNU make. --- src/tool/Makefile | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) (limited to 'src/tool/Makefile') diff --git a/src/tool/Makefile b/src/tool/Makefile index d2616a7..5d37183 100644 --- a/src/tool/Makefile +++ b/src/tool/Makefile @@ -1,12 +1,16 @@ -CC=gcc -m32 -O0 -g +include ../../make.defs + BDIR=.. -COBJS=${BDIR}/common/timer.o ${BDIR}/common/malloc.o ${BDIR}/common/socket.o ${BDIR}/common/lock.o ${BDIR}/common/db.o ${BDIR}/char/int_pet.o ${BDIR}/char/int_storage.o ${BDIR}/char/inter.o ${BDIR}/char/int_party.o ${BDIR}/char/int_guild.o +COBJS=${BDIR}/common/timer.o ${BDIR}/common/malloc.o ${BDIR}/common/socket.o ${BDIR}/common/lock.o ${BDIR}/common/db.o ${BDIR}/char/int_storage.o ${BDIR}/char/inter.o ${BDIR}/char/int_party.o ${BDIR}/char/int_guild.o +MOBJS=${BDIR}/common/socket.o ${BDIR}/common/timer.o ${BDIR}/common/db.o ${BDIR}/common/lock.o ${BDIR}/common/malloc.o ${BDIR}/char/int_guild.o ${BDIR}/char/int_party.o ${BDIR}/char/int_storage.o ${BDIR}/char/inter.o -all: - $(CC) -o adduser adduser.c - $(CC) -I ${BDIR}/char -I ${BDIR}/common itemfrob.c -o itemfrob ${COBJS} - $(CC) -I ${BDIR}/char -I ${BDIR}/common mapfrob.c -o mapfrob ${COBJS} +all: ${COBJS} ${MOBJS} + $(CC) $(CFLAGS) -o adduser adduser.c $(BDIR)/common/socket.o + $(CC) $(CFLAGS) -I ${BDIR}/char -I ${BDIR}/common itemfrob.c -o itemfrob ${COBJS} + $(CC) $(CFLAGS) -I ${BDIR}/char -I ${BDIR}/common mapfrob.c -o mapfrob ${COBJS} + $(CC) $(CFLAGS) -I ${BDIR}/char -I ${BDIR}/common -I ${BDIR}/map -I ${BDIR}/login marriage-info.c -o marriage-info ${MOBJS} + $(CC) $(CFLAGS) -o ${BDIR}/../eathena-monitor eathena-monitor.c clean: - rm -f adduser itemfrob mapfrop + rm -f adduser itemfrob mapfrob marriage-info ${BDIR}/../eathena-monitor rm -f *.exe -- cgit v1.2.3-70-g09d2