diff options
| author | MadCamel <madcamel@gmail.com> | 2010-05-05 07:34:05 -0400 |
|---|---|---|
| committer | MadCamel <madcamel@gmail.com> | 2010-05-05 07:34:05 -0400 |
| commit | 51e87379c9d532cafc98b96178709b8b8c88e1ae (patch) | |
| tree | db80f2e1a758b2739ab79218a88a3def501f362d /src/tool/Makefile | |
| parent | ae73f3122063048b3a5a2d1c48f6c13b02fd4e1f (diff) | |
| download | tmwa-51e87379c9d532cafc98b96178709b8b8c88e1ae.tar.gz tmwa-51e87379c9d532cafc98b96178709b8b8c88e1ae.tar.bz2 tmwa-51e87379c9d532cafc98b96178709b8b8c88e1ae.tar.xz tmwa-51e87379c9d532cafc98b96178709b8b8c88e1ae.zip | |
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.
Diffstat (limited to 'src/tool/Makefile')
| -rw-r--r-- | src/tool/Makefile | 18 |
1 files changed, 11 insertions, 7 deletions
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 |