[Tux4kids-commits] r587 - in tuxmath/branches/mathcards_newarch: . data/missions data/missions/arcade data/missions/campaign data/missions/campaign/ace data/missions/campaign/cadet data/missions/campaign/commando data/missions/campaign/ranger data/missions/campaign/scout data/missions/lessons src

dbruce-guest at alioth.debian.org dbruce-guest at alioth.debian.org
Tue Aug 5 12:27:02 UTC 2008


Author: dbruce-guest
Date: 2008-08-05 12:27:01 +0000 (Tue, 05 Aug 2008)
New Revision: 587

Added:
   tuxmath/branches/mathcards_newarch/data/missions/campaign/Makefile.am
   tuxmath/branches/mathcards_newarch/data/missions/campaign/ace/Makefile.am
   tuxmath/branches/mathcards_newarch/data/missions/campaign/cadet/Makefile.am
   tuxmath/branches/mathcards_newarch/data/missions/campaign/commando/Makefile.am
   tuxmath/branches/mathcards_newarch/data/missions/campaign/ranger/Makefile.am
   tuxmath/branches/mathcards_newarch/data/missions/campaign/scout/Makefile.am
Modified:
   tuxmath/branches/mathcards_newarch/configure
   tuxmath/branches/mathcards_newarch/configure.ac
   tuxmath/branches/mathcards_newarch/data/missions/Makefile.am
   tuxmath/branches/mathcards_newarch/data/missions/arcade/Makefile.am
   tuxmath/branches/mathcards_newarch/data/missions/lessons/Makefile.am
   tuxmath/branches/mathcards_newarch/src/Makefile.in
   tuxmath/branches/mathcards_newarch/src/tuxmath.h
Log:
Autotools stuff - updates to configure.ac and added several Makefile.am's



Modified: tuxmath/branches/mathcards_newarch/configure
===================================================================
--- tuxmath/branches/mathcards_newarch/configure	2008-08-05 11:22:58 UTC (rev 586)
+++ tuxmath/branches/mathcards_newarch/configure	2008-08-05 12:27:01 UTC (rev 587)
@@ -17132,7 +17132,7 @@
 # Create Makefiles
 # ---------------------------------------------------------------
 
-ac_config_files="$ac_config_files Makefile data/Makefile data/fonts/Makefile data/images/Makefile data/images/backgrounds/Makefile data/images/cities/Makefile data/images/comets/Makefile data/images/icons/Makefile data/images/igloos/Makefile data/images/penguins/Makefile data/images/sprites/Makefile data/images/status/Makefile data/images/title/Makefile data/images/tux/Makefile data/missions/Makefile data/missions/arcade/Makefile data/missions/lessons/Makefile data/sounds/Makefile doc/Makefile nsis/tuxmath.nsi nsis/tuxmath_with_conf.nsi src/Makefile intl/Makefile po/Makefile.in"
+ac_config_files="$ac_config_files Makefile data/Makefile data/fonts/Makefile data/images/Makefile data/images/backgrounds/Makefile data/images/cities/Makefile data/images/comets/Makefile data/images/icons/Makefile data/images/igloos/Makefile data/images/penguins/Makefile data/images/sprites/Makefile data/images/status/Makefile data/images/title/Makefile data/images/tux/Makefile data/missions/Makefile data/missions/arcade/Makefile data/missions/campaign/Makefile data/missions/campaign/ace/Makefile data/missions/campaign/cadet/Makefile data/missions/campaign/commando/Makefile data/missions/campaign/ranger/Makefile data/missions/campaign/scout/Makefile data/missions/lessons/Makefile data/sounds/Makefile doc/Makefile nsis/tuxmath.nsi nsis/tuxmath_with_conf.nsi src/Makefile intl/Makefile po/Makefile.in"
 
 
 cat >confcache <<\_ACEOF
@@ -17759,6 +17759,12 @@
     "data/images/tux/Makefile") CONFIG_FILES="$CONFIG_FILES data/images/tux/Makefile" ;;
     "data/missions/Makefile") CONFIG_FILES="$CONFIG_FILES data/missions/Makefile" ;;
     "data/missions/arcade/Makefile") CONFIG_FILES="$CONFIG_FILES data/missions/arcade/Makefile" ;;
