summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorReid <reidyaro@gmail.com>2012-01-25 22:05:36 +0100
committerReid <reidyaro@gmail.com>2012-01-25 22:05:36 +0100
commit8b612abb42853a22c1a9545e2c9280d154646543 (patch)
treef466167087c2b2de4b8aa9e6d1d1986f72f84147 /Makefile.am
parenta913dd41df61760de6ece552f941e002251ff54c (diff)
parentd340b5a27a8f3b05d1764da9c114f5f59bd0cd46 (diff)
downloadplus-8b612abb42853a22c1a9545e2c9280d154646543.tar.gz
plus-8b612abb42853a22c1a9545e2c9280d154646543.tar.bz2
plus-8b612abb42853a22c1a9545e2c9280d154646543.tar.xz
plus-8b612abb42853a22c1a9545e2c9280d154646543.zip
Merge branch 'master' of gitorious.org:manaplus/manaplus
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am4
1 files changed, 3 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index 6ef412c71..3347ca06b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,7 +3,8 @@ SUBDIRS = data docs po src
desktopdir = $(datarootdir)/applications
-desktop_DATA = manaplus.desktop
+desktop_DATA = manaplus.desktop \
+ manaplustest.desktop
# Extra files to include
EXTRA_DIST = $(desktop_DATA) \
@@ -13,6 +14,7 @@ EXTRA_DIST = $(desktop_DATA) \
CMake/Modules/FindENet.cmake \
CMake/Modules/FindLibIntl.cmake \
CMake/Modules/FindSDL_gfx.cmake \
+ manaplustest \
manaplus.cbp \
manaplus.menu \
manaplus.spec \