summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2006-12-22 21:44:05 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2006-12-22 21:44:05 +0000
commit6daadf4603756025de301a88a921404f2d76a918 (patch)
treeabe71c49ba8f89b4528c3087df146759a34fba9b
parent2fd5641d39cf157a8edb35a14e91ade600cf6176 (diff)
downloadmana-6daadf4603756025de301a88a921404f2d76a918.tar.gz
mana-6daadf4603756025de301a88a921404f2d76a918.tar.bz2
mana-6daadf4603756025de301a88a921404f2d76a918.tar.xz
mana-6daadf4603756025de301a88a921404f2d76a918.zip
Updated Makefiles.
-rw-r--r--ChangeLog4
-rw-r--r--data/CMakeLists.txt5
-rw-r--r--data/Makefile.am5
3 files changed, 10 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index c209bcdf..0dba907b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,10 @@
data/graphics/sprites/head-rangerhat.xml, data/items.xml,
data/equipment.xml, data/monsters.xml: Added new Christmas themed
headwear by Pauan.
+ * data/graphics/items/Makefile.am, data/graphics/items/CMakeLists.txt,
+ data/graphics/sprites/Makefile.am,
+ data/graphics/sprites/CMakeLists.txt, data/Makefile.am,
+ data/CMakeLists.txt: Updated Makefiles.
2006-12-21 Bjørn Lindeijer <bjorn@lindeijer.nl>
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index e60bfe30..2d2aa82f 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -7,8 +7,9 @@ ADD_SUBDIRECTORY(maps)
ADD_SUBDIRECTORY(sfx)
SET(FILES
- equipment.xml
+ equipment.xml
items.xml
+ monsters.xml
)
-INSTALL(FILES ${FILES} DESTINATION ${DATA_DIR}) \ No newline at end of file
+INSTALL(FILES ${FILES} DESTINATION ${DATA_DIR})
diff --git a/data/Makefile.am b/data/Makefile.am
index ed080d08..e15630cc 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -5,7 +5,8 @@ tmwdatadir = $(pkgdatadir)/data
tmwdata_DATA = \
equipment.xml \
- items.xml
+ items.xml \
+ monsters.xml
EXTRA_DIST = \
- $(tmwdata_DATA) \ No newline at end of file
+ $(tmwdata_DATA)