+    "data/missions/campaign/Makefile") CONFIG_FILES="$CONFIG_FILES data/missions/campaign/Makefile" ;;
+    "data/missions/campaign/ace/Makefile") CONFIG_FILES="$CONFIG_FILES data/missions/campaign/ace/Makefile" ;;
+    "data/missions/campaign/cadet/Makefile") CONFIG_FILES="$CONFIG_FILES data/missions/campaign/cadet/Makefile" ;;
+    "data/missions/campaign/commando/Makefile") CONFIG_FILES="$CONFIG_FILES data/missions/campaign/commando/Makefile" ;;
+    "data/missions/campaign/ranger/Makefile") CONFIG_FILES="$CONFIG_FILES data/missions/campaign/ranger/Makefile" ;;
+    "data/missions/campaign/scout/Makefile") CONFIG_FILES="$CONFIG_FILES data/missions/campaign/scout/Makefile" ;;
     "data/missions/lessons/Makefile") CONFIG_FILES="$CONFIG_FILES data/missions/lessons/Makefile" ;;
     "data/sounds/Makefile") CONFIG_FILES="$CONFIG_FILES data/sounds/Makefile" ;;
     "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;

Modified: tuxmath/branches/mathcards_newarch/configure.ac
===================================================================
--- tuxmath/branches/mathcards_newarch/configure.ac	2008-08-05 11:22:58 UTC (rev 586)
+++ tuxmath/branches/mathcards_newarch/configure.ac	2008-08-05 12:27:01 UTC (rev 587)
@@ -219,6 +219,12 @@
 data/images/tux/Makefile
 data/missions/Makefile
 data/missions/arcade/Makefile
+data/missions/campaign/Makefile
+data/missions/campaign/ace/Makefile
+data/missions/campaign/cadet/Makefile
+data/missions/campaign/commando/Makefile
+data/missions/campaign/ranger/Makefile
+data/missions/campaign/scout/Makefile
 data/missions/lessons/Makefile
 data/sounds/Makefile
 doc/Makefile

Modified: tuxmath/branches/mathcards_newarch/data/missions/Makefile.am
===================================================================
--- tuxmath/branches/mathcards_newarch/data/missions/Makefile.am	2008-08-05 11:22:58 UTC (rev 586)
+++ tuxmath/branches/mathcards_newarch/data/missions/Makefile.am	2008-08-05 12:27:01 UTC (rev 587)
@@ -1,7 +1,7 @@
 ## Makefile.am for tuxmath - data/missions:
 ## Process with Automake to create Makefile.in
 
-SUBDIRS = arcade lessons
+SUBDIRS = arcade campaign lessons
 
 missionsdir = $(pkgdatadir)/missions
 

Modified: tuxmath/branches/mathcards_newarch/data/missions/arcade/Makefile.am
===================================================================
--- tuxmath/branches/mathcards_newarch/data/missions/arcade/Makefile.am	2008-08-05 11:22:58 UTC (rev 586)
+++ tuxmath/branches/mathcards_newarch/data/missions/arcade/Makefile.am	2008-08-05 12:27:01 UTC (rev 587)
@@ -4,6 +4,7 @@
 arcadedir = $(pkgdatadir)/missions/arcade
 
 dist_arcade_DATA = ace \
+  commando \
   ranger \
   scout \
   space_cadet

Added: tuxmath/branches/mathcards_newarch/data/missions/campaign/Makefile.am
===================================================================
--- tuxmath/branches/mathcards_newarch/data/missions/campaign/Makefile.am	                        (rev 0)
+++ tuxmath/branches/mathcards_newarch/data/missions/campaign/Makefile.am	2008-08-05 12:27:01 UTC (rev 587)
@@ -0,0 +1,8 @@
+## Makefile.am for tuxmath - data/missions/campaign:
+## Process with Automake to create Makefile.in
+
+SUBDIRS = ace cadet commando ranger scout
+
+campaigndir = $(pkgdatadir)/missions/campaign
+
+dist_campaign_DATA = campaign

