From 4095d5726ebabc663a6d5397d003773ee652818a Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Sat, 2 Apr 2011 22:00:46 -0700 Subject: Rewrite make system to be optimal --- src/tool/GNUmakefile | 7 +++++++ src/tool/Makefile | 15 --------------- src/tool/moneycount/Makefile | 14 -------------- 3 files changed, 7 insertions(+), 29 deletions(-) create mode 100644 src/tool/GNUmakefile delete mode 100644 src/tool/Makefile delete mode 100644 src/tool/moneycount/Makefile (limited to 'src/tool') diff --git a/src/tool/GNUmakefile b/src/tool/GNUmakefile new file mode 100644 index 0000000..2efc93b --- /dev/null +++ b/src/tool/GNUmakefile @@ -0,0 +1,7 @@ +.SUFFIXES: +all: + make -C ../.. tools +clean: + rm -r ../../obj/tool/ +%:: + make -C ../.. obj/tool/$@ diff --git a/src/tool/Makefile b/src/tool/Makefile deleted file mode 100644 index 8d51c25..0000000 --- a/src/tool/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -include ../../make.defs - -OBJS =../common/timer.o ../common/socket.o ../common/db.o ../common/lock.o ../char/inter.o ../char/int_guild.o ../char/int_party.o ../char/int_storage.o -all: adduser itemfrob mapfrob marriage-info eathena-monitor -adduser: adduser.o ../common/socket.o - -itemfrob: itemfrob.o ${OBJS} -mapfrob: mapfrob.o ${OBJS} -marriage-info: marriage-info.o ${OBJS} -eathena-monitor: eathena-monitor.c - -clean: - rm -f adduser itemfrob mapfrob marriage-info eathena-monitor - rm -f *.exe - rm -f *.o diff --git a/src/tool/moneycount/Makefile b/src/tool/moneycount/Makefile deleted file mode 100644 index e7b7022..0000000 --- a/src/tool/moneycount/Makefile +++ /dev/null @@ -1,14 +0,0 @@ -all: moneycount - -OBJECTS = main.o athena_text.o inf.o portability_fixes.o -CPP = g++ - -moneycount: $(OBJECTS) - $(CPP) -o $@ $(OBJECTS) $(COMMON_OBJS) $(LIBS) -main.o: main.cpp -athena_text.o: athena_text.cpp athena_text.h -inf.o: inf.cpp inf.hpp -portability_fixes.o: portability_fixes.cpp portability_fixes.hpp portability_exceptions.hpp - -clean: - rm -f *.o moneycount -- cgit v1.2.3-70-g09d2