[Tux4kids-commits] r1251 - in tuxtype/branches/gsoc-sarah: . data/images/menu
David Bruce
dbruce-guest at alioth.debian.org
Wed Jul 22 03:22:55 UTC 2009
Author: dbruce-guest
Date: 2009-07-22 03:22:55 +0000 (Wed, 22 Jul 2009)
New Revision: 1251
Modified:
tuxtype/branches/gsoc-sarah/aclocal.m4
tuxtype/branches/gsoc-sarah/data/images/menu/Makefile.am
Log:
Restored correct Makefile.am for data/images/menu
Modified: tuxtype/branches/gsoc-sarah/aclocal.m4
===================================================================
--- tuxtype/branches/gsoc-sarah/aclocal.m4 2009-07-22 02:21:06 UTC (rev 1250)
+++ tuxtype/branches/gsoc-sarah/aclocal.m4 2009-07-22 03:22:55 UTC (rev 1251)
@@ -3985,61 +3985,59 @@
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-#serial 5
+#serial 4
# _AM_OUTPUT_DEPENDENCY_COMMANDS
# ------------------------------
AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
-[{
- # Autoconf 2.62 quotes --file arguments for eval, but not when files
- # are listed without --file. Let's play safe and only enable the eval
- # if we detect the quoting.
- case $CONFIG_FILES in
- *\'*) eval set x "$CONFIG_FILES" ;;
- *) set x $CONFIG_FILES ;;
- esac
- shift
- for mf
- do
- # Strip MF so we end up with the name of the file.
- mf=`echo "$mf" | sed -e 's/:.*$//'`
- # Check whether this is an Automake generated Makefile or not.
- # We used to match only the files named `Makefile.in', but
- # some people rename them; so instead we look at the file content.
- # Grep'ing the first line is not enough: some people post-process
- # each Makefile.in and add a new line on top of each file to say so.
- # Grep'ing the whole file is not good either: AIX grep has a line
- # limit of 2048, but all sed's we know have understand at least 4000.
- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
- dirpart=`AS_DIRNAME("$mf")`
- else
- continue
- fi
- # Extract the definition of DEPDIR, am__include, and am__quote
- # from the Makefile without running `make'.
- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
- test -z "$DEPDIR" && continue
- am__include=`sed -n 's/^am__include = //p' < "$mf"`
- test -z "am__include" && continue
- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
- # When using ansi2knr, U may be empty or an underscore; expand it
- U=`sed -n 's/^U = //p' < "$mf"`
- # Find all dependency output files, they are included files with
- # $(DEPDIR) in their names. We invoke sed twice because it is the
- # simplest approach to changing $(DEPDIR) to its actual value in the
- # expansion.
- for file in `sed -n "
- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
- # Make sure the directory exists.
- test -f "$dirpart/$file" && continue
- fdir=`AS_DIRNAME(["$file"])`
- AS_MKDIR_P([$dirpart/$fdir])
- # echo "creating $dirpart/$file"
- echo '# dummy' > "$dirpart/$file"
- done
+[# Autoconf 2.62 quotes --file arguments for eval, but not when files
+# are listed without --file. Let's play safe and only enable the eval
+# if we detect the quoting.
+case $CONFIG_FILES in
+*\'*) eval set x "$CONFIG_FILES" ;;
+*) set x $CONFIG_FILES ;;
+esac
+shift
+for mf
+do
+ # Strip MF so we end up with the name of the file.
+ mf=`echo "$mf" | sed -e 's/:.*$//'`
+ # Check whether this is an Automake generated Makefile or not.
+ # We used to match only the files named `Makefile.in', but
+ # some people rename them; so instead we look at the file content.
+ # Grep'ing the first line is not enough: some people post-process
+ # each Makefile.in and add a new line on top of each file to say so.
+ # Grep'ing the whole file is not good either: AIX grep has a line
+ # limit of 2048, but all sed's we know have understand at least 4000.
+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+ dirpart=`AS_DIRNAME("$mf")`
+ else
+ continue
+ fi
+ # Extract the definition of DEPDIR, am__include, and am__quote
+ # from the Makefile without running `make'.
+ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+ test -z "$DEPDIR" && continue
+ am__include=`sed -n 's/^am__include = //p' < "$mf"`
+ test -z "am__include" && continue
+ am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+ # When using ansi2knr, U may be empty or an underscore; expand it
+ U=`sed -n 's/^U = //p' < "$mf"`
+ # Find all dependency output files, they are included files with
+ # $(DEPDIR) in their names. We invoke sed twice because it is the
+ # simplest approach to changing $(DEPDIR) to its actual value in the
+ # expansion.
+ for file in `sed -n "
+ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+ # Make sure the directory exists.
+ test -f "$dirpart/$file" && continue
+ fdir=`AS_DIRNAME(["$file"])`
+ AS_MKDIR_P([$dirpart/$fdir])
+ # echo "creating $dirpart/$file"
+ echo '# dummy' > "$dirpart/$file"
done
-}
+done
])# _AM_OUTPUT_DEPENDENCY_COMMANDS
Modified: tuxtype/branches/gsoc-sarah/data/images/menu/Makefile.am
===================================================================
--- tuxtype/branches/gsoc-sarah/data/images/menu/Makefile.am 2009-07-22 02:21:06 UTC (rev 1250)
+++ tuxtype/branches/gsoc-sarah/data/images/menu/Makefile.am 2009-07-22 03:22:55 UTC (rev 1251)
@@ -1,67 +1,72 @@
-## Makefile.am for tuxtype - data/images:
+## Makefile.am for tuxtype - images/menu:
## Process with Automake to create Makefile.in
-SUBDIRS = backgrounds \
- cities \
- comets \
- hands \
- icons \
- keyboard \
- menu \
- status \
- tux
+images_menudir = $(pkgdatadir)/images/menu
-imagesdir = $(pkgdatadir)/images
-
-dist_images_DATA = README_IMAGES.TXT \
- down.png \
- fishy-.png \
- fishy0.png \
- fishy1.png \
- fishy2.png \
- fishy3.png \
- hidden.jpg \
- insert1.png \
- kcas1_1.jpg \
- kcas1_2.jpg \
- kcas1_3.jpg \
- kcas1_4.jpg \
- kcas2_1.jpg \
- kcas2_2.jpg \
- kcas2_3.jpg \
- kcas2_4.jpg \
- kcas3_1.jpg \
- kcas3_2.jpg \
- kcas3_3.jpg \
- kcas3_4.jpg \
- left.png \
- line2.png \
- main_bkg.png \
- num_0.png \
- nosound.png \
- num_1.png \
- num_2.png \
- num_3.png \
- num_4.png \
- num_5.png \
- num_6.png \
- num_7.png \
- num_8.png \
- num_9.png \
- pract.png \
- right.png \
- splat0.png \
- sound.png \
- standby.png \
- title1.png \
- tutor-alpha.png \
- tutor-alpha2.png \
- tutor.png \
- tutor2.png \
- tutor3.png \
- tux0.png \
- tux1.png \
- tux2.png \
- tux3.png \
- up.png \
- world.png
+dist_images_menu_DATA = cascade0.png\
+cascade1.png\
+cascade10.png\
+cascade2.png\
+cascade3.png\
+cascade4.png\
+cascade5.png\
+cascade6.png\
+cascade7.png\
+cascade8.png\
+cascade9.png\
+cascaded.png\
+comet0.png\
+comet1.png\
+comet2.png\
+comet3.png\
+comet4.png\
+comet5.png\
+cometd.png\
+keyboard0.png\
+keyboard1.png\
+keyboard2.png\
+keyboardd.png\
+keycas0.png\
+keycas1.png\
+keycas2.png\
+keycas3.png\
+keycas4.png\
+keycas5.png\
+keycas6.png\
+keycas7.png\
+keycas8.png\
+keycas9.png\
+keycasd.png\
+lesson0.png\
+lesson1.png\
+lesson2.png\
+lesson3.png\
+lessond.png\
+main0.png\
+main1.png\
+main2.png\
+main3.png\
+main4.png\
+main5.png\
+main6.png\
+main7.png\
+maind.png\
+quit0.png\
+quit1.png\
+quit2.png\
+quit3.png\
+quit4.png\
+quit5.png\
+quit6.png\
+quit7.png\
+quit8.png\
+quitd.png\
+reg0.png\
+reg1.png\
+reg2.png\
+sel0.png\
+sel1.png\
+sel2.png\
+tux_config0.png\
+tux_config1.png\
+tux_configd.png
More information about the Tux4kids-commits
mailing list