Added: tuxmath/branches/mathcards_newarch/data/missions/campaign/ace/Makefile.am
===================================================================
--- tuxmath/branches/mathcards_newarch/data/missions/campaign/ace/Makefile.am	                        (rev 0)
+++ tuxmath/branches/mathcards_newarch/data/missions/campaign/ace/Makefile.am	2008-08-05 12:27:01 UTC (rev 587)
@@ -0,0 +1,10 @@
+## Makefile.am for tuxmath - data/missions/campaign/ace:
+## Process with Automake to create Makefile.in
+
+campaignacedir = $(pkgdatadir)/missions/campaign/ace
+
+dist_campaignace_DATA = ace \
+  bonus \
+  round1 \
+  round2 \
+  round3

Added: tuxmath/branches/mathcards_newarch/data/missions/campaign/cadet/Makefile.am
===================================================================
--- tuxmath/branches/mathcards_newarch/data/missions/campaign/cadet/Makefile.am	                        (rev 0)
+++ tuxmath/branches/mathcards_newarch/data/missions/campaign/cadet/Makefile.am	2008-08-05 12:27:01 UTC (rev 587)
@@ -0,0 +1,10 @@
+## Makefile.am for tuxmath - data/missions/campaign/ace:
+## Process with Automake to create Makefile.in
+
+campaigncadetdir = $(pkgdatadir)/missions/campaign/cadet
+
+dist_campaigncadet_DATA = cadet \
+  bonus \
+  round1 \
+  round2 \
+  round3

Added: tuxmath/branches/mathcards_newarch/data/missions/campaign/commando/Makefile.am
===================================================================
--- tuxmath/branches/mathcards_newarch/data/missions/campaign/commando/Makefile.am	                        (rev 0)
+++ tuxmath/branches/mathcards_newarch/data/missions/campaign/commando/Makefile.am	2008-08-05 12:27:01 UTC (rev 587)
@@ -0,0 +1,9 @@
+## Makefile.am for tuxmath - data/missions/campaign/commando:
+## Process with Automake to create Makefile.in
+
+campaigncommandodir = $(pkgdatadir)/missions/campaign/commando
+
+dist_campaigncommando_DATA = commando \
+  round1 \
+  round2 \
+  round3

Added: tuxmath/branches/mathcards_newarch/data/missions/campaign/ranger/Makefile.am
===================================================================
--- tuxmath/branches/mathcards_newarch/data/missions/campaign/ranger/Makefile.am	                        (rev 0)
+++ tuxmath/branches/mathcards_newarch/data/missions/campaign/ranger/Makefile.am	2008-08-05 12:27:01 UTC (rev 587)
@@ -0,0 +1,10 @@
+## Makefile.am for tuxmath - data/missions/campaign/ranger:
+## Process with Automake to create Makefile.in
+
+campaignrangerdir = $(pkgdatadir)/missions/campaign/ranger
+
+dist_campaignranger_DATA = ranger \
+  bonus \
+  round1 \
+  round2 \
+  round3

Added: tuxmath/branches/mathcards_newarch/data/missions/campaign/scout/Makefile.am
===================================================================
--- tuxmath/branches/mathcards_newarch/data/missions/campaign/scout/Makefile.am	                        (rev 0)
+++ tuxmath/branches/mathcards_newarch/data/missions/campaign/scout/Makefile.am	2008-08-05 12:27:01 UTC (rev 587)
@@ -0,0 +1,10 @@
+## Makefile.am for tuxmath - data/missions/campaign/scout:
+## Process with Automake to create Makefile.in
+
+campaignscoutdir = $(pkgdatadir)/missions/campaign/scout
+
+dist_campaignscout_DATA = scout \
+  bonus \
+  round1 \
+  round2 \
+  round3

Modified: tuxmath/branches/mathcards_newarch/data/missions/lessons/Makefile.am
===================================================================
--- tuxmath/branches/mathcards_newarch/data/missions/lessons/Makefile.am	2008-08-05 11:22:58 UTC (rev 586)
+++ tuxmath/branches/mathcards_newarch/data/missions/lessons/Makefile.am	2008-08-05 12:27:01 UTC (rev 587)
@@ -1,9 +1,6 @@
 ## Makefile.am for tuxmath - data/missions/lessons:
 ## Process with Automake to create Makefile.in
 
