From ccd272519ec38b15fa5ec24fe4c6daa6eb45e3da Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Fri, 27 Feb 2015 00:37:57 +0300
Subject: Fix compilation for eathena only.

---
 src/CMakeLists.txt | 22 +++++++++++++++-------
 src/Makefile.am    | 15 +++++++++------
 2 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 99bd0a3ab..ef6ecdb6a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1389,6 +1389,15 @@ SET(SRCS_TMWA
     net/tmwa/vendinghandler.h
     )
 
+SET(SRCS_TMWAEATHENA
+    net/tmwa/auctionhandler.cpp
+    net/tmwa/auctionhandler.h
+    net/tmwa/bankhandler.cpp
+    net/tmwa/bankhandler.h
+    net/tmwa/buyingstorehandler.cpp
+    net/tmwa/buyingstorehandler.h
+    )
+
 SET(SRCS_EATHENA
     gui/windows/bankwindow.cpp
     gui/windows/bankwindow.h
@@ -1413,12 +1422,6 @@ SET(SRCS_EATHENA
     net/auctionhandler.h
     net/bankhandler.h
     net/buyingstorehandler.h
-    net/tmwa/auctionhandler.cpp
-    net/tmwa/auctionhandler.h
-    net/tmwa/bankhandler.cpp
-    net/tmwa/bankhandler.h
-    net/tmwa/buyingstorehandler.cpp
-    net/tmwa/buyingstorehandler.h
     net/eathena/adminhandler.cpp
     net/eathena/adminhandler.h
     net/eathena/auctionhandler.cpp
@@ -1519,11 +1522,16 @@ ENDIF ()
 SET (PROGRAMS manaplus dyecmd)
 
 IF (ENABLE_EATHENA)
+IF (ENABLE_TMWA)
+    SET(SRCS ${SRCS} ${SRCS_EATHENA} ${SRCS_TMWA} ${SRCS_TMWAEATHENA})
+ELSE
     SET(SRCS ${SRCS} ${SRCS_EATHENA})
-ENDIF(ENABLE_EATHENA)
+ENDIF(ENABLE_TMWA)
+ELSE
 IF (ENABLE_TMWA)
     SET(SRCS ${SRCS} ${SRCS_TMWA})
 ENDIF(ENABLE_TMWA)
+ENDIF(ENABLE_EATHENA)
 
 ADD_EXECUTABLE(manaplus WIN32 ${SRCS} ${SRCS_EVOL})
 ADD_EXECUTABLE(dyecmd WIN32 ${DYE_CMD_SRCS})
diff --git a/src/Makefile.am b/src/Makefile.am
index 80d4128c5..289aa0116 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1324,6 +1324,15 @@ manaplus_SOURCES += \
 endif
 
 if ENABLE_EATHENA
+if ENABLE_TMWA
+manaplus_SOURCES += net/tmwa/auctionhandler.cpp \
+	      net/tmwa/auctionhandler.h \
+	      net/tmwa/bankhandler.cpp \
+	      net/tmwa/bankhandler.h \
+	      net/tmwa/buyingstorehandler.cpp \
+	      net/tmwa/buyingstorehandler.h
+endif
+
 manaplus_CXXFLAGS += -DEATHENA_SUPPORT
 manaplus_SOURCES += gui/windows/bankwindow.cpp \
 	      gui/windows/bankwindow.h \
@@ -1348,12 +1357,6 @@ manaplus_SOURCES += gui/windows/bankwindow.cpp \
 	      net/auctionhandler.h \
 	      net/bankhandler.h \
 	      net/buyingstorehandler.h \
-	      net/tmwa/auctionhandler.cpp \
-	      net/tmwa/auctionhandler.h \
-	      net/tmwa/bankhandler.cpp \
-	      net/tmwa/bankhandler.h \
-	      net/tmwa/buyingstorehandler.cpp \
-	      net/tmwa/buyingstorehandler.h \
 	      net/eathena/adminhandler.cpp \
 	      net/eathena/adminhandler.h \
 	      net/eathena/auctionhandler.cpp \
-- 
cgit v1.2.3-70-g09d2