summaryrefslogtreecommitdiff
path: root/src/Makefile.am
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2009-02-09 22:30:00 +0100
committerIra Rice <irarice@gmail.com>2009-02-09 17:10:37 -0700
commit1db7d10787f462430054ba04110a8d4647bdbd0a (patch)
tree60dc4d04c738b1f54a41bc9d9b6d0e5ffb0fb1d4 /src/Makefile.am
parent1ae95b709235ce811ce72437aa257bb7500e00d0 (diff)
downloadmana-1db7d10787f462430054ba04110a8d4647bdbd0a.tar.gz
mana-1db7d10787f462430054ba04110a8d4647bdbd0a.tar.bz2
mana-1db7d10787f462430054ba04110a8d4647bdbd0a.tar.xz
mana-1db7d10787f462430054ba04110a8d4647bdbd0a.zip
Mostly whitespace fixes
Removed tab characters and trailing spaces and added spaces between "if(", "for(", "while(" and "switch(".
Diffstat (limited to 'src/Makefile.am')
-rw-r--r--src/Makefile.am10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index be2258f5..4a6461dd 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,3 +1,5 @@
+AUTOMAKE_OPTIONS = subdir-objects
+
bin_PROGRAMS = aethyra
aethyra_SOURCES = gui/widgets/dropdown.cpp \
gui/widgets/dropdown.h \
@@ -187,8 +189,8 @@ aethyra_SOURCES = gui/widgets/dropdown.cpp \
net/network.h \
net/npchandler.cpp \
net/npchandler.h \
- net/partyhandler.cpp \
- net/partyhandler.h \
+ net/partyhandler.cpp \
+ net/partyhandler.h \
net/playerhandler.cpp \
net/playerhandler.h \
net/protocol.cpp \
@@ -316,8 +318,8 @@ aethyra_SOURCES = gui/widgets/dropdown.cpp \
particleemitter.cpp \
particleemitter.h \
particleemitterprop.h \
- party.cpp \
- party.h \
+ party.cpp \
+ party.h \
player.cpp \
player.h \
player_relations.cpp \