Commit e1868791 authored by Fsugtsr Sreerenj B's avatar Fsugtsr Sreerenj B
parent 4b88577b
# Makefile.in generated by automake 1.10.1 from Makefile.am.
# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
......@@ -93,7 +93,6 @@ ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
GMSGFMT = @GMSGFMT@
GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
......@@ -141,7 +140,6 @@ VERSION = @VERSION@
WINDRES = @WINDRES@
XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
......@@ -335,8 +333,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
$(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
END { if (nonempty) { for (i in files) print i; }; }'`; \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
......@@ -361,8 +359,8 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
END { if (nonempty) { for (i in files) print i; }; }'`; \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
......@@ -372,12 +370,13 @@ ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
here=`pwd`; \
list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
END { if (nonempty) { for (i in files) print i; }; }'`; \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
......@@ -448,10 +447,6 @@ dist-bzip2: distdir
tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
$(am__remove_distdir)
dist-lzma: distdir
tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
$(am__remove_distdir)
dist-tarZ: distdir
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__remove_distdir)
......@@ -478,8 +473,6 @@ distcheck: dist
GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
*.tar.lzma*) \
unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
......@@ -630,18 +623,18 @@ uninstall-am: uninstall-local
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
all all-am am--refresh check check-am clean clean-generic \
clean-local ctags ctags-recursive dist dist-all dist-bzip2 \
dist-gzip dist-lzma dist-shar dist-tarZ dist-zip distcheck \
distclean distclean-generic distclean-hdr distclean-tags \
distcleancheck distdir distuninstallcheck dvi dvi-am html \
html-am info info-am install install-am install-data \
install-data-am install-data-local install-dvi install-dvi-am \
install-exec install-exec-am install-html install-html-am \
install-info install-info-am install-man install-pdf \
install-pdf-am install-ps install-ps-am install-strip \
installcheck installcheck-am installdirs installdirs-am \
maintainer-clean maintainer-clean-generic mostlyclean \
mostlyclean-generic pdf pdf-am ps ps-am tags tags-recursive \
uninstall uninstall-am uninstall-local
dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \
distclean-generic distclean-hdr distclean-tags distcleancheck \
distdir distuninstallcheck dvi dvi-am html html-am info \
info-am install install-am install-data install-data-am \
install-data-local install-dvi install-dvi-am install-exec \
install-exec-am install-html install-html-am install-info \
install-info-am install-man install-pdf install-pdf-am \
install-ps install-ps-am install-strip installcheck \
installcheck-am installdirs installdirs-am maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
uninstall-local
install-data-local:
......
This diff is collapsed.
......@@ -25,7 +25,7 @@
/* Define if the GNU gettext() function is already present or preinstalled. */
#undef HAVE_GETTEXT
/* Define if you have the iconv() function and it works. */
/* Define if you have the iconv() function. */
#undef HAVE_ICONV
/* Define to 1 if you have the <inttypes.h> header file. */
......
This diff is collapsed.
......@@ -341,7 +341,7 @@ Copyright (C) 2006 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
ac_pwd='/usr/local/src/soc-mobin-up'
ac_pwd='/root/tuxtype/trunk'
srcdir='.'
INSTALL='/usr/bin/install -c'
MKDIR_P='/bin/mkdir -p'
......@@ -622,7 +622,7 @@ s,@DEFS@,|#_!!_#|-DHAVE_CONFIG_H,g
s,@ECHO_C@,|#_!!_#|,g
s,@ECHO_N@,|#_!!_#|-n,g
s,@ECHO_T@,|#_!!_#|,g
s,@LIBS@,|#_!!_#|-L/usr/lib -lSDL -lSDL_Pango -lSDL_image -lSDL_ttf -lSDL_mixer ,g
s,@LIBS@,|#_!!_#|-L/usr/local/lib -Wl\,-rpath\,/usr/local/lib -lSDL -lpthread -lSDL_Pango -lSDL_image -lSDL_ttf -lSDL_mixer ,g
s,@build_alias@,|#_!!_#|,g
s,@host_alias@,|#_!!_#|,g
s,@target_alias@,|#_!!_#|,g
......@@ -645,19 +645,19 @@ s,@am__isrc@,|#_!!_#|,g
s,@CYGPATH_W@,|#_!!_#|echo,g
s,@PACKAGE@,|#_!!_#|tuxtype,g
s,@VERSION@,|#_!!_#|1.5.16,g
s,@ACLOCAL@,|#_!!_#|${SHELL} /usr/local/src/soc-mobin-up/missing --run aclocal-1.10,g
s,@AUTOCONF@,|#_!!_#|${SHELL} /usr/local/src/soc-mobin-up/missing --run autoconf,g
s,@AUTOMAKE@,|#_!!_#|${SHELL} /usr/local/src/soc-mobin-up/missing --run automake-1.10,g
s,@AUTOHEADER@,|#_!!_#|${SHELL} /usr/local/src/soc-mobin-up/missing --run autoheader,g
s,@MAKEINFO@,|#_!!_#|${SHELL} /usr/local/src/soc-mobin-up/missing --run makeinfo,g
s,@install_sh@,|#_!!_#|$(SHELL) /usr/local/src/soc-mobin-up/install-sh,g
s,@ACLOCAL@,|#_!!_#|${SHELL} /root/tuxtype/trunk/missing --run aclocal-1.10,g
s,@AUTOCONF@,|#_!!_#|${SHELL} /root/tuxtype/trunk/missing --run autoconf,g
s,@AUTOMAKE@,|#_!!_#|${SHELL} /root/tuxtype/trunk/missing --run automake-1.10,g
s,@AUTOHEADER@,|#_!!_#|${SHELL} /root/tuxtype/trunk/missing --run autoheader,g
s,@MAKEINFO@,|#_!!_#|${SHELL} /root/tuxtype/trunk/missing --run makeinfo,g
s,@install_sh@,|#_!!_#|$(SHELL) /root/tuxtype/trunk/install-sh,g
s,@STRIP@,|#_!!_#|,g
s,@INSTALL_STRIP_PROGRAM@,|#_!!_#|$(install_sh) -c -s,g
s,@mkdir_p@,|#_!!_#|/bin/mkdir -p,g
s,@AWK@,|#_!!_#|mawk,g
s,@AWK@,|#_!!_#|gawk,g
s,@SET_MAKE@,|#_!!_#|,g
s,@am__leading_dot@,|#_!!_#|.,g
s,@AMTAR@,|#_!!_#|${SHELL} /usr/local/src/soc-mobin-up/missing --run tar,g
s,@AMTAR@,|#_!!_#|${SHELL} /root/tuxtype/trunk/missing --run tar,g
s,@am__tar@,|#_!!_#|${AMTAR} chof - "$$tardir",g
s,@am__untar@,|#_!!_#|${AMTAR} xf -,g
s,@USE_NLS@,|#_!!_#|yes,g
......@@ -669,7 +669,7 @@ s,@XGETTEXT@,|#_!!_#|/usr/bin/xgettext,g
s,@XGETTEXT_015@,|#_!!_#|/usr/bin/xgettext,g
s,@MSGMERGE@,|#_!!_#|/usr/bin/msgmerge,g
s,@CC@,|#_!!_#|gcc,g
s,@CFLAGS@,|#_!!_#|-g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT,g
s,@CFLAGS@,|#_!!_#|-g -O2 -I/usr/local/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT,g
s,@LDFLAGS@,|#_!!_#|,g
s,@CPPFLAGS@,|#_!!_#| -DDATA_PREFIX=\\"$(prefix)\\",g
s,@ac_ct_CC@,|#_!!_#|gcc,g
......@@ -695,9 +695,9 @@ s,@LIBINTL@,|#_!!_#|,g
s,@LTLIBINTL@,|#_!!_#|,g
s,@POSUB@,|#_!!_#|po,g
s,@LN_S@,|#_!!_#|ln -s,g
s,@SDL_CONFIG@,|#_!!_#|/usr/bin/sdl-config,g
s,@SDL_CFLAGS@,|#_!!_#|-I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT,g
s,@SDL_LIBS@,|#_!!_#|-L/usr/lib -lSDL,g
s,@SDL_CONFIG@,|#_!!_#|/usr/local/bin/sdl-config,g
s,@SDL_CFLAGS@,|#_!!_#|-I/usr/local/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT,g
s,@SDL_LIBS@,|#_!!_#|-L/usr/local/lib -Wl\,-rpath\,/usr/local/lib -lSDL -lpthread,g
s,@BUILD_MINGW32_TRUE@,|#_!!_#|#,g
s,@BUILD_MINGW32_FALSE@,|#_!!_#|,g
s,@WINDRES@,|#_!!_#|,g
......
This diff is collapsed.
# Makefile.in generated by automake 1.10.1 from Makefile.am.
# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
......@@ -87,7 +87,6 @@ ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
GMSGFMT = @GMSGFMT@
GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
......@@ -135,7 +134,6 @@ VERSION = @VERSION@
WINDRES = @WINDRES@
XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
......@@ -319,8 +317,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
$(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
END { if (nonempty) { for (i in files) print i; }; }'`; \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
......@@ -345,8 +343,8 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
END { if (nonempty) { for (i in files) print i; }; }'`; \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
......@@ -356,12 +354,13 @@ ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
END { if (nonempty) { for (i in files) print i; }; }'`; \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
......
# Makefile.in generated by automake 1.10.1 from Makefile.am.
# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
......@@ -64,7 +64,6 @@ ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
GMSGFMT = @GMSGFMT@
GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
......@@ -112,7 +111,6 @@ VERSION = @VERSION@
WINDRES = @WINDRES@
XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
......
......@@ -68,15 +68,15 @@ ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = $(SUBDIRS)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = ${SHELL} /usr/local/src/soc-mobin-up/missing --run aclocal-1.10
AMTAR = ${SHELL} /usr/local/src/soc-mobin-up/missing --run tar
AUTOCONF = ${SHELL} /usr/local/src/soc-mobin-up/missing --run autoconf
AUTOHEADER = ${SHELL} /usr/local/src/soc-mobin-up/missing --run autoheader
AUTOMAKE = ${SHELL} /usr/local/src/soc-mobin-up/missing --run automake-1.10
AWK = mawk
ACLOCAL = ${SHELL} /root/tuxtype/trunk/missing --run aclocal-1.10
AMTAR = ${SHELL} /root/tuxtype/trunk/missing --run tar
AUTOCONF = ${SHELL} /root/tuxtype/trunk/missing --run autoconf
AUTOHEADER = ${SHELL} /root/tuxtype/trunk/missing --run autoheader
AUTOMAKE = ${SHELL} /root/tuxtype/trunk/missing --run automake-1.10
AWK = gawk
CC = gcc
CCDEPMODE = depmode=gcc3
CFLAGS = -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT
CFLAGS = -g -O2 -I/usr/local/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT
CPP = gcc -E
CPPFLAGS = -DDATA_PREFIX=\"$(prefix)\"
CYGPATH_W = echo
......@@ -101,12 +101,12 @@ LDFLAGS =
LIBICONV = -liconv
LIBINTL =
LIBOBJS =
LIBS = -L/usr/lib -lSDL -lSDL_Pango -lSDL_image -lSDL_ttf -lSDL_mixer
LIBS = -L/usr/local/lib -Wl,-rpath,/usr/local/lib -lSDL -lpthread -lSDL_Pango -lSDL_image -lSDL_ttf -lSDL_mixer
LN_S = ln -s
LTLIBICONV = -liconv
LTLIBINTL =
LTLIBOBJS =
MAKEINFO = ${SHELL} /usr/local/src/soc-mobin-up/missing --run makeinfo
MAKEINFO = ${SHELL} /root/tuxtype/trunk/missing --run makeinfo
MKDIR_P = /bin/mkdir -p
MSGFMT = /usr/bin/msgfmt
MSGFMT_015 = /usr/bin/msgfmt
......@@ -123,9 +123,9 @@ PACKAGE_TARNAME = tuxtype
PACKAGE_VERSION = 1.5.16
PATH_SEPARATOR = :
POSUB = po
SDL_CFLAGS = -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT
SDL_CONFIG = /usr/bin/sdl-config
SDL_LIBS = -L/usr/lib -lSDL
SDL_CFLAGS = -I/usr/local/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT
SDL_CONFIG = /usr/local/bin/sdl-config
SDL_LIBS = -L/usr/local/lib -Wl,-rpath,/usr/local/lib -lSDL -lpthread
SET_MAKE =
SHELL = /bin/sh
STRIP =
......@@ -134,10 +134,10 @@ VERSION = 1.5.16
WINDRES =
XGETTEXT = /usr/bin/xgettext
XGETTEXT_015 = /usr/bin/xgettext
abs_builddir = /usr/local/src/soc-mobin-up/data/images
abs_srcdir = /usr/local/src/soc-mobin-up/data/images
abs_top_builddir = /usr/local/src/soc-mobin-up
abs_top_srcdir = /usr/local/src/soc-mobin-up
abs_builddir = /root/tuxtype/trunk/data/images
abs_srcdir = /root/tuxtype/trunk/data/images
abs_top_builddir = /root/tuxtype/trunk
abs_top_srcdir = /root/tuxtype/trunk
ac_ct_CC = gcc
am__include = include
am__leading_dot = .
......@@ -164,7 +164,7 @@ host_vendor = pc
htmldir = ${docdir}
includedir = ${prefix}/include
infodir = ${datarootdir}/info
install_sh = $(SHELL) /usr/local/src/soc-mobin-up/install-sh
install_sh = $(SHELL) /root/tuxtype/trunk/install-sh
libdir = ${exec_prefix}/lib
libexecdir = ${exec_prefix}/libexec
localedir = ${datarootdir}/locale
......
# Makefile.in generated by automake 1.10.1 from Makefile.am.
# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
......@@ -87,7 +87,6 @@ ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
GMSGFMT = @GMSGFMT@
GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
......@@ -135,7 +134,6 @@ VERSION = @VERSION@
WINDRES = @WINDRES@
XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
......@@ -378,8 +376,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
$(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
END { if (nonempty) { for (i in files) print i; }; }'`; \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
......@@ -404,8 +402,8 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
END { if (nonempty) { for (i in files) print i; }; }'`; \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
......@@ -415,12 +413,13 @@ ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
END { if (nonempty) { for (i in files) print i; }; }'`; \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
......
# Makefile.in generated by automake 1.10.1 from Makefile.am.
# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
......@@ -75,7 +75,6 @@ ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
GMSGFMT = @GMSGFMT@
GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
......@@ -123,7 +122,6 @@ VERSION = @VERSION@
WINDRES = @WINDRES@
XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
......
# Makefile.in generated by automake 1.10.1 from Makefile.am.
# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
......@@ -75,7 +75,6 @@ ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
GMSGFMT = @GMSGFMT@
GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
......@@ -123,7 +122,6 @@ VERSION = @VERSION@
WINDRES = @WINDRES@
XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
......
# Makefile.in generated by automake 1.10.1 from Makefile.am.
# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
......@@ -75,7 +75,6 @@ ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
GMSGFMT = @GMSGFMT@
GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
......@@ -123,7 +122,6 @@ VERSION = @VERSION@
WINDRES = @WINDRES@
XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
......
# Makefile.in generated by automake 1.10.1 from Makefile.am.
# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
......@@ -75,7 +75,6 @@ ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
GMSGFMT = @GMSGFMT@
GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
......@@ -123,7 +122,6 @@ VERSION = @VERSION@
WINDRES = @WINDRES@
XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
......
......@@ -135,7 +135,6 @@ dist_images_keyboard_DATA = esc.png \
keyboard-us.eps \
keyboard-us.png \
larrow.png \
<<<<<<< .mine
space.png \
rarrow.png\
keyboard_B05.png \
......@@ -263,8 +262,6 @@ dist_images_keyboard_DATA = esc.png \
keyboardN_E02.png \
keyboardN_B04.png \
keyboardN_C10.png \
keyboardN_E03.png
=======
keyboardN_E03.png \
rarrow.png \
space.png
>>>>>>> .r654
space.png
......@@ -3,11 +3,137 @@
images_keyboarddir = $(pkgdatadir)/data/images/keyboard
dist_images_keyboard_DATA = keyboard.png \
keyboard-us.png \
dist_images_keyboard_DATA = esc.png \
keyboard_A00.png \
keyboard_A01.png \
keyboard_A02.png \
keyboard_A03.png \
keyboard_A04.png \
keyboard_A05.png \
keyboard_A06.png \
keyboard_A07.png \
keyboard_A08.png \
keyboard_A09.png \
keyboard_A10.png \
keyboard_A11.png \
keyboard_A12.png \
keyboard_A13.png \
keyboard_B00.png \
keyboard_B01.png \
keyboard_B02.png \
keyboard_B03.png \
keyboard_B04.png \
keyboard_B05.png \
keyboard_B06.png \
keyboard_B07.png \
keyboard_B08.png \
keyboard_B09.png \
keyboard_B10.png \
keyboard_B11.png \
keyboard_B12.png \
keyboard_B13.png \
keyboard_C00.png \
keyboard_C01.png \
keyboard_C02.png \
keyboard_C03.png \
keyboard_C04.png \
keyboard_C05.png \
keyboard_C06.png \
keyboard_C07.png \
keyboard_C08.png \
keyboard_C09.png \
keyboard_C10.png \
keyboard_C11.png \
keyboard_C12.png \
keyboard_D00.png \
keyboard_D01.png \
keyboard_D02.png \
keyboard_D03.png \
keyboard_D04.png \
keyboard_D05.png \
keyboard_D06.png \
keyboard_D07.png \
keyboard_D08.png \
keyboard_D09.png \
keyboard_D10.png \
keyboard_D11.png \
keyboard_D12.png \
keyboard_E00.png \
keyboard_E01.png \
keyboard_E02.png \
keyboard_E03.png \
keyboard_E04.png \
keyboard_E05.png \
keyboard_E06.png \
keyboard_E07.png \
keyboard.eps \
keyboardN_A00.png \
keyboardN_A01.png \
keyboardN_A02.png \
keyboardN_A03.png \
keyboardN_A04.png \
keyboardN_A05.png \
keyboardN_A06.png \
keyboardN_A07.png \
keyboardN_A08.png \
keyboardN_A09.png \
keyboardN_A10.png \
keyboardN_A11.png \
keyboardN_A12.png \
keyboardN_A13.png \
keyboardN_B00.png \
keyboardN_B01.png \
keyboardN_B02.png \
keyboardN_B03.png \
keyboardN_B04.png \
keyboardN_B05.png \
keyboardN_B06.png \
keyboardN_B07.png \
keyboardN_B08.png \
keyboardN_B09.png \
keyboardN_B10.png \
keyboardN_B11.png \
keyboardN_B12.png \
keyboardN_B13.png \
keyboardN_C00.png \
keyboardN_C01.png \
keyboardN_C02.png \
keyboardN_C03.png \
keyboardN_C04.png \
keyboardN_C05.png \
keyboardN_C06.png \
keyboardN_C07.png \
keyboardN_C08.png \
keyboardN_C09.png \
keyboardN_C10.png \
keyboardN_C11.png \
keyboardN_C12.png \
keyboardN_D00.png \
keyboardN_D01.png \
keyboardN_D02.png \
keyboardN_D03.png \
keyboardN_D04.png \
keyboardN_D05.png \
keyboardN_D06.png \
keyboardN_D07.png \
keyboardN_D08.png \
keyboardN_D09.png \
keyboardN_D10.png \
keyboardN_D11.png \
keyboardN_D12.png \
keyboardN_E00.png \
keyboardN_E01.png \
keyboardN_E02.png \
keyboardN_E03.png \
keyboardN_E04.png \
keyboardN_E05.png \
keyboardN_E06.png \
keyboardN_E07.png \
keyboardN_None.png \
keyboard_None.png \
keyboard.png \
keyboard-us.eps \
esc.png \
keyboard-us.png \
larrow.png \
space.png \
rarrow.png\
......@@ -73,4 +199,69 @@ dist_images_keyboard_DATA = keyboard.png \
keyboard_E02.png \
keyboard_B04.png \
keyboard_C10.png \
keyboard_E03.png
keyboard_E03.png \
keyboardN_B05.png \
keyboardN_C11.png \
keyboardN_E04.png \
keyboardN_A00.png \
keyboardN_B06.png \
keyboardN_C12.png \
keyboardN_E05.png \
keyboardN_A01.png \
keyboardN_B07.png \
keyboardN_E06.png \
keyboardN_A02.png \
keyboardN_B08.png \
keyboardN_D00.png \
keyboardN_E07.png \
keyboardN_A03.png \
keyboardN_B09.png \
keyboardN_D01.png \
keyboardN_A04.png \
keyboardN_B10.png \
keyboardN_D02.png \
keyboardN_None.png \
keyboardN_A05.png \
keyboardN_B11.png \
keyboardN_D03.png \
keyboardN_A06.png \
keyboardN_B12.png \
keyboardN_D04.png \