-
-
-
 lessonsdir = $(pkgdatadir)/missions/lessons
 
 dist_lessons_DATA = lesson00 \

Modified: tuxmath/branches/mathcards_newarch/src/Makefile.in
===================================================================
--- tuxmath/branches/mathcards_newarch/src/Makefile.in	2008-08-05 11:22:58 UTC (rev 586)
+++ tuxmath/branches/mathcards_newarch/src/Makefile.in	2008-08-05 12:27:01 UTC (rev 587)
@@ -69,9 +69,9 @@
 am__objects_1 = tuxmath.$(OBJEXT) setup.$(OBJEXT) \
 	titlescreen.$(OBJEXT) game.$(OBJEXT) options.$(OBJEXT) \
 	credits.$(OBJEXT) highscore.$(OBJEXT) loaders.$(OBJEXT) \
-	audio.$(OBJEXT) mathcards.$(OBJEXT) fileops.$(OBJEXT) \
-	ConvertUTF.$(OBJEXT) SDL_extras.$(OBJEXT) lessons.$(OBJEXT) \
-	scandir.$(OBJEXT) pixels.$(OBJEXT)
+	audio.$(OBJEXT) mathcards.$(OBJEXT) campaign.$(OBJEXT) \
+	fileops.$(OBJEXT) ConvertUTF.$(OBJEXT) SDL_extras.$(OBJEXT) \
+	lessons.$(OBJEXT) scandir.$(OBJEXT) pixels.$(OBJEXT)
 am_TuxMath_OBJECTS = $(am__objects_1)
 TuxMath_OBJECTS = $(am_TuxMath_OBJECTS)
 TuxMath_LDADD = $(LDADD)
@@ -79,9 +79,9 @@
 am_tuxmath_OBJECTS = tuxmath.$(OBJEXT) setup.$(OBJEXT) \
 	titlescreen.$(OBJEXT) game.$(OBJEXT) options.$(OBJEXT) \
 	credits.$(OBJEXT) highscore.$(OBJEXT) loaders.$(OBJEXT) \
-	audio.$(OBJEXT) mathcards.$(OBJEXT) fileops.$(OBJEXT) \
-	ConvertUTF.$(OBJEXT) SDL_extras.$(OBJEXT) lessons.$(OBJEXT) \
-	scandir.$(OBJEXT) pixels.$(OBJEXT)
+	audio.$(OBJEXT) mathcards.$(OBJEXT) campaign.$(OBJEXT) \
+	fileops.$(OBJEXT) ConvertUTF.$(OBJEXT) SDL_extras.$(OBJEXT) \
+	lessons.$(OBJEXT) scandir.$(OBJEXT) pixels.$(OBJEXT)
 tuxmath_OBJECTS = $(am_tuxmath_OBJECTS)
 tuxmath_LDADD = $(LDADD)
 tuxmath_DEPENDENCIES =
@@ -274,6 +274,7 @@
 	loaders.c	\
 	audio.c 	\
 	mathcards.c	\
+	campaign.c	\
 	fileops.c	\
 	ConvertUTF.c	\
 	SDL_extras.c	\
@@ -291,6 +292,7 @@
 		options.h	\
 		setup.h		\
 		titlescreen.h	\
+		campaign.h	\
 		tuxmath.h	\
 		ConvertUTF.h	\
 		SDL_extras.h	\
@@ -378,6 +380,7 @@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ConvertUTF.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/SDL_extras.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/audio.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/campaign.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/credits.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/fileops.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/game.Po at am__quote@

Modified: tuxmath/branches/mathcards_newarch/src/tuxmath.h
===================================================================
--- tuxmath/branches/mathcards_newarch/src/tuxmath.h	2008-08-05 11:22:58 UTC (rev 586)
+++ tuxmath/branches/mathcards_newarch/src/tuxmath.h	2008-08-05 12:27:01 UTC (rev 587)
@@ -22,6 +22,8 @@
 #ifndef TUXMATH_H
 #define TUXMATH_H
 
+//To build with CMake, comment out this line so we don't include "config.h"
+//To build with Autotools, uncomment it as we must have "config.h"
 //#include "config.h"
 
 // Translation stuff (now works for Mac and Win too!): 




More information about the Tux4kids-commits mailing list