summaryrefslogtreecommitdiff
path: root/src/Makefile.am
diff options
context:
space:
mode:
authorJared Adams <jaxad0127@gmail.com>2009-11-26 23:25:35 -0700
committerJared Adams <jaxad0127@gmail.com>2009-11-26 23:25:35 -0700
commit62d86f1c84678e04e7015a8f2440f0c251887c21 (patch)
tree5f79a8c7c733241dbfe0b325923629ddcd2026d1 /src/Makefile.am
parentedf478e1eb7987e35d56df2777fbeb389dc915ec (diff)
downloadmana-62d86f1c84678e04e7015a8f2440f0c251887c21.tar.gz
mana-62d86f1c84678e04e7015a8f2440f0c251887c21.tar.bz2
mana-62d86f1c84678e04e7015a8f2440f0c251887c21.tar.xz
mana-62d86f1c84678e04e7015a8f2440f0c251887c21.zip
Merge a little more and remove the BuddyWindow
The BuddyWindow was only half implemented and would have been made redundant with the planned social window.
Diffstat (limited to 'src/Makefile.am')
-rw-r--r--src/Makefile.am10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 9bbcbc29..cb54815e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -99,6 +99,10 @@ mana_SOURCES = gui/widgets/avatar.cpp \
gui/focushandler.h \
gui/gui.cpp \
gui/gui.h \
+ gui/guildlistbox.cpp \
+ gui/guildlistbox.h \
+ gui/guildwindow.cpp \
+ gui/guildwindow.h \
gui/help.cpp \
gui/help.h \
gui/inventorywindow.cpp \
@@ -391,12 +395,6 @@ mana_SOURCES = gui/widgets/avatar.cpp \
if SERVER_MANASERV
mana_CXXFLAGS += -DMANASERV_SUPPORT
mana_SOURCES += \
- gui/buddywindow.cpp \
- gui/buddywindow.h \
- gui/guildlistbox.cpp \
- gui/guildlistbox.h \
- gui/guildwindow.cpp \
- gui/guildwindow.h \
net/manaserv/adminhandler.cpp \
net/manaserv/adminhandler.h \
net/manaserv/beinghandler.cpp \