[Tux4kids-commits] [SCM] tuxhistory - Educational history game branch, master, updated. a3a12e22637587041d6c9efdff3704d1022a3be5

[julio (none)]

The following commit has been merged in the master branch:
commit a3a12e22637587041d6c9efdff3704d1022a3be5
Author: julio <julio at julio-desktop.(none)>
Date:   Sat Jun 19 00:49:34 2010 -0500

    Adding forest images Makefiles

diff --git a/configure.ac b/configure.ac
index d716798..a874a4e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -438,6 +438,7 @@ data/images/terrain/savannah/Makefile
 data/images/terrain/swamp/Makefile
 data/images/terrain/tundra/Makefile
 data/images/terrain/unexplored/Makefile
+data/images/forest/Makefile
 data/menus/Makefile
 data/sounds/Makefile
 doc/Makefile
diff --git a/data/images/Makefile.am b/data/images/Makefile.am
index 99ca50f..0ed668e 100644
--- a/data/images/Makefile.am
+++ b/data/images/Makefile.am
@@ -3,6 +3,7 @@
 
 SUBDIRS = backgrounds \
   terrain \
+  forest \
   icons \
   penguins \
   status \
diff --git a/data/images/forest/Makefile.am b/data/images/forest/Makefile.am
index eb36b07..9ec81a5 100644
--- a/data/images/forest/Makefile.am
+++ b/data/images/forest/Makefile.am
@@ -1,10 +1,14 @@
-## Makefile.am for tuxhistory - data/forests:
-## Process with Automake to create Makefile.in
+## Makefile.am for tuxhistory data/images/forest:
 
-SUBDIRS = fonts	\
-	images	\
-	menus \
-	maps \
-	sounds
+## Process with AutoMake:
 
-#EXTRA_DIST = options
+forestndir = $(pkgdatadir)/images/forest
+
+dist_ocean_DATA = boreal.png \
+conifer.png  \
+mixed.png  \
+scrub.png \
+wetland.png \
+broadleaf.png \
+rain.png \
+tropical.png

-- 
tuxhistory - Educational history game