From 257fd1a8f0aa0b26aa8331b390315567344f4e2b Mon Sep 17 00:00:00 2001
From: Haru <haru@dotalux.com>
Date: Thu, 19 Sep 2013 02:27:17 +0200
Subject: Fixed a startup crash due to minicore/regular core mismatches

- Follow-up to / discovered in babdf60

Signed-off-by: Haru <haru@dotalux.com>
---
 src/common/Makefile.in | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/common/Makefile.in b/src/common/Makefile.in
index 7efad9e45..00d63dd5e 100644
--- a/src/common/Makefile.in
+++ b/src/common/Makefile.in
@@ -11,11 +11,13 @@ LIBCONFIG_H = $(addprefix $(LIBCONFIG_D)/, libconfig.h grammar.h parsectx.h \
 	      scanctx.h scanner.h strbuf.h wincompat.h)
 LIBCONFIG_INCLUDE = -I$(LIBCONFIG_D)
 
-COMMON_OBJ = $(addprefix obj_all/, conf.o console.o core.o db.o des.o ers.o \
-	     grfio.o HPM.o malloc.o mapindex.o md5calc.o mempool.o \
-	     miniconsole.o minicore.o minimalloc.o minisocket.o mutex.o \
-	     nullpo.o raconf.o random.o showmsg.o socket.o strlib.o thread.o \
-	     timer.o utils.o)
+COMMON_SHARED_OBJ = conf.o db.o des.o ers.o grfio.o HPM.o mapindex.o \
+		    md5calc.o mempool.o mutex.o nullpo.o raconf.o random.o \
+		    showmsg.o strlib.o thread.o timer.o utils.o
+COMMON_OBJ = $(addprefix obj_all/, $(COMMON_SHARED_OBJ) \
+	     console.o core.o malloc.o socket.o)
+COMMON_MINI_OBJ = $(addprefix obj_all/, $(COMMON_SHARED_OBJ) \
+		  miniconsole.o minicore.o minimalloc.o minisocket.o)
 COMMON_H = atomic.h cbasetypes.h conf.h console.h core.h db.h des.h ers.h \
 	   evdp.h grfio.h HPM.h HPMi.h malloc.h mapindex.h md5calc.h \
 	   mempool.h mmo.h mutex.h netbuffer.h network.h nullpo.h raconf.h \
@@ -27,7 +29,7 @@ COMMON_SQL_H = sql.h
 
 HAVE_MYSQL=@HAVE_MYSQL@
 ifeq ($(HAVE_MYSQL),yes)
-	SQL_DEPENDS=common common_sql
+	SQL_DEPENDS=common common_sql common_mini
 else
 	SQL_DEPENDS=needs_mysql
 endif
@@ -38,7 +40,7 @@ CC = @CC@
 export CC
 
 #####################################################################
-.PHONY: all sql common common_sql clean help
+.PHONY: all sql common common_sql common_mini clean help
 
 all: sql
 
@@ -75,12 +77,18 @@ obj_all/common.a: $(COMMON_OBJ)
 	@echo "	AR	$@"
 	@@AR@ rcs obj_all/common.a $(COMMON_OBJ)
 
+obj_all/common_mini.a: $(COMMON_MINI_OBJ)
+	@echo "	AR	$@"
+	@@AR@ rcs obj_all/common_mini.a $(COMMON_MINI_OBJ)
+
 obj_sql/common_sql.a: $(COMMON_SQL_OBJ)
 	@echo "	AR	$@"
 	@@AR@ rcs obj_sql/common_sql.a $(COMMON_SQL_OBJ)
 
 common: $(COMMON_OBJ) $(MT19937AR_OBJ) $(LIBCONFIG_OBJ) obj_all/common.a
 
+common_mini: $(COMMON_MINI_OBJ) $(MT19937AR_OBJ) $(LIBCONFIG_OBJ) obj_all/common_mini.a
+
 common_sql: $(COMMON_SQL_OBJ) obj_sql/common_sql.a
 
 obj_all/%.o: %.c $(COMMON_H) $(CONFIG_H) $(MT19937AR_H) $(LIBCONFIG_H) | obj_all
-- 
cgit v1.2.3-60-g2f50