summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Longbons <b.r.longbons@gmail.com>2011-03-17 15:43:37 -0700
committerBen Longbons <b.r.longbons@gmail.com>2011-03-18 00:00:29 -0700
commit0fa45b6d05f5533078a018afd6f7bb07b7875723 (patch)
treef99de82c37e40cfe78022505d0fc9f22368942df
parent2f2e6b497412abebb3b55be68f05e3751a46fc9b (diff)
downloadtmwa-0fa45b6d05f5533078a018afd6f7bb07b7875723.tar.gz
tmwa-0fa45b6d05f5533078a018afd6f7bb07b7875723.tar.bz2
tmwa-0fa45b6d05f5533078a018afd6f7bb07b7875723.tar.xz
tmwa-0fa45b6d05f5533078a018afd6f7bb07b7875723.zip
Changes that should have been caught earlier
-rw-r--r--src/char/Makefile3
-rw-r--r--src/common/Makefile4
-rw-r--r--src/ladmin/Makefile2
-rw-r--r--src/login/Makefile3
-rw-r--r--src/map/Makefile4
-rw-r--r--src/tool/eathena-monitor.c1
6 files changed, 5 insertions, 12 deletions
diff --git a/src/char/Makefile b/src/char/Makefile
index 6f2e4af..308747d 100644
--- a/src/char/Makefile
+++ b/src/char/Makefile
@@ -1,7 +1,6 @@
include ../../make.defs
-all: txt
-txt: char
+all: char
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
diff --git a/src/common/Makefile b/src/common/Makefile
index 48e75d8..549268b 100644
--- a/src/common/Makefile
+++ b/src/common/Makefile
@@ -1,12 +1,12 @@
include ../../make.defs
-all txt sql: core.o socket.o timer.o grfio.o db.o lock.o nullpo.o malloc.o mt_rand.o md5calc.o
+all: core.o socket.o timer.o grfio.o db.o lock.o nullpo.o malloc.o mt_rand.o md5calc.o
core.o: core.c core.h
socket.o: socket.c socket.h mmo.h
timer.o: timer.c timer.h
grfio.o: grfio.c grfio.h
db.o: db.c db.h
-lock.o: lock.h
+lock.o: lock.c lock.h
nullpo.o: nullpo.c nullpo.h
malloc.o: malloc.c malloc.h
mt_rand.o: mt_rand.c mt_rand.h
diff --git a/src/ladmin/Makefile b/src/ladmin/Makefile
index cb7e764..e873e69 100644
--- a/src/ladmin/Makefile
+++ b/src/ladmin/Makefile
@@ -1,8 +1,6 @@
include ../../make.defs
all: ladmin
-txt: ladmin
-sql: ladmin
COMMON_OBJ = ../common/core.o ../common/socket.o ../common/timer.o ../common/db.o ../common/malloc.o ../common/mt_rand.o
COMMON_H = ../common/core.h ../common/socket.h ../common/timer.h ../common/mmo.h ../common/version.h ../common/db.h ../common/malloc.h ../common/mt_rand.h
diff --git a/src/login/Makefile b/src/login/Makefile
index 185cffb..8a7e5a6 100644
--- a/src/login/Makefile
+++ b/src/login/Makefile
@@ -1,7 +1,6 @@
include ../../make.defs
-all: txt
-txt: login
+all: login
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/md5calc.o
COMMON_H = ../common/core.h ../common/socket.h ../common/timer.h ../common/mmo.h ../common/version.h ../common/db.h ../common/lock.h ../common/malloc.h ../common/mt_rand.h ../common/md5calc.h
diff --git a/src/map/Makefile b/src/map/Makefile
index c7c982e..f31279c 100644
--- a/src/map/Makefile
+++ b/src/map/Makefile
@@ -1,8 +1,6 @@
include ../../make.defs
-all: txt
-
-txt: map
+all: map
obj:
mkdir obj
diff --git a/src/tool/eathena-monitor.c b/src/tool/eathena-monitor.c
index 8713dff..04a48cf 100644
--- a/src/tool/eathena-monitor.c
+++ b/src/tool/eathena-monitor.c
@@ -155,7 +155,6 @@ pid_t start_process(const char *exec) {
}
// Kill all children with the same signal we got, then ourself.
-// Note that none of the servers do any signal handling themselves.
void stop_process(int sig) {
if (pid_map) kill(pid_map, sig);
if (pid_login) kill(pid_login, sig);