diff options
author | 2009-08-13 06:06:32 +0000 | |
---|---|---|
committer | 2009-08-13 06:06:32 +0000 | |
commit | 38dde243672726baa6b169af4fc0760603c6c78c (patch) | |
tree | 5f138aaf6a995d1355e79cf65db12eef2fa32816 /dev-games | |
parent | Version bump. (diff) | |
download | historical-38dde243672726baa6b169af4fc0760603c6c78c.tar.gz historical-38dde243672726baa6b169af4fc0760603c6c78c.tar.bz2 historical-38dde243672726baa6b169af4fc0760603c6c78c.zip |
Version bump.
Package-Manager: portage-2.2_rc38/cvs/Linux x86_64
Diffstat (limited to 'dev-games')
-rw-r--r-- | dev-games/kyra/ChangeLog | 10 | ||||
-rw-r--r-- | dev-games/kyra/Manifest | 15 | ||||
-rw-r--r-- | dev-games/kyra/files/kyra-2.1.3_p20090813-build.patch | 3415 | ||||
-rw-r--r-- | dev-games/kyra/kyra-2.1.3_p20090813.ebuild | 38 |
4 files changed, 3465 insertions, 13 deletions
diff --git a/dev-games/kyra/ChangeLog b/dev-games/kyra/ChangeLog index 229e32a187cd..c3330e608c45 100644 --- a/dev-games/kyra/ChangeLog +++ b/dev-games/kyra/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-games/kyra -# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-games/kyra/ChangeLog,v 1.11 2009/01/16 19:55:39 tupone Exp $ +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-games/kyra/ChangeLog,v 1.12 2009/08/13 06:06:32 ssuominen Exp $ + +*kyra-2.1.3_p20090813 (13 Aug 2009) + + 13 Aug 2009; Samuli Suominen <ssuominen@gentoo.org> + +kyra-2.1.3_p20090813.ebuild, +files/kyra-2.1.3_p20090813-build.patch: + Version bump. 16 Jan 2009; Tupone Alfredo <tupone@gentoo.org> +files/kyra-2.0.7-gcc43.patch, kyra-2.0.7.ebuild: diff --git a/dev-games/kyra/Manifest b/dev-games/kyra/Manifest index 10e986858cfc..d02accfb2706 100644 --- a/dev-games/kyra/Manifest +++ b/dev-games/kyra/Manifest @@ -1,17 +1,10 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX kyra-2.0.7-gcc41.patch 1625 RMD160 427622ba0a08623ca6b59d497dc3cda65f746cce SHA1 4e7df5958c92e8100a618becb32f782c5e80efb1 SHA256 a6e6da8256d051632f1659e74ca3822ce2b457309e8fadcccb0b633eb51f4819 AUX kyra-2.0.7-gcc43.patch 728 RMD160 777167a023dcc4ad57ddcdfc45b471144da94394 SHA1 59bbdb87bb72e65dc7c0437d006ea0b91d6d17c8 SHA256 0c2a196670940b8da1e87837eef1663ca67b96190fb33ee0957dea2444f30715 AUX kyra-2.0.7-sdl.patch 467 RMD160 b9735ca6ac0bfed805bb575ed2438849040e2c3a SHA1 73bc37d7f8bea10c0b30988b7a1a3b5fc7b0533c SHA256 c27531b9db4acaca978b0c474bf9ee88d0ea618ab6daa1b3b94b30c4781beca4 +AUX kyra-2.1.3_p20090813-build.patch 119284 RMD160 3117b8d1ebfffac6b571c3b217e769310f28aa5c SHA1 2bd47cf9f019f86aa37a3b79351462822de83020 SHA256 3a76093648c0bf62666712d16e1fdabb10f7e69d20bb90ab3ee200446aa8b91e +DIST kyra-2.1.3_p20090813.tar.bz2 2230937 RMD160 183681ea9c8cada35e97959c051a67ab3183bae6 SHA1 09b793ed0a12c5d722ee820ddfa4d8f5e48de1ec SHA256 acc6903d52f534c8e3b3ed3c692ddb43d377f3bc81eb6f8dcbfbcb9bf2c5d8da DIST kyra_src_2_0_7.tar.gz 1994743 RMD160 e9e78a67d452cdc5082da5e16113f4ccd910c70b SHA1 09e02a072aa3db874593e65c0255842df3e379c4 SHA256 63502490ed5e0a0c1c7fb68410412ab498eb3b26898ec7ebdd328845bba114c6 EBUILD kyra-2.0.7.ebuild 902 RMD160 2932f8dd761ab5097a12e1fa10f787b004658e48 SHA1 ba0e9fb7418eb5cda580b010147cb5bea12c7801 SHA256 3ad3db4404837c39129811f19cdd9eab8de3643a44499dbbfb4cdd16fd051ed6 -MISC ChangeLog 1446 RMD160 0739473addac3abeb380f77f924d6633f188be8f SHA1 c944cd60e2927c5efce787775c53e1c4760f5c68 SHA256 c71afe018a918439b9444d9987ac09cc4773e4183df80765c139c676272441b5 +EBUILD kyra-2.1.3_p20090813.ebuild 835 RMD160 7fb8c574e8be9f4b1f45b89c10012d30a53af4b0 SHA1 4b3a9c43a04f6a518a6c0bc40dbe79b86e7532a7 SHA256 f9c255fdb74a518e68d5d4d7e527e5254e552af12dbb317253ad299c84dec145 +MISC ChangeLog 1630 RMD160 2b08c1cf46ae5db96079a1e3c20a7ae32fa22d73 SHA1 7df5a3f5932e2f6f3325367edb872dd8e96a6f9c SHA256 733bb36c73a4eeda62397a9d5c1f49918f27dafd49338fcc3c9628266b2c0330 MISC metadata.xml 2481 RMD160 09171f66958637e45994da3a50375877b59f9d62 SHA1 421d6b3e519d70201cf79da93d118f2e03061f0d SHA256 6e4d5c1d2524111ca002698be79bc8647a630602a0318ce3f66a8aa865194937 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.9 (GNU/Linux) - -iEYEARECAAYFAklw5kcACgkQSYz9rjec82a67ACgwLirkX/bZvIqma5u4R1tjUwM -wp0An1AMNK8hWXKQLCaeDTZ0kYL0eHHk -=egRq ------END PGP SIGNATURE----- diff --git a/dev-games/kyra/files/kyra-2.1.3_p20090813-build.patch b/dev-games/kyra/files/kyra-2.1.3_p20090813-build.patch new file mode 100644 index 000000000000..8185ba41da71 --- /dev/null +++ b/dev-games/kyra/files/kyra-2.1.3_p20090813-build.patch @@ -0,0 +1,3415 @@ +Only in kyra: aclocal.m4 +Only in kyra: autom4te.cache +Only in kyra: config.guess +Only in kyra: config.log +Only in kyra: config.status +Only in kyra: config.sub +Only in kyra: configure +diff -ur kyra.orig/configure.in kyra/configure.in +--- kyra.orig/configure.in 2006-07-21 04:54:05.000000000 +0300 ++++ kyra/configure.in 2009-08-13 08:43:12.000000000 +0300 +@@ -82,7 +82,6 @@ + AC_SUBST(KYRA_LIBS) + + AC_OUTPUT( Makefile +- tinyxml/Makefile + util/Makefile + gui/Makefile + guiExtended/Makefile +Only in kyra: depcomp +Only in kyra/encoder: .deps +diff -ur kyra.orig/encoder/main.cpp kyra/encoder/main.cpp +--- kyra.orig/encoder/main.cpp 2006-08-20 01:30:50.000000000 +0300 ++++ kyra/encoder/main.cpp 2009-08-13 08:43:52.000000000 +0300 +@@ -29,9 +29,9 @@ + The full text of the license can be found in lgpl.txt + */ + ++#define TIXML_USE_STL ++#include <tinyxml.h> + +- +-#include "../../tinyxml/tinyxml.h" + #ifdef _MSC_VER + // Disable the no-exception handling warning. + #pragma warning( disable : 4530 ) +diff -ur kyra.orig/encoder/Makefile kyra/encoder/Makefile +--- kyra.orig/encoder/Makefile 2005-09-23 18:10:21.000000000 +0300 ++++ kyra/encoder/Makefile 2009-08-13 08:52:35.000000000 +0300 +@@ -1,67 +1,551 @@ +-#**************************************************************************** +-# +-# Makefile for Kyra. +-# Lee Thomason and David Leimbach +-# www.grinninglizard.com +-# www.sourceforge.net/projects/kyra +-# +-# This is a GNU make (gmake) makefile +-#**************************************************************************** +- +-include ../makefilebuild +- +-EXTRA_LIBS := ../engine/libkyra.a +- +-#**************************************************************************** +-# Targets of the build +-#**************************************************************************** +- +-OUTPUT := krencoder +- +-all: ${OUTPUT} +- +- +-#**************************************************************************** +-# Source files +-#**************************************************************************** +- +-SRCS := main.cpp \ +- output.cpp +- +-# Add on the sources for libraries +-SRCS := ${SRCS} +- +-OBJS := $(addsuffix .o,$(basename ${SRCS})) +- +- +-#**************************************************************************** +-# Output +-#**************************************************************************** +- +-${OUTPUT}: ${OBJS} ../engine/libkyra.a +- ${LD} -o $@ ${LDFLAGS} ${OBJS} ../engine/libkyra.a ${LIBS} ${EXTRA_LIBS} +- +-#**************************************************************************** +-# common rules +-#**************************************************************************** +- +-# Rules for compiling source files to object files +-%.o : %.cpp +- ${CXX} -c ${CXXFLAGS} ${INCS} $< -o $@ +- +-%.o : %.c +- ${CC} -c ${CFLAGS} ${INCS} $< -o $@ +- +-clean: +- -rm -f core ${OBJS} ${OUTPUT} +- +- +-install: ${OUTPUT} +- install -m755 krencoder /usr/local/bin +- +-# Dependencies. Badly over included, but there were just too many problems +-# using makedepend and sharing the makefiles. +- +-include ../makefiledefines +-${OBJS} : $(addprefix ../engine/, ${ENGINE_HEADERS}) $(addprefix ../util/, ${UTIL_HEADERS}) $(addprefix ../gui/, ${GUI_HEADERS}) ++# Makefile.in generated by automake 1.11 from Makefile.am. ++# encoder/Makefile. Generated from Makefile.in by configure. + ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 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. ++ ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without ++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A ++# PARTICULAR PURPOSE. ++ ++ ++ ++ ++pkgdatadir = $(datadir)/Kyra ++pkgincludedir = $(includedir)/Kyra ++pkglibdir = $(libdir)/Kyra ++pkglibexecdir = $(libexecdir)/Kyra ++am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd ++install_sh_DATA = $(install_sh) -c -m 644 ++install_sh_PROGRAM = $(install_sh) -c ++install_sh_SCRIPT = $(install_sh) -c ++INSTALL_HEADER = $(INSTALL_DATA) ++transform = $(program_transform_name) ++NORMAL_INSTALL = : ++PRE_INSTALL = : ++POST_INSTALL = : ++NORMAL_UNINSTALL = : ++PRE_UNINSTALL = : ++POST_UNINSTALL = : ++build_triplet = x86_64-unknown-linux-gnu ++host_triplet = x86_64-unknown-linux-gnu ++target_triplet = x86_64-unknown-linux-gnu ++bin_PROGRAMS = krencoder$(EXEEXT) ++subdir = encoder ++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/configure.in ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(install_sh) -d ++CONFIG_CLEAN_FILES = ++CONFIG_CLEAN_VPATH_FILES = ++am__installdirs = "$(DESTDIR)$(bindir)" ++PROGRAMS = $(bin_PROGRAMS) ++am_krencoder_OBJECTS = main.$(OBJEXT) output.$(OBJEXT) \ ++ CONSOLEFONT.$(OBJEXT) ++krencoder_OBJECTS = $(am_krencoder_OBJECTS) ++krencoder_DEPENDENCIES = ../engine/libengine.la ../util/libutil.la \ ++ ../gui/libgui.la ++DEFAULT_INCLUDES = -I. ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++am__mv = mv -f ++CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) ++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) ++CXXLD = $(CXX) ++CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ ++SOURCES = $(krencoder_SOURCES) ++DIST_SOURCES = $(krencoder_SOURCES) ++ETAGS = etags ++CTAGS = ctags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ACLOCAL = ${SHELL} /tmp/kyra/missing --run aclocal-1.11 ++AMTAR = ${SHELL} /tmp/kyra/missing --run tar ++AR = ar ++AUTOCONF = ${SHELL} /tmp/kyra/missing --run autoconf ++AUTOHEADER = ${SHELL} /tmp/kyra/missing --run autoheader ++AUTOMAKE = ${SHELL} /tmp/kyra/missing --run automake-1.11 ++AWK = gawk ++CC = gcc ++CCDEPMODE = depmode=gcc3 ++CFLAGS = -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -I/usr/local/include -I/usr/X11R6/include ++CPP = gcc -E ++CPPFLAGS = ++CXX = g++ ++CXXCPP = g++ -E ++CXXDEPMODE = depmode=gcc3 ++CXXFLAGS = -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -I/usr/local/include -I/usr/X11R6/include ++CYGPATH_W = echo ++DEFS = -DPACKAGE_NAME=\"Kyra\" -DPACKAGE_TARNAME=\"kyra\" -DPACKAGE_VERSION=\"2.1.3\" -DPACKAGE_STRING=\"Kyra\ 2.1.3\" -DPACKAGE_BUGREPORT=\"kyra-general@lists.sourceforge.net\" -DPACKAGE=\"Kyra\" -DVERSION=\"2.1.3\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DLT_OBJDIR=\".libs/\" -DSTDC_HEADERS=1 -DHAVE_LIMITS_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_STDLIB_H=1 -DHAVE_MALLOC=1 -DHAVE_VPRINTF=1 -DHAVE_ATEXIT=1 -DHAVE_MEMSET=1 -DHAVE_STRCHR=1 -DHAVE_STRRCHR=1 -DHAVE_STRSTR=1 -DHAVE_STRTOUL=1 ++DEPDIR = .deps ++DSYMUTIL = ++DUMPBIN = ++ECHO_C = ++ECHO_N = -n ++ECHO_T = ++EGREP = /bin/grep -E ++EXEEXT = ++FGREP = /bin/grep -F ++GREP = /bin/grep ++INSTALL = /usr/bin/install -c ++INSTALL_DATA = ${INSTALL} -m 644 ++INSTALL_PROGRAM = ${INSTALL} ++INSTALL_SCRIPT = ${INSTALL} ++INSTALL_STRIP_PROGRAM = $(install_sh) -c -s ++KYRA_BUILD_VERSION = 3 ++KYRA_LIBS = -lkyra -L/usr/lib -L/usr/local/lib -L/usr/X11R6/lib -lSDL -lpthread -lSDL_image ++KYRA_MAJOR_VERSION = 2 ++KYRA_MINOR_VERSION = 1 ++KYRA_VERSION = 2.1.3 ++LD = /usr/x86_64-pc-linux-gnu/bin/ld -m elf_x86_64 ++LDFLAGS = -L/usr/lib -L/usr/local/lib -L/usr/X11R6/lib ++LIBOBJS = ++LIBS = -L/usr/lib -L/usr/local/lib -L/usr/X11R6/lib -lSDL -lpthread -lSDL_image ++LIBTOOL = $(SHELL) $(top_builddir)/libtool ++LIPO = ++LN_S = ln -s ++LTLIBOBJS = ++MAKEINFO = ${SHELL} /tmp/kyra/missing --run makeinfo ++MKDIR_P = /bin/mkdir -p ++NM = /usr/bin/nm -B ++NMEDIT = ++OBJDUMP = objdump ++OBJEXT = o ++OTOOL = ++OTOOL64 = ++PACKAGE = Kyra ++PACKAGE_BUGREPORT = kyra-general@lists.sourceforge.net ++PACKAGE_NAME = Kyra ++PACKAGE_STRING = Kyra 2.1.3 ++PACKAGE_TARNAME = kyra ++PACKAGE_VERSION = 2.1.3 ++PATH_SEPARATOR = : ++RANLIB = ranlib ++SDL_CFLAGS = -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT ++SDL_CONFIG = /usr/bin/sdl-config ++SDL_LIBS = -lSDL -lpthread ++SED = /bin/sed ++SET_MAKE = ++SHELL = /bin/sh ++STRIP = strip ++VERSION = 2.1.3 ++abs_builddir = /tmp/kyra/encoder ++abs_srcdir = /tmp/kyra/encoder ++abs_top_builddir = /tmp/kyra ++abs_top_srcdir = /tmp/kyra ++ac_ct_CC = gcc ++ac_ct_CXX = g++ ++ac_ct_DUMPBIN = ++am__include = include ++am__leading_dot = . ++am__quote = ++am__tar = ${AMTAR} chof - "$$tardir" ++am__untar = ${AMTAR} xf - ++bindir = ${exec_prefix}/bin ++build = x86_64-unknown-linux-gnu ++build_alias = ++build_cpu = x86_64 ++build_os = linux-gnu ++build_vendor = unknown ++builddir = . ++datadir = ${datarootdir} ++datarootdir = ${prefix}/share ++docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} ++dvidir = ${docdir} ++exec_prefix = ${prefix} ++host = x86_64-unknown-linux-gnu ++host_alias = ++host_cpu = x86_64 ++host_os = linux-gnu ++host_vendor = unknown ++htmldir = ${docdir} ++includedir = ${prefix}/include ++infodir = ${datarootdir}/info ++install_sh = ${SHELL} /tmp/kyra/install-sh ++libdir = ${exec_prefix}/lib ++libexecdir = ${exec_prefix}/libexec ++localedir = ${datarootdir}/locale ++localstatedir = ${prefix}/var ++lt_ECHO = echo ++mandir = ${datarootdir}/man ++mkdir_p = /bin/mkdir -p ++oldincludedir = /usr/include ++pdfdir = ${docdir} ++prefix = /usr/local ++program_transform_name = s,x,x, ++psdir = ${docdir} ++sbindir = ${exec_prefix}/sbin ++sharedstatedir = ${prefix}/com ++srcdir = . ++sysconfdir = ${prefix}/etc ++target = x86_64-unknown-linux-gnu ++target_alias = ++target_cpu = x86_64 ++target_os = linux-gnu ++target_vendor = unknown ++top_build_prefix = ../ ++top_builddir = .. ++top_srcdir = .. ++krencoder_SOURCES = main.cpp output.cpp ../spriteed/CONSOLEFONT.cpp ../spriteed/CONSOLEFONT.h ++krencoder_LDADD = ../engine/libengine.la \ ++ ../util/libutil.la \ ++ ../gui/libgui.la \ ++ -ltinyxml \ ++ -lSDL -lpthread ++ ++all: all-am ++ ++.SUFFIXES: ++.SUFFIXES: .cpp .lo .o .obj ++$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu encoder/Makefile'; \ ++ $(am__cd) $(top_srcdir) && \ ++ $(AUTOMAKE) --gnu encoder/Makefile ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++$(top_srcdir)/configure: $(am__configure_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(am__aclocal_m4_deps): ++install-binPROGRAMS: $(bin_PROGRAMS) ++ @$(NORMAL_INSTALL) ++ test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" ++ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ ++ for p in $$list; do echo "$$p $$p"; done | \ ++ sed 's/$(EXEEXT)$$//' | \ ++ while read p p1; do if test -f $$p || test -f $$p1; \ ++ then echo "$$p"; echo "$$p"; else :; fi; \ ++ done | \ ++ sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ ++ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ ++ sed 'N;N;N;s,\n, ,g' | \ ++ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ ++ { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ ++ if ($$2 == $$4) files[d] = files[d] " " $$1; \ ++ else { print "f", $$3 "/" $$4, $$1; } } \ ++ END { for (d in files) print "f", d, files[d] }' | \ ++ while read type dir files; do \ ++ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ ++ test -z "$$files" || { \ ++ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \ ++ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \ ++ } \ ++ ; done ++ ++uninstall-binPROGRAMS: ++ @$(NORMAL_UNINSTALL) ++ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ ++ files=`for p in $$list; do echo "$$p"; done | \ ++ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ ++ -e 's/$$/$(EXEEXT)/' `; \ ++ test -n "$$list" || exit 0; \ ++ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ ++ cd "$(DESTDIR)$(bindir)" && rm -f $$files ++ ++clean-binPROGRAMS: ++ @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \ ++ echo " rm -f" $$list; \ ++ rm -f $$list || exit $$?; \ ++ test -n "$(EXEEXT)" || exit 0; \ ++ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ ++ echo " rm -f" $$list; \ ++ rm -f $$list ++krencoder$(EXEEXT): $(krencoder_OBJECTS) $(krencoder_DEPENDENCIES) ++ @rm -f krencoder$(EXEEXT) ++ $(CXXLINK) $(krencoder_OBJECTS) $(krencoder_LDADD) $(LIBS) ++ ++mostlyclean-compile: ++ -rm -f *.$(OBJEXT) ++ ++distclean-compile: ++ -rm -f *.tab.c ++ ++include ./$(DEPDIR)/CONSOLEFONT.Po ++include ./$(DEPDIR)/main.Po ++include ./$(DEPDIR)/output.Po ++ ++.cpp.o: ++ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ++# source='$<' object='$@' libtool=no \ ++# DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \ ++# $(CXXCOMPILE) -c -o $@ $< ++ ++.cpp.obj: ++ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ++ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ++# source='$<' object='$@' libtool=no \ ++# DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \ ++# $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` ++ ++.cpp.lo: ++ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo ++# source='$<' object='$@' libtool=yes \ ++# DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \ ++# $(LTCXXCOMPILE) -c -o $@ $< ++ ++CONSOLEFONT.o: ../spriteed/CONSOLEFONT.cpp ++ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT CONSOLEFONT.o -MD -MP -MF $(DEPDIR)/CONSOLEFONT.Tpo -c -o CONSOLEFONT.o `test -f '../spriteed/CONSOLEFONT.cpp' || echo '$(srcdir)/'`../spriteed/CONSOLEFONT.cpp ++ $(am__mv) $(DEPDIR)/CONSOLEFONT.Tpo $(DEPDIR)/CONSOLEFONT.Po ++# source='../spriteed/CONSOLEFONT.cpp' object='CONSOLEFONT.o' libtool=no \ ++# DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \ ++# $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o CONSOLEFONT.o `test -f '../spriteed/CONSOLEFONT.cpp' || echo '$(srcdir)/'`../spriteed/CONSOLEFONT.cpp ++ ++CONSOLEFONT.obj: ../spriteed/CONSOLEFONT.cpp ++ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT CONSOLEFONT.obj -MD -MP -MF $(DEPDIR)/CONSOLEFONT.Tpo -c -o CONSOLEFONT.obj `if test -f '../spriteed/CONSOLEFONT.cpp'; then $(CYGPATH_W) '../spriteed/CONSOLEFONT.cpp'; else $(CYGPATH_W) '$(srcdir)/../spriteed/CONSOLEFONT.cpp'; fi` ++ $(am__mv) $(DEPDIR)/CONSOLEFONT.Tpo $(DEPDIR)/CONSOLEFONT.Po ++# source='../spriteed/CONSOLEFONT.cpp' object='CONSOLEFONT.obj' libtool=no \ ++# DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \ ++# $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o CONSOLEFONT.obj `if test -f '../spriteed/CONSOLEFONT.cpp'; then $(CYGPATH_W) '../spriteed/CONSOLEFONT.cpp'; else $(CYGPATH_W) '$(srcdir)/../spriteed/CONSOLEFONT.cpp'; fi` ++ ++mostlyclean-libtool: ++ -rm -f *.lo ++ ++clean-libtool: ++ -rm -rf .libs _libs ++ ++ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) ++ 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; }; }'`; \ ++ mkid -fID $$unique ++tags: TAGS ++ ++TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ ++ $(TAGS_FILES) $(LISP) ++ set x; \ ++ 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; }; }'`; \ ++ shift; \ ++ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ ++ test -n "$$unique" || unique=$$empty_fix; \ ++ if test $$# -gt 0; then \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ "$$@" $$unique; \ ++ else \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$unique; \ ++ fi; \ ++ fi ++ctags: CTAGS ++CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ ++ $(TAGS_FILES) $(LISP) ++ 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; }; }'`; \ ++ test -z "$(CTAGS_ARGS)$$unique" \ ++ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ ++ $$unique ++ ++GTAGS: ++ here=`$(am__cd) $(top_builddir) && pwd` \ ++ && $(am__cd) $(top_srcdir) \ ++ && gtags -i $(GTAGS_ARGS) "$$here" ++ ++distclean-tags: ++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++ ++distdir: $(DISTFILES) ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ ++ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ ++ if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test -d "$(distdir)/$$file"; then \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ fi; \ ++ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ ++ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ fi; \ ++ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ ++ else \ ++ test -f "$(distdir)/$$file" \ ++ || cp -p $$d/$$file "$(distdir)/$$file" \ ++ || exit 1; \ ++ fi; \ ++ done ++check-am: all-am ++check: check-am ++all-am: Makefile $(PROGRAMS) ++installdirs: ++ for dir in "$(DESTDIR)$(bindir)"; do \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ ++ done ++install: install-am ++install-exec: install-exec-am ++install-data: install-data-am ++uninstall: uninstall-am ++ ++install-am: all-am ++ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am ++ ++installcheck: installcheck-am ++install-strip: ++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ ++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ ++ `test -z '$(STRIP)' || \ ++ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install ++mostlyclean-generic: ++ ++clean-generic: ++ ++distclean-generic: ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) ++ ++maintainer-clean-generic: ++ @echo "This command is intended for maintainers to use" ++ @echo "it deletes files that may require special tools to rebuild." ++clean: clean-am ++ ++clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am ++ ++distclean: distclean-am ++ -rm -rf ./$(DEPDIR) ++ -rm -f Makefile ++distclean-am: clean-am distclean-compile distclean-generic \ ++ distclean-tags ++ ++dvi: dvi-am ++ ++dvi-am: ++ ++html: html-am ++ ++html-am: ++ ++info: info-am ++ ++info-am: ++ ++install-data-am: ++ ++install-dvi: install-dvi-am ++ ++install-dvi-am: ++ ++install-exec-am: install-binPROGRAMS ++ ++install-html: install-html-am ++ ++install-html-am: ++ ++install-info: install-info-am ++ ++install-info-am: ++ ++install-man: ++ ++install-pdf: install-pdf-am ++ ++install-pdf-am: ++ ++install-ps: install-ps-am ++ ++install-ps-am: ++ ++installcheck-am: ++ ++maintainer-clean: maintainer-clean-am ++ -rm -rf ./$(DEPDIR) ++ -rm -f Makefile ++maintainer-clean-am: distclean-am maintainer-clean-generic ++ ++mostlyclean: mostlyclean-am ++ ++mostlyclean-am: mostlyclean-compile mostlyclean-generic \ ++ mostlyclean-libtool ++ ++pdf: pdf-am ++ ++pdf-am: ++ ++ps: ps-am ++ ++ps-am: ++ ++uninstall-am: uninstall-binPROGRAMS ++ ++.MAKE: install-am install-strip ++ ++.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ ++ clean-generic clean-libtool ctags distclean distclean-compile \ ++ distclean-generic distclean-libtool distclean-tags distdir dvi \ ++ dvi-am html html-am info info-am install install-am \ ++ install-binPROGRAMS install-data install-data-am 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 \ ++ maintainer-clean maintainer-clean-generic mostlyclean \ ++ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ ++ pdf pdf-am ps ps-am tags uninstall uninstall-am \ ++ uninstall-binPROGRAMS ++ ++ ++# Tell versions [3.59,3.63) of GNU make to not export all variables. ++# Otherwise a system limit (for SysV at least) may be exceeded. ++.NOEXPORT: +diff -ur kyra.orig/encoder/Makefile.am kyra/encoder/Makefile.am +--- kyra.orig/encoder/Makefile.am 2004-03-09 08:41:46.000000000 +0200 ++++ kyra/encoder/Makefile.am 2009-08-13 08:44:22.000000000 +0300 +@@ -4,5 +4,5 @@ + krencoder_LDADD = ../engine/libengine.la \ + ../util/libutil.la \ + ../gui/libgui.la \ +- ../tinyxml/libtinyxml.la \ ++ -ltinyxml \ + @SDL_LIBS@ +Only in kyra/encoder: Makefile.in +Only in kyra/engine: .deps +diff -ur kyra.orig/engine/encoder.h kyra/engine/encoder.h +--- kyra.orig/engine/encoder.h 2006-07-23 06:55:25.000000000 +0300 ++++ kyra/engine/encoder.h 2009-08-13 08:45:39.000000000 +0300 +@@ -35,7 +35,9 @@ + #include "SDL.h" + #include <vector> + +-#include "../../tinyxml/tinyxml.h" ++#define TIXML_USE_STL ++#include <tinyxml.h> ++ + #ifdef _MSC_VER + // Disable the no-exception handling warning. + #pragma warning( disable : 4530 ) +diff -ur kyra.orig/engine/imagetree.h kyra/engine/imagetree.h +--- kyra.orig/engine/imagetree.h 2005-03-31 04:02:38.000000000 +0300 ++++ kyra/engine/imagetree.h 2009-08-13 08:46:07.000000000 +0300 +@@ -190,7 +190,7 @@ + void Clear( KrImNode* root ); // delete the entire tree + + // Recursive hit test walk. +- bool KrImageTree::HitTestRec( KrImNode* node, int x, int y, int flags, std::vector<KrImage*>* outputArray, int windowIndex ); ++ bool HitTestRec( KrImNode* node, int x, int y, int flags, std::vector<KrImage*>* outputArray, int windowIndex ); + + KrImNode* root; // The root to position the window + KrImNode* offsetRoot; // The root as returned to the client +diff -ur kyra.orig/engine/kyra.h kyra/engine/kyra.h +--- kyra.orig/engine/kyra.h 2005-03-31 04:02:39.000000000 +0300 ++++ kyra/engine/kyra.h 2009-08-13 08:46:37.000000000 +0300 +@@ -72,7 +72,9 @@ + #include "dataresource.h" + + // Tinyxml includes +-#include "../../tinyxml/tinyxml.h" ++#define TIXML_USE_STL ++#include <tinyxml.h> ++ + #ifdef _MSC_VER + // Disable the no-exception handling warning. + #pragma warning( disable : 4530 ) +diff -ur kyra.orig/engine/Makefile kyra/engine/Makefile +--- kyra.orig/engine/Makefile 2005-11-01 07:49:41.000000000 +0200 ++++ kyra/engine/Makefile 2009-08-13 08:52:35.000000000 +0300 +@@ -1,135 +1,744 @@ +-#**************************************************************************** +-# +-# Makefile for Kyra. +-# Lee Thomason and David Leimbach +-# www.grinninglizard.com +-# www.sourceforge.net/projects/kyra +-# +-# This is a GNU make (gmake) makefile +-#**************************************************************************** +- +-include ../makefilebuild +- +-DEBUG_LDFLAGS := ${DEBUG_LDFLAGS} -shared +-RELEASE_LDFLAGS := ${RELEASE_LDFLAGS} -shared +-LIBS := +- +-#**************************************************************************** +-# Targets of the build +-#**************************************************************************** +- +-OUTPUT := libkyra.a +-OUTPUT_LD := libkyra.so +- +-all: ${OUTPUT} +- +-#**************************************************************************** +-# Source files +-#**************************************************************************** +- +-SRCS := action.cpp \ +- box.cpp \ +- boxresource.cpp \ +- canvas.cpp \ +- canvasresource.cpp \ +- color.cpp \ +- dataresource.cpp \ +- dirtyrectangle.cpp \ +- encoder.cpp \ +- engine.cpp \ +- fontresource.cpp \ +- krmath.cpp \ +- image.cpp \ +- imagetree.cpp \ +- imnode.cpp \ +- kyraresource.cpp \ +- painter.cpp \ +- parser.cpp \ +- pixelblock.cpp \ +- rle.cpp \ +- sdlutil.cpp \ +- sprite.cpp \ +- spriteresource.cpp \ +- textbox.cpp \ +- tile.cpp \ +- tileresource.cpp \ +- vault.cpp \ +- namefield.cpp \ +- ogltexture.cpp \ +- ../util/glbitstream.cpp \ +- ../util/glintarrayset.cpp \ +- ../util/glstring.cpp \ +- ../util/glisomath.cpp \ +- ../../grinliz/gldebug.cpp \ +- ../../grinliz/glperformance.cpp \ +- ../../grinliz/glgeometry.cpp \ +- ../../grinliz/glprime.cpp \ +- ../../grinliz/glmatrix.cpp \ +- ../../grinliz/glrandom.cpp \ +- ../../grinliz/glmemorypool.cpp \ +- ../../grinliz/glutil.cpp \ +- ../../grinliz/gldynamic.cpp \ +- ../gui/console.cpp \ +- ../gui/widget.cpp \ +- ../gui/button.cpp \ +- ../gui/eventmanager.cpp \ +- ../gui/textwidget.cpp \ +- ../gui/listbox.cpp \ +- ../guiExtended/progress.cpp \ +- ../guiExtended/KrImageListBox.cpp \ +- ../../tinyxml/tinyxml.cpp \ +- ../../tinyxml/tinyxmlparser.cpp \ +- ../../tinyxml/tinyxmlerror.cpp \ +- ../../tinyxml/tinystr.cpp +- +- +-SRCS := ${SRCS} +- +-OBJS := $(addsuffix .o,$(basename ${SRCS})) +- +- +-#**************************************************************************** +-# Output +-#**************************************************************************** +- +-${OUTPUT}: ${OBJS} +- ${AR} ${OUTPUT} ${OBJS} +- +-# ${LD} -shared -o ${OUTPUT_LD} ${OBJS} $(shell sdl-config --libs) +- +- +-#**************************************************************************** +-# common rules +-#**************************************************************************** +- +-# Rules for compiling source files to object files +-%.o : %.cpp +- ${CXX} -c ${CXXFLAGS} ${INCS} $< -o $@ +- +-%.o : %.c +- ${CC} -c ${CFLAGS} ${INCS} $< -o $@ +- +-clean: +- -rm -f core ${OBJS} ${OUTPUT} +- +-#install: ${OUTPUT} +-# install -m755 libkyra.a /usr/local/lib ; \ +-# cp libkyra.a libkyra_2_1_0.a ; \ +-# install -m755 libkyra_2_1_0.a /usr/local/lib ; \ +-# mkdir -p /usr/local/include/kyra/engine ; \ +-# install -m755 *.h /usr/local/include/kyra/engine ; \ +-# mkdir -p /usr/local/include/kyra/util ; \ +-# install -m755 ../util/*.h /usr/local/include/kyra/util ; \ +-# mkdir -p /usr/local/include/kyra/gui ; \ +-# install -m755 ../gui/*.h /usr/local/include/kyra/gui ; \ +-# mkdir -p /usr/local/include/kyra/guiExtended ; \ +-# install -m755 ../guiExtended/*.h /usr/local/include/kyra/guiExtended ; \ +-# mkdir -p /usr/local/include/kyra/tinyxml ; \ +-# install -m755 ../tinyxml/*.h /usr/local/include/kyra/tinyxml ++# Makefile.in generated by automake 1.11 from Makefile.am. ++# engine/Makefile. Generated from Makefile.in by configure. + +- +-# Dependencies. Badly over included, but there were just too many problems +-# using makedepend and sharing the makefiles. +- +-include ../makefiledefines +-${OBJS} : ${ENGINE_HEADERS} $(addprefix ../util/, ${UTIL_HEADERS}) $(addprefix ../gui/, ${GUI_HEADERS}) ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 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. ++ ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without ++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A ++# PARTICULAR PURPOSE. ++ ++ ++ ++ ++ ++pkgdatadir = $(datadir)/Kyra ++pkgincludedir = $(includedir)/Kyra ++pkglibdir = $(libdir)/Kyra ++pkglibexecdir = $(libexecdir)/Kyra ++am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd ++install_sh_DATA = $(install_sh) -c -m 644 ++install_sh_PROGRAM = $(install_sh) -c ++install_sh_SCRIPT = $(install_sh) -c ++INSTALL_HEADER = $(INSTALL_DATA) ++transform = $(program_transform_name) ++NORMAL_INSTALL = : ++PRE_INSTALL = : ++POST_INSTALL = : ++NORMAL_UNINSTALL = : ++PRE_UNINSTALL = : ++POST_UNINSTALL = : ++build_triplet = x86_64-unknown-linux-gnu ++host_triplet = x86_64-unknown-linux-gnu ++target_triplet = x86_64-unknown-linux-gnu ++subdir = engine ++DIST_COMMON = $(libengineinclude_HEADERS) $(srcdir)/Makefile.am \ ++ $(srcdir)/Makefile.in ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/configure.in ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(install_sh) -d ++CONFIG_CLEAN_FILES = ++CONFIG_CLEAN_VPATH_FILES = ++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; ++am__vpath_adj = case $$p in \ ++ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ ++ *) f=$$p;; \ ++ esac; ++am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; ++am__install_max = 40 ++am__nobase_strip_setup = \ ++ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` ++am__nobase_strip = \ ++ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" ++am__nobase_list = $(am__nobase_strip_setup); \ ++ for p in $$list; do echo "$$p $$p"; done | \ ++ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ ++ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ ++ if (++n[$$2] == $(am__install_max)) \ ++ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ ++ END { for (dir in files) print dir, files[dir] }' ++am__base_list = \ ++ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ ++ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' ++am__installdirs = "$(DESTDIR)$(libdir)" \ ++ "$(DESTDIR)$(libengineincludedir)" ++LTLIBRARIES = $(lib_LTLIBRARIES) ++libengine_la_LIBADD = ++am_libengine_la_OBJECTS = action.lo box.lo boxresource.lo canvas.lo \ ++ canvasresource.lo color.lo dataresource.lo dirtyrectangle.lo \ ++ encoder.lo engine.lo fontresource.lo krmath.lo image.lo \ ++ imagetree.lo imnode.lo kyraresource.lo painter.lo parser.lo \ ++ pixelblock.lo rle.lo sdlutil.lo sprite.lo spriteresource.lo \ ++ textbox.lo tile.lo tileresource.lo vault.lo namefield.lo \ ++ ogltexture.lo gldebug.lo glmemorypool.lo glrandom.lo \ ++ glgeometry.lo glperformance.lo glutil.lo glmatrix.lo \ ++ glprime.lo ++libengine_la_OBJECTS = $(am_libengine_la_OBJECTS) ++DEFAULT_INCLUDES = -I. ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++am__mv = mv -f ++CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) ++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) ++CXXLD = $(CXX) ++CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ ++SOURCES = $(libengine_la_SOURCES) ++DIST_SOURCES = $(libengine_la_SOURCES) ++HEADERS = $(libengineinclude_HEADERS) ++ETAGS = etags ++CTAGS = ctags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ACLOCAL = ${SHELL} /tmp/kyra/missing --run aclocal-1.11 ++AMTAR = ${SHELL} /tmp/kyra/missing --run tar ++AR = ar ++AUTOCONF = ${SHELL} /tmp/kyra/missing --run autoconf ++AUTOHEADER = ${SHELL} /tmp/kyra/missing --run autoheader ++AUTOMAKE = ${SHELL} /tmp/kyra/missing --run automake-1.11 ++AWK = gawk ++CC = gcc ++CCDEPMODE = depmode=gcc3 ++CFLAGS = -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -I/usr/local/include -I/usr/X11R6/include ++CPP = gcc -E ++CPPFLAGS = ++CXX = g++ ++CXXCPP = g++ -E ++CXXDEPMODE = depmode=gcc3 ++CXXFLAGS = -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -I/usr/local/include -I/usr/X11R6/include ++CYGPATH_W = echo ++DEFS = -DPACKAGE_NAME=\"Kyra\" -DPACKAGE_TARNAME=\"kyra\" -DPACKAGE_VERSION=\"2.1.3\" -DPACKAGE_STRING=\"Kyra\ 2.1.3\" -DPACKAGE_BUGREPORT=\"kyra-general@lists.sourceforge.net\" -DPACKAGE=\"Kyra\" -DVERSION=\"2.1.3\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DLT_OBJDIR=\".libs/\" -DSTDC_HEADERS=1 -DHAVE_LIMITS_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_STDLIB_H=1 -DHAVE_MALLOC=1 -DHAVE_VPRINTF=1 -DHAVE_ATEXIT=1 -DHAVE_MEMSET=1 -DHAVE_STRCHR=1 -DHAVE_STRRCHR=1 -DHAVE_STRSTR=1 -DHAVE_STRTOUL=1 ++DEPDIR = .deps ++DSYMUTIL = ++DUMPBIN = ++ECHO_C = ++ECHO_N = -n ++ECHO_T = ++EGREP = /bin/grep -E ++EXEEXT = ++FGREP = /bin/grep -F ++GREP = /bin/grep ++INSTALL = /usr/bin/install -c ++INSTALL_DATA = ${INSTALL} -m 644 ++INSTALL_PROGRAM = ${INSTALL} ++INSTALL_SCRIPT = ${INSTALL} ++INSTALL_STRIP_PROGRAM = $(install_sh) -c -s ++KYRA_BUILD_VERSION = 3 ++KYRA_LIBS = -lkyra -L/usr/lib -L/usr/local/lib -L/usr/X11R6/lib -lSDL -lpthread -lSDL_image ++KYRA_MAJOR_VERSION = 2 ++KYRA_MINOR_VERSION = 1 ++KYRA_VERSION = 2.1.3 ++LD = /usr/x86_64-pc-linux-gnu/bin/ld -m elf_x86_64 ++LDFLAGS = -L/usr/lib -L/usr/local/lib -L/usr/X11R6/lib ++LIBOBJS = ++LIBS = -L/usr/lib -L/usr/local/lib -L/usr/X11R6/lib -lSDL -lpthread -lSDL_image ++LIBTOOL = $(SHELL) $(top_builddir)/libtool ++LIPO = ++LN_S = ln -s ++LTLIBOBJS = ++MAKEINFO = ${SHELL} /tmp/kyra/missing --run makeinfo ++MKDIR_P = /bin/mkdir -p ++NM = /usr/bin/nm -B ++NMEDIT = ++OBJDUMP = objdump ++OBJEXT = o ++OTOOL = ++OTOOL64 = ++PACKAGE = Kyra ++PACKAGE_BUGREPORT = kyra-general@lists.sourceforge.net ++PACKAGE_NAME = Kyra ++PACKAGE_STRING = Kyra 2.1.3 ++PACKAGE_TARNAME = kyra ++PACKAGE_VERSION = 2.1.3 ++PATH_SEPARATOR = : ++RANLIB = ranlib ++SDL_CFLAGS = -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT ++SDL_CONFIG = /usr/bin/sdl-config ++SDL_LIBS = -lSDL -lpthread ++SED = /bin/sed ++SET_MAKE = ++SHELL = /bin/sh ++STRIP = strip ++VERSION = 2.1.3 ++abs_builddir = /tmp/kyra/engine ++abs_srcdir = /tmp/kyra/engine ++abs_top_builddir = /tmp/kyra ++abs_top_srcdir = /tmp/kyra ++ac_ct_CC = gcc ++ac_ct_CXX = g++ ++ac_ct_DUMPBIN = ++am__include = include ++am__leading_dot = . ++am__quote = ++am__tar = ${AMTAR} chof - "$$tardir" ++am__untar = ${AMTAR} xf - ++bindir = ${exec_prefix}/bin ++build = x86_64-unknown-linux-gnu ++build_alias = ++build_cpu = x86_64 ++build_os = linux-gnu ++build_vendor = unknown ++builddir = . ++datadir = ${datarootdir} ++datarootdir = ${prefix}/share ++docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} ++dvidir = ${docdir} ++exec_prefix = ${prefix} ++host = x86_64-unknown-linux-gnu ++host_alias = ++host_cpu = x86_64 ++host_os = linux-gnu ++host_vendor = unknown ++htmldir = ${docdir} ++includedir = ${prefix}/include ++infodir = ${datarootdir}/info ++install_sh = ${SHELL} /tmp/kyra/install-sh ++libdir = ${exec_prefix}/lib ++libexecdir = ${exec_prefix}/libexec ++localedir = ${datarootdir}/locale ++localstatedir = ${prefix}/var ++lt_ECHO = echo ++mandir = ${datarootdir}/man ++mkdir_p = /bin/mkdir -p ++oldincludedir = /usr/include ++pdfdir = ${docdir} ++prefix = /usr/local ++program_transform_name = s,x,x, ++psdir = ${docdir} ++sbindir = ${exec_prefix}/sbin ++sharedstatedir = ${prefix}/com ++srcdir = . ++sysconfdir = ${prefix}/etc ++target = x86_64-unknown-linux-gnu ++target_alias = ++target_cpu = x86_64 ++target_os = linux-gnu ++target_vendor = unknown ++top_build_prefix = ../ ++top_builddir = .. ++top_srcdir = .. ++lib_LTLIBRARIES = libengine.la ++libengineincludedir = $(includedir)/Kyra/engine ++libengineinclude_HEADERS = action.h \ ++box.h \ ++boxresource.h \ ++canvas.h \ ++canvasresource.h \ ++color.h \ ++dirtyrectangle.h \ ++encoder.h \ ++engine.h \ ++fontresource.h \ ++image.h \ ++imagecontainer.h \ ++imagenode.h \ ++imagetree.h \ ++imnode.h \ ++krmath.h \ ++kyra.h \ ++kyrabuild.h \ ++kyraresource.h \ ++namefield.h \ ++ogltexture.h \ ++painter.h \ ++parser.h \ ++pixelblock.h \ ++rle.h \ ++sdlutil.h \ ++sprite.h \ ++spriteresource.h \ ++tags.h \ ++textbox.h \ ++tile.h \ ++tileresource.h \ ++vault.h \ ++dataresource.h ++ ++libengine_la_SOURCES = \ ++action.cpp \ ++box.cpp \ ++boxresource.cpp \ ++canvas.cpp \ ++canvasresource.cpp \ ++color.cpp \ ++dataresource.cpp \ ++dirtyrectangle.cpp \ ++encoder.cpp \ ++engine.cpp \ ++fontresource.cpp \ ++krmath.cpp \ ++image.cpp \ ++imagetree.cpp \ ++imnode.cpp \ ++kyraresource.cpp \ ++painter.cpp \ ++parser.cpp \ ++pixelblock.cpp \ ++rle.cpp \ ++sdlutil.cpp \ ++sprite.cpp \ ++spriteresource.cpp \ ++textbox.cpp \ ++tile.cpp \ ++tileresource.cpp \ ++vault.cpp \ ++namefield.cpp \ ++ogltexture.cpp \ ++../../grinliz/gldebug.cpp \ ++../../grinliz/glmemorypool.cpp \ ++../../grinliz/glrandom.cpp \ ++../../grinliz/glgeometry.cpp \ ++../../grinliz/glperformance.cpp \ ++../../grinliz/glutil.cpp \ ++../../grinliz/glmatrix.cpp \ ++../../grinliz/glprime.cpp ++ ++all: all-am ++ ++.SUFFIXES: ++.SUFFIXES: .cpp .lo .o .obj ++$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu engine/Makefile'; \ ++ $(am__cd) $(top_srcdir) && \ ++ $(AUTOMAKE) --gnu engine/Makefile ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++$(top_srcdir)/configure: $(am__configure_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(am__aclocal_m4_deps): ++install-libLTLIBRARIES: $(lib_LTLIBRARIES) ++ @$(NORMAL_INSTALL) ++ test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" ++ @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ ++ list2=; for p in $$list; do \ ++ if test -f $$p; then \ ++ list2="$$list2 $$p"; \ ++ else :; fi; \ ++ done; \ ++ test -z "$$list2" || { \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ ++ } ++ ++uninstall-libLTLIBRARIES: ++ @$(NORMAL_UNINSTALL) ++ @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ ++ for p in $$list; do \ ++ $(am__strip_dir) \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \ ++ done ++ ++clean-libLTLIBRARIES: ++ -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) ++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ ++ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ ++ test "$$dir" != "$$p" || dir=.; \ ++ echo "rm -f \"$${dir}/so_locations\""; \ ++ rm -f "$${dir}/so_locations"; \ ++ done ++libengine.la: $(libengine_la_OBJECTS) $(libengine_la_DEPENDENCIES) ++ $(CXXLINK) -rpath $(libdir) $(libengine_la_OBJECTS) $(libengine_la_LIBADD) $(LIBS) ++ ++mostlyclean-compile: ++ -rm -f *.$(OBJEXT) ++ ++distclean-compile: ++ -rm -f *.tab.c ++ ++include ./$(DEPDIR)/action.Plo ++include ./$(DEPDIR)/box.Plo ++include ./$(DEPDIR)/boxresource.Plo ++include ./$(DEPDIR)/canvas.Plo ++include ./$(DEPDIR)/canvasresource.Plo ++include ./$(DEPDIR)/color.Plo ++include ./$(DEPDIR)/dataresource.Plo ++include ./$(DEPDIR)/dirtyrectangle.Plo ++include ./$(DEPDIR)/encoder.Plo ++include ./$(DEPDIR)/engine.Plo ++include ./$(DEPDIR)/fontresource.Plo ++include ./$(DEPDIR)/gldebug.Plo ++include ./$(DEPDIR)/glgeometry.Plo ++include ./$(DEPDIR)/glmatrix.Plo ++include ./$(DEPDIR)/glmemorypool.Plo ++include ./$(DEPDIR)/glperformance.Plo ++include ./$(DEPDIR)/glprime.Plo ++include ./$(DEPDIR)/glrandom.Plo ++include ./$(DEPDIR)/glutil.Plo ++include ./$(DEPDIR)/image.Plo ++include ./$(DEPDIR)/imagetree.Plo ++include ./$(DEPDIR)/imnode.Plo ++include ./$(DEPDIR)/krmath.Plo ++include ./$(DEPDIR)/kyraresource.Plo ++include ./$(DEPDIR)/namefield.Plo ++include ./$(DEPDIR)/ogltexture.Plo ++include ./$(DEPDIR)/painter.Plo ++include ./$(DEPDIR)/parser.Plo ++include ./$(DEPDIR)/pixelblock.Plo ++include ./$(DEPDIR)/rle.Plo ++include ./$(DEPDIR)/sdlutil.Plo ++include ./$(DEPDIR)/sprite.Plo ++include ./$(DEPDIR)/spriteresource.Plo ++include ./$(DEPDIR)/textbox.Plo ++include ./$(DEPDIR)/tile.Plo ++include ./$(DEPDIR)/tileresource.Plo ++include ./$(DEPDIR)/vault.Plo ++ ++.cpp.o: ++ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ++# source='$<' object='$@' libtool=no \ ++# DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \ ++# $(CXXCOMPILE) -c -o $@ $< ++ ++.cpp.obj: ++ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ++ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ++# source='$<' object='$@' libtool=no \ ++# DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \ ++# $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` ++ ++.cpp.lo: ++ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo ++# source='$<' object='$@' libtool=yes \ ++# DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \ ++# $(LTCXXCOMPILE) -c -o $@ $< ++ ++gldebug.lo: ../../grinliz/gldebug.cpp ++ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gldebug.lo -MD -MP -MF $(DEPDIR)/gldebug.Tpo -c -o gldebug.lo `test -f '../../grinliz/gldebug.cpp' || echo '$(srcdir)/'`../../grinliz/gldebug.cpp ++ $(am__mv) $(DEPDIR)/gldebug.Tpo $(DEPDIR)/gldebug.Plo ++# source='../../grinliz/gldebug.cpp' object='gldebug.lo' libtool=yes \ ++# DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \ ++# $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gldebug.lo `test -f '../../grinliz/gldebug.cpp' || echo '$(srcdir)/'`../../grinliz/gldebug.cpp ++ ++glmemorypool.lo: ../../grinliz/glmemorypool.cpp ++ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT glmemorypool.lo -MD -MP -MF $(DEPDIR)/glmemorypool.Tpo -c -o glmemorypool.lo `test -f '../../grinliz/glmemorypool.cpp' || echo '$(srcdir)/'`../../grinliz/glmemorypool.cpp ++ $(am__mv) $(DEPDIR)/glmemorypool.Tpo $(DEPDIR)/glmemorypool.Plo ++# source='../../grinliz/glmemorypool.cpp' object='glmemorypool.lo' libtool=yes \ ++# DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \ ++# $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o glmemorypool.lo `test -f '../../grinliz/glmemorypool.cpp' || echo '$(srcdir)/'`../../grinliz/glmemorypool.cpp ++ ++glrandom.lo: ../../grinliz/glrandom.cpp ++ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT glrandom.lo -MD -MP -MF $(DEPDIR)/glrandom.Tpo -c -o glrandom.lo `test -f '../../grinliz/glrandom.cpp' || echo '$(srcdir)/'`../../grinliz/glrandom.cpp ++ $(am__mv) $(DEPDIR)/glrandom.Tpo $(DEPDIR)/glrandom.Plo ++# source='../../grinliz/glrandom.cpp' object='glrandom.lo' libtool=yes \ ++# DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \ ++# $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o glrandom.lo `test -f '../../grinliz/glrandom.cpp' || echo '$(srcdir)/'`../../grinliz/glrandom.cpp ++ ++glgeometry.lo: ../../grinliz/glgeometry.cpp ++ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT glgeometry.lo -MD -MP -MF $(DEPDIR)/glgeometry.Tpo -c -o glgeometry.lo `test -f '../../grinliz/glgeometry.cpp' || echo '$(srcdir)/'`../../grinliz/glgeometry.cpp ++ $(am__mv) $(DEPDIR)/glgeometry.Tpo $(DEPDIR)/glgeometry.Plo ++# source='../../grinliz/glgeometry.cpp' object='glgeometry.lo' libtool=yes \ ++# DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \ ++# $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o glgeometry.lo `test -f '../../grinliz/glgeometry.cpp' || echo '$(srcdir)/'`../../grinliz/glgeometry.cpp ++ ++glperformance.lo: ../../grinliz/glperformance.cpp ++ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT glperformance.lo -MD -MP -MF $(DEPDIR)/glperformance.Tpo -c -o glperformance.lo `test -f '../../grinliz/glperformance.cpp' || echo '$(srcdir)/'`../../grinliz/glperformance.cpp ++ $(am__mv) $(DEPDIR)/glperformance.Tpo $(DEPDIR)/glperformance.Plo ++# source='../../grinliz/glperformance.cpp' object='glperformance.lo' libtool=yes \ ++# DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \ ++# $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o glperformance.lo `test -f '../../grinliz/glperformance.cpp' || echo '$(srcdir)/'`../../grinliz/glperformance.cpp ++ ++glutil.lo: ../../grinliz/glutil.cpp ++ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT glutil.lo -MD -MP -MF $(DEPDIR)/glutil.Tpo -c -o glutil.lo `test -f '../../grinliz/glutil.cpp' || echo '$(srcdir)/'`../../grinliz/glutil.cpp ++ $(am__mv) $(DEPDIR)/glutil.Tpo $(DEPDIR)/glutil.Plo ++# source='../../grinliz/glutil.cpp' object='glutil.lo' libtool=yes \ ++# DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \ ++# $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o glutil.lo `test -f '../../grinliz/glutil.cpp' || echo '$(srcdir)/'`../../grinliz/glutil.cpp ++ ++glmatrix.lo: ../../grinliz/glmatrix.cpp ++ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT glmatrix.lo -MD -MP -MF $(DEPDIR)/glmatrix.Tpo -c -o glmatrix.lo `test -f '../../grinliz/glmatrix.cpp' || echo '$(srcdir)/'`../../grinliz/glmatrix.cpp ++ $(am__mv) $(DEPDIR)/glmatrix.Tpo $(DEPDIR)/glmatrix.Plo ++# source='../../grinliz/glmatrix.cpp' object='glmatrix.lo' libtool=yes \ ++# DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \ ++# $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o glmatrix.lo `test -f '../../grinliz/glmatrix.cpp' || echo '$(srcdir)/'`../../grinliz/glmatrix.cpp ++ ++glprime.lo: ../../grinliz/glprime.cpp ++ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT glprime.lo -MD -MP -MF $(DEPDIR)/glprime.Tpo -c -o glprime.lo `test -f '../../grinliz/glprime.cpp' || echo '$(srcdir)/'`../../grinliz/glprime.cpp ++ $(am__mv) $(DEPDIR)/glprime.Tpo $(DEPDIR)/glprime.Plo ++# source='../../grinliz/glprime.cpp' object='glprime.lo' libtool=yes \ ++# DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \ ++# $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o glprime.lo `test -f '../../grinliz/glprime.cpp' || echo '$(srcdir)/'`../../grinliz/glprime.cpp ++ ++mostlyclean-libtool: ++ -rm -f *.lo ++ ++clean-libtool: ++ -rm -rf .libs _libs ++install-libengineincludeHEADERS: $(libengineinclude_HEADERS) ++ @$(NORMAL_INSTALL) ++ test -z "$(libengineincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libengineincludedir)" ++ @list='$(libengineinclude_HEADERS)'; test -n "$(libengineincludedir)" || list=; \ ++ for p in $$list; do \ ++ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ++ echo "$$d$$p"; \ ++ done | $(am__base_list) | \ ++ while read files; do \ ++ echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libengineincludedir)'"; \ ++ $(INSTALL_HEADER) $$files "$(DESTDIR)$(libengineincludedir)" || exit $$?; \ ++ done ++ ++uninstall-libengineincludeHEADERS: ++ @$(NORMAL_UNINSTALL) ++ @list='$(libengineinclude_HEADERS)'; test -n "$(libengineincludedir)" || list=; \ ++ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ ++ test -n "$$files" || exit 0; \ ++ echo " ( cd '$(DESTDIR)$(libengineincludedir)' && rm -f" $$files ")"; \ ++ cd "$(DESTDIR)$(libengineincludedir)" && rm -f $$files ++ ++ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) ++ 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; }; }'`; \ ++ mkid -fID $$unique ++tags: TAGS ++ ++TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ ++ $(TAGS_FILES) $(LISP) ++ set x; \ ++ 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; }; }'`; \ ++ shift; \ ++ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ ++ test -n "$$unique" || unique=$$empty_fix; \ ++ if test $$# -gt 0; then \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ "$$@" $$unique; \ ++ else \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$unique; \ ++ fi; \ ++ fi ++ctags: CTAGS ++CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ ++ $(TAGS_FILES) $(LISP) ++ 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; }; }'`; \ ++ test -z "$(CTAGS_ARGS)$$unique" \ ++ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ ++ $$unique ++ ++GTAGS: ++ here=`$(am__cd) $(top_builddir) && pwd` \ ++ && $(am__cd) $(top_srcdir) \ ++ && gtags -i $(GTAGS_ARGS) "$$here" ++ ++distclean-tags: ++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++ ++distdir: $(DISTFILES) ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ ++ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ ++ if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test -d "$(distdir)/$$file"; then \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ fi; \ ++ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ ++ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ fi; \ ++ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ ++ else \ ++ test -f "$(distdir)/$$file" \ ++ || cp -p $$d/$$file "$(distdir)/$$file" \ ++ || exit 1; \ ++ fi; \ ++ done ++check-am: all-am ++check: check-am ++all-am: Makefile $(LTLIBRARIES) $(HEADERS) ++installdirs: ++ for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libengineincludedir)"; do \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ ++ done ++install: install-am ++install-exec: install-exec-am ++install-data: install-data-am ++uninstall: uninstall-am ++ ++install-am: all-am ++ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am ++ ++installcheck: installcheck-am ++install-strip: ++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ ++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ ++ `test -z '$(STRIP)' || \ ++ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install ++mostlyclean-generic: ++ ++clean-generic: ++ ++distclean-generic: ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) ++ ++maintainer-clean-generic: ++ @echo "This command is intended for maintainers to use" ++ @echo "it deletes files that may require special tools to rebuild." ++clean: clean-am ++ ++clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ ++ mostlyclean-am ++ ++distclean: distclean-am ++ -rm -rf ./$(DEPDIR) ++ -rm -f Makefile ++distclean-am: clean-am distclean-compile distclean-generic \ ++ distclean-tags ++ ++dvi: dvi-am ++ ++dvi-am: ++ ++html: html-am ++ ++html-am: ++ ++info: info-am ++ ++info-am: ++ ++install-data-am: install-libengineincludeHEADERS ++ @$(NORMAL_INSTALL) ++ $(MAKE) $(AM_MAKEFLAGS) install-data-hook ++install-dvi: install-dvi-am ++ ++install-dvi-am: ++ ++install-exec-am: install-libLTLIBRARIES ++ ++install-html: install-html-am ++ ++install-html-am: ++ ++install-info: install-info-am ++ ++install-info-am: ++ ++install-man: ++ ++install-pdf: install-pdf-am ++ ++install-pdf-am: ++ ++install-ps: install-ps-am ++ ++install-ps-am: ++ ++installcheck-am: ++ ++maintainer-clean: maintainer-clean-am ++ -rm -rf ./$(DEPDIR) ++ -rm -f Makefile ++maintainer-clean-am: distclean-am maintainer-clean-generic ++ ++mostlyclean: mostlyclean-am ++ ++mostlyclean-am: mostlyclean-compile mostlyclean-generic \ ++ mostlyclean-libtool ++ ++pdf: pdf-am ++ ++pdf-am: ++ ++ps: ps-am ++ ++ps-am: ++ ++uninstall-am: uninstall-libLTLIBRARIES \ ++ uninstall-libengineincludeHEADERS ++ @$(NORMAL_INSTALL) ++ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook ++.MAKE: install-am install-data-am install-strip uninstall-am ++ ++.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ ++ clean-libLTLIBRARIES clean-libtool ctags distclean \ ++ distclean-compile distclean-generic distclean-libtool \ ++ distclean-tags distdir dvi dvi-am html html-am info info-am \ ++ install install-am install-data install-data-am \ ++ install-data-hook install-dvi install-dvi-am install-exec \ ++ install-exec-am install-html install-html-am install-info \ ++ install-info-am install-libLTLIBRARIES \ ++ install-libengineincludeHEADERS install-man install-pdf \ ++ install-pdf-am install-ps install-ps-am install-strip \ ++ installcheck installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-compile \ ++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ tags uninstall uninstall-am uninstall-hook \ ++ uninstall-libLTLIBRARIES uninstall-libengineincludeHEADERS ++ ++ ++#nasty awful horrible but effective hook :P ++uninstall-hook: ++ rm -rf $(includedir)/Kyra ++ ++#and another ++install-data-hook: ++ mkdir -p $(DESTDIR)/$(includedir)/Kyra/util ++ cp ../util/*.h $(DESTDIR)/$(includedir)/Kyra/util ++ cp ../kyra.h $(DESTDIR)/$(includedir)/Kyra ++ mkdir -p $(DESTDIR)/$(includedir)/Kyra/gui ++ cp ../gui/*.h $(DESTDIR)/$(includedir)/Kyra/gui ++ mkdir -p $(DESTDIR)/$(includedir)/Kyra/guiExtended ++ cp ../guiExtended/*.h $(DESTDIR)/$(includedir)/Kyra/guiExtended ++ ++# Tell versions [3.59,3.63) of GNU make to not export all variables. ++# Otherwise a system limit (for SysV at least) may be exceeded. ++.NOEXPORT: +diff -ur kyra.orig/engine/Makefile.am kyra/engine/Makefile.am +--- kyra.orig/engine/Makefile.am 2005-04-10 07:58:51.000000000 +0300 ++++ kyra/engine/Makefile.am 2009-08-13 08:59:23.000000000 +0300 +@@ -15,10 +15,6 @@ + mkdir -p $(DESTDIR)/$(includedir)/Kyra/guiExtended + cp ../guiExtended/*.h $(DESTDIR)/$(includedir)/Kyra/guiExtended + +-#and another ... could probably be combined with install-data-hook +-install-exec-hook: +- mkdir -p $(DESTDIR)/$(includedir)/Kyra/tinyxml +- + libengineinclude_HEADERS = action.h \ + box.h \ + boxresource.h \ +@@ -84,10 +80,6 @@ + vault.cpp \ + namefield.cpp \ + ogltexture.cpp \ +-../../tinyxml/tinyxml.cpp \ +-../../tinyxml/tinyxmlparser.cpp \ +-../../tinyxml/tinystr.cpp \ +-../../tinyxml/tinyxmlerror.cpp \ + ../../grinliz/gldebug.cpp \ + ../../grinliz/glmemorypool.cpp \ + ../../grinliz/glrandom.cpp \ +@@ -95,5 +87,6 @@ + ../../grinliz/glperformance.cpp \ + ../../grinliz/glutil.cpp \ + ../../grinliz/glmatrix.cpp \ +-../../grinliz/glprime.cpp ++../../grinliz/glprime.cpp \ ++../../grinliz/gldynamic.cpp + +Only in kyra/engine: Makefile.in +diff -ur kyra.orig/engine/parser.cpp kyra/engine/parser.cpp +--- kyra.orig/engine/parser.cpp 2005-03-31 04:02:41.000000000 +0300 ++++ kyra/engine/parser.cpp 2009-08-13 08:47:36.000000000 +0300 +@@ -29,7 +29,9 @@ + The full text of the license can be found in lgpl.txt + */ + +-#include "../../tinyxml/tinyxml.h" ++#define TIXML_USE_STL ++#include <tinyxml.h> ++ + #ifdef _MSC_VER + // Disable the no-exception handling warning. + #pragma warning( disable : 4530 ) +Only in kyra/gui: .deps +Only in kyra/gui: Makefile +Only in kyra/gui: Makefile.in +Only in kyra/guiExtended: .deps +Only in kyra/guiExtended: Makefile +Only in kyra/guiExtended: Makefile.in +diff -ur kyra.orig/guiExtended/progress.h kyra/guiExtended/progress.h +--- kyra.orig/guiExtended/progress.h 2004-11-21 21:28:32.000000000 +0200 ++++ kyra/guiExtended/progress.h 2009-08-13 08:48:04.000000000 +0300 +@@ -43,7 +43,7 @@ + /** if width of the resource is greater then its height then makes + a horizontal, else makes a vertical progress bar + */ +- KrProgress::KrProgress (int width, ++ KrProgress (int width, + int height, + KrRGBA FillColor, + KrRGBA ChangeColor, +@@ -53,7 +53,7 @@ + /** if width of the resource is greater then its height then makes + a horizontal, else makes a vertical progress bar + */ +- KrProgress::KrProgress (int width, ++ KrProgress (int width, + int height, + const KrScheme& scheme); + +Only in kyra: install-sh +diff -ur kyra.orig/isogen/isogen.h kyra/isogen/isogen.h +--- kyra.orig/isogen/isogen.h 2007-03-27 06:16:45.000000000 +0300 ++++ kyra/isogen/isogen.h 2009-08-13 08:48:29.000000000 +0300 +@@ -40,7 +40,8 @@ + #include "../../grinliz/glgeometry.h" + #include "../../grinliz/glcolor.h" + +-#include "../../tinyxml/tinyxml.h" ++#define TIXML_USE_STL ++#include <tinyxml.h> + + enum { + USE_TEXTURE = 0x01, +Only in kyra: kyra-config +Only in kyra: libtool +Only in kyra: ltmain.sh +diff -ur kyra.orig/Makefile kyra/Makefile +--- kyra.orig/Makefile 2005-11-14 07:07:32.000000000 +0200 ++++ kyra/Makefile 2009-08-13 08:52:35.000000000 +0300 +@@ -1,43 +1,893 @@ +-#**************************************************************************** +-# +-# Makefile for Kyra. +-# Lee Thomason +-# www.grinninglizard.com +-# +-# This is a GNU make (gmake) makefile +-# +-# Note: use the environment variables MAKE_KYRA +-# to controll the build. It can have the values RELEASE, +-# DEBUG, or PROFILE. +-# Example: +-# export MAKE_KYRA=DEBUG +-# make clean +-# make +-# +-#**************************************************************************** +- +-BUILD_SUBDIRS = engine \ +- spriteed \ +- encoder \ +- guitest +- +-INSTALL_SUBDIRS = engine \ +- spriteed \ +- encoder +- +-all: +- for i in $(BUILD_SUBDIRS); do ( cd $$i ; ${MAKE} ) ; done +- +-clean: +- for i in $(BUILD_SUBDIRS); do ( cd $$i ; ${MAKE} clean ) ; done +- +-#install: +-# mkdir -p /usr/local/include/kyra ; \ +-# for i in $(INSTALL_SUBDIRS); do ( cd $$i ; ${MAKE} install ) ; done ; \ +-# install -m755 kyra.h /usr/local/include/kyra ; +-# +-#uninstall: +-# rm -rf /usr/local/include/kyra ; \ +-# rm -f /usr/local/lib/libkyra*.a ; \ +-# rm -f /usr/local/bin/krencoder ; \ +-# rm -f /usr/local/bin/krspriteed; ++# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile. Generated from Makefile.in by configure. ++ ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 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. ++ ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without ++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A ++# PARTICULAR PURPOSE. ++ ++ ++ ++ ++ ++ ++pkgdatadir = $(datadir)/Kyra ++pkgincludedir = $(includedir)/Kyra ++pkglibdir = $(libdir)/Kyra ++pkglibexecdir = $(libexecdir)/Kyra ++am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd ++install_sh_DATA = $(install_sh) -c -m 644 ++install_sh_PROGRAM = $(install_sh) -c ++install_sh_SCRIPT = $(install_sh) -c ++INSTALL_HEADER = $(INSTALL_DATA) ++transform = $(program_transform_name) ++NORMAL_INSTALL = : ++PRE_INSTALL = : ++POST_INSTALL = : ++NORMAL_UNINSTALL = : ++PRE_UNINSTALL = : ++POST_UNINSTALL = : ++build_triplet = x86_64-unknown-linux-gnu ++host_triplet = x86_64-unknown-linux-gnu ++target_triplet = x86_64-unknown-linux-gnu ++subdir = . ++DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ ++ $(srcdir)/Makefile.in $(srcdir)/kyra-config.in \ ++ $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \ ++ config.guess config.sub depcomp install-sh ltmain.sh missing ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/configure.in ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ ++ configure.lineno config.status.lineno ++mkinstalldirs = $(install_sh) -d ++CONFIG_CLEAN_FILES = kyra-config ++CONFIG_CLEAN_VPATH_FILES = ++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; ++am__vpath_adj = case $$p in \ ++ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ ++ *) f=$$p;; \ ++ esac; ++am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; ++am__install_max = 40 ++am__nobase_strip_setup = \ ++ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` ++am__nobase_strip = \ ++ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" ++am__nobase_list = $(am__nobase_strip_setup); \ ++ for p in $$list; do echo "$$p $$p"; done | \ ++ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ ++ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ ++ if (++n[$$2] == $(am__install_max)) \ ++ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ ++ END { for (dir in files) print dir, files[dir] }' ++am__base_list = \ ++ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ ++ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' ++am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \ ++ "$(DESTDIR)$(m4datadir)" ++LTLIBRARIES = $(lib_LTLIBRARIES) ++libkyra_la_DEPENDENCIES = util/libutil.la gui/libgui.la \ ++ guiExtended/libguiExtended.la engine/libengine.la ++am_libkyra_la_OBJECTS = ++libkyra_la_OBJECTS = $(am_libkyra_la_OBJECTS) ++SCRIPTS = $(bin_SCRIPTS) ++DEFAULT_INCLUDES = -I. ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ ++SOURCES = $(libkyra_la_SOURCES) ++DIST_SOURCES = $(libkyra_la_SOURCES) ++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ ++ html-recursive info-recursive install-data-recursive \ ++ install-dvi-recursive install-exec-recursive \ ++ install-html-recursive install-info-recursive \ ++ install-pdf-recursive install-ps-recursive install-recursive \ ++ installcheck-recursive installdirs-recursive pdf-recursive \ ++ ps-recursive uninstall-recursive ++DATA = $(m4data_DATA) ++RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ ++ distclean-recursive maintainer-clean-recursive ++AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ ++ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ ++ distdir dist dist-all distcheck ++ETAGS = etags ++CTAGS = ctags ++DIST_SUBDIRS = $(SUBDIRS) ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++distdir = $(PACKAGE)-$(VERSION) ++top_distdir = $(distdir) ++am__remove_distdir = \ ++ { test ! -d "$(distdir)" \ ++ || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ ++ && rm -fr "$(distdir)"; }; } ++am__relativize = \ ++ dir0=`pwd`; \ ++ sed_first='s,^\([^/]*\)/.*$$,\1,'; \ ++ sed_rest='s,^[^/]*/*,,'; \ ++ sed_last='s,^.*/\([^/]*\)$$,\1,'; \ ++ sed_butlast='s,/*[^/]*$$,,'; \ ++ while test -n "$$dir1"; do \ ++ first=`echo "$$dir1" | sed -e "$$sed_first"`; \ ++ if test "$$first" != "."; then \ ++ if test "$$first" = ".."; then \ ++ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ ++ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ ++ else \ ++ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ ++ if test "$$first2" = "$$first"; then \ ++ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ ++ else \ ++ dir2="../$$dir2"; \ ++ fi; \ ++ dir0="$$dir0"/"$$first"; \ ++ fi; \ ++ fi; \ ++ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ ++ done; \ ++ reldir="$$dir2" ++DIST_ARCHIVES = $(distdir).tar.gz ++GZIP_ENV = --best ++distuninstallcheck_listfiles = find . -type f -print ++distcleancheck_listfiles = find . -type f -print ++ACLOCAL = ${SHELL} /tmp/kyra/missing --run aclocal-1.11 ++AMTAR = ${SHELL} /tmp/kyra/missing --run tar ++AR = ar ++AUTOCONF = ${SHELL} /tmp/kyra/missing --run autoconf ++AUTOHEADER = ${SHELL} /tmp/kyra/missing --run autoheader ++AUTOMAKE = ${SHELL} /tmp/kyra/missing --run automake-1.11 ++AWK = gawk ++CC = gcc ++CCDEPMODE = depmode=gcc3 ++CFLAGS = -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -I/usr/local/include -I/usr/X11R6/include ++CPP = gcc -E ++CPPFLAGS = ++CXX = g++ ++CXXCPP = g++ -E ++CXXDEPMODE = depmode=gcc3 ++CXXFLAGS = -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -I/usr/local/include -I/usr/X11R6/include ++CYGPATH_W = echo ++DEFS = -DPACKAGE_NAME=\"Kyra\" -DPACKAGE_TARNAME=\"kyra\" -DPACKAGE_VERSION=\"2.1.3\" -DPACKAGE_STRING=\"Kyra\ 2.1.3\" -DPACKAGE_BUGREPORT=\"kyra-general@lists.sourceforge.net\" -DPACKAGE=\"Kyra\" -DVERSION=\"2.1.3\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DLT_OBJDIR=\".libs/\" -DSTDC_HEADERS=1 -DHAVE_LIMITS_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_STDLIB_H=1 -DHAVE_MALLOC=1 -DHAVE_VPRINTF=1 -DHAVE_ATEXIT=1 -DHAVE_MEMSET=1 -DHAVE_STRCHR=1 -DHAVE_STRRCHR=1 -DHAVE_STRSTR=1 -DHAVE_STRTOUL=1 ++DEPDIR = .deps ++DSYMUTIL = ++DUMPBIN = ++ECHO_C = ++ECHO_N = -n ++ECHO_T = ++EGREP = /bin/grep -E ++EXEEXT = ++FGREP = /bin/grep -F ++GREP = /bin/grep ++INSTALL = /usr/bin/install -c ++INSTALL_DATA = ${INSTALL} -m 644 ++INSTALL_PROGRAM = ${INSTALL} ++INSTALL_SCRIPT = ${INSTALL} ++INSTALL_STRIP_PROGRAM = $(install_sh) -c -s ++KYRA_BUILD_VERSION = 3 ++KYRA_LIBS = -lkyra -L/usr/lib -L/usr/local/lib -L/usr/X11R6/lib -lSDL -lpthread -lSDL_image ++KYRA_MAJOR_VERSION = 2 ++KYRA_MINOR_VERSION = 1 ++KYRA_VERSION = 2.1.3 ++LD = /usr/x86_64-pc-linux-gnu/bin/ld -m elf_x86_64 ++LDFLAGS = -L/usr/lib -L/usr/local/lib -L/usr/X11R6/lib ++LIBOBJS = ++LIBS = -L/usr/lib -L/usr/local/lib -L/usr/X11R6/lib -lSDL -lpthread -lSDL_image ++LIBTOOL = $(SHELL) $(top_builddir)/libtool ++LIPO = ++LN_S = ln -s ++LTLIBOBJS = ++MAKEINFO = ${SHELL} /tmp/kyra/missing --run makeinfo ++MKDIR_P = /bin/mkdir -p ++NM = /usr/bin/nm -B ++NMEDIT = ++OBJDUMP = objdump ++OBJEXT = o ++OTOOL = ++OTOOL64 = ++PACKAGE = Kyra ++PACKAGE_BUGREPORT = kyra-general@lists.sourceforge.net ++PACKAGE_NAME = Kyra ++PACKAGE_STRING = Kyra 2.1.3 ++PACKAGE_TARNAME = kyra ++PACKAGE_VERSION = 2.1.3 ++PATH_SEPARATOR = : ++RANLIB = ranlib ++SDL_CFLAGS = -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT ++SDL_CONFIG = /usr/bin/sdl-config ++SDL_LIBS = -lSDL -lpthread ++SED = /bin/sed ++SET_MAKE = ++SHELL = /bin/sh ++STRIP = strip ++VERSION = 2.1.3 ++abs_builddir = /tmp/kyra ++abs_srcdir = /tmp/kyra ++abs_top_builddir = /tmp/kyra ++abs_top_srcdir = /tmp/kyra ++ac_ct_CC = gcc ++ac_ct_CXX = g++ ++ac_ct_DUMPBIN = ++am__include = include ++am__leading_dot = . ++am__quote = ++am__tar = ${AMTAR} chof - "$$tardir" ++am__untar = ${AMTAR} xf - ++bindir = ${exec_prefix}/bin ++build = x86_64-unknown-linux-gnu ++build_alias = ++build_cpu = x86_64 ++build_os = linux-gnu ++build_vendor = unknown ++builddir = . ++datadir = ${datarootdir} ++datarootdir = ${prefix}/share ++docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} ++dvidir = ${docdir} ++exec_prefix = ${prefix} ++host = x86_64-unknown-linux-gnu ++host_alias = ++host_cpu = x86_64 ++host_os = linux-gnu ++host_vendor = unknown ++htmldir = ${docdir} ++includedir = ${prefix}/include ++infodir = ${datarootdir}/info ++install_sh = ${SHELL} /tmp/kyra/install-sh ++libdir = ${exec_prefix}/lib ++libexecdir = ${exec_prefix}/libexec ++localedir = ${datarootdir}/locale ++localstatedir = ${prefix}/var ++lt_ECHO = echo ++mandir = ${datarootdir}/man ++mkdir_p = /bin/mkdir -p ++oldincludedir = /usr/include ++pdfdir = ${docdir} ++prefix = /usr/local ++program_transform_name = s,x,x, ++psdir = ${docdir} ++sbindir = ${exec_prefix}/sbin ++sharedstatedir = ${prefix}/com ++srcdir = . ++sysconfdir = ${prefix}/etc ++target = x86_64-unknown-linux-gnu ++target_alias = ++target_cpu = x86_64 ++target_os = linux-gnu ++target_vendor = unknown ++top_build_prefix = ++top_builddir = . ++top_srcdir = . ++SUBDIRS = engine gui util guiExtended encoder spriteed ++bin_SCRIPTS = kyra-config ++EXTRA_DIST = ltconfig kyra.m4 kyra.h ++ ++# M4 macro file for inclusion with autoconf ++m4datadir = $(datadir)/aclocal ++m4data_DATA = kyra.m4 ++lib_LTLIBRARIES = libkyra.la ++libkyra_la_SOURCES = ++libkyra_la_LIBADD = \ ++ util/libutil.la \ ++ gui/libgui.la \ ++ guiExtended/libguiExtended.la \ ++ engine/libengine.la \ ++ -lSDL -lpthread ++ ++all: all-recursive ++ ++.SUFFIXES: ++am--refresh: ++ @: ++$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \ ++ $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \ ++ && exit 0; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ ++ $(am__cd) $(top_srcdir) && \ ++ $(AUTOMAKE) --gnu Makefile ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ echo ' $(SHELL) ./config.status'; \ ++ $(SHELL) ./config.status;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ $(SHELL) ./config.status --recheck ++ ++$(top_srcdir)/configure: $(am__configure_deps) ++ $(am__cd) $(srcdir) && $(AUTOCONF) ++$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++ $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) ++$(am__aclocal_m4_deps): ++kyra-config: $(top_builddir)/config.status $(srcdir)/kyra-config.in ++ cd $(top_builddir) && $(SHELL) ./config.status $@ ++install-libLTLIBRARIES: $(lib_LTLIBRARIES) ++ @$(NORMAL_INSTALL) ++ test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" ++ @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ ++ list2=; for p in $$list; do \ ++ if test -f $$p; then \ ++ list2="$$list2 $$p"; \ ++ else :; fi; \ ++ done; \ ++ test -z "$$list2" || { \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ ++ } ++ ++uninstall-libLTLIBRARIES: ++ @$(NORMAL_UNINSTALL) ++ @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ ++ for p in $$list; do \ ++ $(am__strip_dir) \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \ ++ done ++ ++clean-libLTLIBRARIES: ++ -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) ++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ ++ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ ++ test "$$dir" != "$$p" || dir=.; \ ++ echo "rm -f \"$${dir}/so_locations\""; \ ++ rm -f "$${dir}/so_locations"; \ ++ done ++libkyra.la: $(libkyra_la_OBJECTS) $(libkyra_la_DEPENDENCIES) ++ $(LINK) -rpath $(libdir) $(libkyra_la_OBJECTS) $(libkyra_la_LIBADD) $(LIBS) ++install-binSCRIPTS: $(bin_SCRIPTS) ++ @$(NORMAL_INSTALL) ++ test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" ++ @list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \ ++ for p in $$list; do \ ++ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ++ if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \ ++ done | \ ++ sed -e 'p;s,.*/,,;n' \ ++ -e 'h;s|.*|.|' \ ++ -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \ ++ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \ ++ { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ ++ if ($$2 == $$4) { files[d] = files[d] " " $$1; \ ++ if (++n[d] == $(am__install_max)) { \ ++ print "f", d, files[d]; n[d] = 0; files[d] = "" } } \ ++ else { print "f", d "/" $$4, $$1 } } \ ++ END { for (d in files) print "f", d, files[d] }' | \ ++ while read type dir files; do \ ++ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ ++ test -z "$$files" || { \ ++ echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(bindir)$$dir'"; \ ++ $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \ ++ } \ ++ ; done ++ ++uninstall-binSCRIPTS: ++ @$(NORMAL_UNINSTALL) ++ @list='$(bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \ ++ files=`for p in $$list; do echo "$$p"; done | \ ++ sed -e 's,.*/,,;$(transform)'`; \ ++ test -n "$$list" || exit 0; \ ++ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ ++ cd "$(DESTDIR)$(bindir)" && rm -f $$files ++ ++mostlyclean-compile: ++ -rm -f *.$(OBJEXT) ++ ++distclean-compile: ++ -rm -f *.tab.c ++ ++mostlyclean-libtool: ++ -rm -f *.lo ++ ++clean-libtool: ++ -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool config.lt ++install-m4dataDATA: $(m4data_DATA) ++ @$(NORMAL_INSTALL) ++ test -z "$(m4datadir)" || $(MKDIR_P) "$(DESTDIR)$(m4datadir)" ++ @list='$(m4data_DATA)'; test -n "$(m4datadir)" || list=; \ ++ for p in $$list; do \ ++ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ++ echo "$$d$$p"; \ ++ done | $(am__base_list) | \ ++ while read files; do \ ++ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(m4datadir)'"; \ ++ $(INSTALL_DATA) $$files "$(DESTDIR)$(m4datadir)" || exit $$?; \ ++ done ++ ++uninstall-m4dataDATA: ++ @$(NORMAL_UNINSTALL) ++ @list='$(m4data_DATA)'; test -n "$(m4datadir)" || list=; \ ++ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ ++ test -n "$$files" || exit 0; \ ++ echo " ( cd '$(DESTDIR)$(m4datadir)' && rm -f" $$files ")"; \ ++ cd "$(DESTDIR)$(m4datadir)" && rm -f $$files ++ ++# This directory's subdirectories are mostly independent; you can cd ++# into them and run `make' without going through this Makefile. ++# To change the values of `make' variables: instead of editing Makefiles, ++# (1) if the variable is set in `config.status', edit `config.status' ++# (which will cause the Makefiles to be regenerated when you run `make'); ++# (2) otherwise, pass the desired values on the `make' command line. ++$(RECURSIVE_TARGETS): ++ @failcom='exit 1'; \ ++ for f in x $$MAKEFLAGS; do \ ++ case $$f in \ ++ *=* | --[!k]*);; \ ++ *k*) failcom='fail=yes';; \ ++ esac; \ ++ done; \ ++ dot_seen=no; \ ++ target=`echo $@ | sed s/-recursive//`; \ ++ list='$(SUBDIRS)'; for subdir in $$list; do \ ++ echo "Making $$target in $$subdir"; \ ++ if test "$$subdir" = "."; then \ ++ dot_seen=yes; \ ++ local_target="$$target-am"; \ ++ else \ ++ local_target="$$target"; \ ++ fi; \ ++ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ ++ || eval $$failcom; \ ++ done; \ ++ if test "$$dot_seen" = "no"; then \ ++ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ ++ fi; test -z "$$fail" ++ ++$(RECURSIVE_CLEAN_TARGETS): ++ @failcom='exit 1'; \ ++ for f in x $$MAKEFLAGS; do \ ++ case $$f in \ ++ *=* | --[!k]*);; \ ++ *k*) failcom='fail=yes';; \ ++ esac; \ ++ done; \ ++ dot_seen=no; \ ++ case "$@" in \ ++ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ ++ *) list='$(SUBDIRS)' ;; \ ++ esac; \ ++ rev=''; for subdir in $$list; do \ ++ if test "$$subdir" = "."; then :; else \ ++ rev="$$subdir $$rev"; \ ++ fi; \ ++ done; \ ++ rev="$$rev ."; \ ++ target=`echo $@ | sed s/-recursive//`; \ ++ for subdir in $$rev; do \ ++ echo "Making $$target in $$subdir"; \ ++ if test "$$subdir" = "."; then \ ++ local_target="$$target-am"; \ ++ else \ ++ local_target="$$target"; \ ++ fi; \ ++ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ ++ || eval $$failcom; \ ++ done && test -z "$$fail" ++tags-recursive: ++ list='$(SUBDIRS)'; for subdir in $$list; do \ ++ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ ++ done ++ctags-recursive: ++ list='$(SUBDIRS)'; for subdir in $$list; do \ ++ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ ++ done ++ ++ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) ++ 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; }; }'`; \ ++ mkid -fID $$unique ++tags: TAGS ++ ++TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ ++ $(TAGS_FILES) $(LISP) ++ set x; \ ++ here=`pwd`; \ ++ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ ++ include_option=--etags-include; \ ++ empty_fix=.; \ ++ else \ ++ include_option=--include; \ ++ empty_fix=; \ ++ fi; \ ++ list='$(SUBDIRS)'; for subdir in $$list; do \ ++ if test "$$subdir" = .; then :; else \ ++ test ! -f $$subdir/TAGS || \ ++ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ ++ fi; \ ++ done; \ ++ 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; }; }'`; \ ++ shift; \ ++ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ ++ test -n "$$unique" || unique=$$empty_fix; \ ++ if test $$# -gt 0; then \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ "$$@" $$unique; \ ++ else \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$unique; \ ++ fi; \ ++ fi ++ctags: CTAGS ++CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ ++ $(TAGS_FILES) $(LISP) ++ 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; }; }'`; \ ++ test -z "$(CTAGS_ARGS)$$unique" \ ++ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ ++ $$unique ++ ++GTAGS: ++ here=`$(am__cd) $(top_builddir) && pwd` \ ++ && $(am__cd) $(top_srcdir) \ ++ && gtags -i $(GTAGS_ARGS) "$$here" ++ ++distclean-tags: ++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++ ++distdir: $(DISTFILES) ++ $(am__remove_distdir) ++ test -d "$(distdir)" || mkdir "$(distdir)" ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ ++ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ ++ if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test -d "$(distdir)/$$file"; then \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ fi; \ ++ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ ++ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ fi; \ ++ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ ++ else \ ++ test -f "$(distdir)/$$file" \ ++ || cp -p $$d/$$file "$(distdir)/$$file" \ ++ || exit 1; \ ++ fi; \ ++ done ++ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ ++ if test "$$subdir" = .; then :; else \ ++ test -d "$(distdir)/$$subdir" \ ++ || $(MKDIR_P) "$(distdir)/$$subdir" \ ++ || exit 1; \ ++ fi; \ ++ done ++ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ ++ if test "$$subdir" = .; then :; else \ ++ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ ++ $(am__relativize); \ ++ new_distdir=$$reldir; \ ++ dir1=$$subdir; dir2="$(top_distdir)"; \ ++ $(am__relativize); \ ++ new_top_distdir=$$reldir; \ ++ echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ ++ echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ ++ ($(am__cd) $$subdir && \ ++ $(MAKE) $(AM_MAKEFLAGS) \ ++ top_distdir="$$new_top_distdir" \ ++ distdir="$$new_distdir" \ ++ am__remove_distdir=: \ ++ am__skip_length_check=: \ ++ am__skip_mode_fix=: \ ++ distdir) \ ++ || exit 1; \ ++ fi; \ ++ done ++ -test -n "$(am__skip_mode_fix)" \ ++ || find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ ++ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ ++ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ ++ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ ++ || chmod -R a+r "$(distdir)" ++dist-gzip: distdir ++ tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz ++ $(am__remove_distdir) ++ ++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-xz: distdir ++ tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz ++ $(am__remove_distdir) ++ ++dist-tarZ: distdir ++ tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z ++ $(am__remove_distdir) ++ ++dist-shar: distdir ++ shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz ++ $(am__remove_distdir) ++ ++dist-zip: distdir ++ -rm -f $(distdir).zip ++ zip -rq $(distdir).zip $(distdir) ++ $(am__remove_distdir) ++ ++dist dist-all: distdir ++ tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz ++ $(am__remove_distdir) ++ ++# This target untars the dist file and tries a VPATH configuration. Then ++# it guarantees that the distribution is self-contained by making another ++# tarfile. ++distcheck: dist ++ case '$(DIST_ARCHIVES)' in \ ++ *.tar.gz*) \ ++ 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.xz*) \ ++ xz -dc $(distdir).tar.xz | $(am__untar) ;;\ ++ *.tar.Z*) \ ++ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ ++ *.shar.gz*) \ ++ GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ ++ *.zip*) \ ++ unzip $(distdir).zip ;;\ ++ esac ++ chmod -R a-w $(distdir); chmod a+w $(distdir) ++ mkdir $(distdir)/_build ++ mkdir $(distdir)/_inst ++ chmod a-w $(distdir) ++ test -d $(distdir)/_build || exit 0; \ ++ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ ++ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ ++ && am__cwd=`pwd` \ ++ && $(am__cd) $(distdir)/_build \ ++ && ../configure --srcdir=.. --prefix="$$dc_install_base" \ ++ $(DISTCHECK_CONFIGURE_FLAGS) \ ++ && $(MAKE) $(AM_MAKEFLAGS) \ ++ && $(MAKE) $(AM_MAKEFLAGS) dvi \ ++ && $(MAKE) $(AM_MAKEFLAGS) check \ ++ && $(MAKE) $(AM_MAKEFLAGS) install \ ++ && $(MAKE) $(AM_MAKEFLAGS) installcheck \ ++ && $(MAKE) $(AM_MAKEFLAGS) uninstall \ ++ && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \ ++ distuninstallcheck \ ++ && chmod -R a-w "$$dc_install_base" \ ++ && ({ \ ++ (cd ../.. && umask 077 && mkdir "$$dc_destdir") \ ++ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ ++ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ ++ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ ++ distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \ ++ } || { rm -rf "$$dc_destdir"; exit 1; }) \ ++ && rm -rf "$$dc_destdir" \ ++ && $(MAKE) $(AM_MAKEFLAGS) dist \ ++ && rm -rf $(DIST_ARCHIVES) \ ++ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ ++ && cd "$$am__cwd" \ ++ || exit 1 ++ $(am__remove_distdir) ++ @(echo "$(distdir) archives ready for distribution: "; \ ++ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ ++ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' ++distuninstallcheck: ++ @$(am__cd) '$(distuninstallcheck_dir)' \ ++ && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ ++ || { echo "ERROR: files left after uninstall:" ; \ ++ if test -n "$(DESTDIR)"; then \ ++ echo " (check DESTDIR support)"; \ ++ fi ; \ ++ $(distuninstallcheck_listfiles) ; \ ++ exit 1; } >&2 ++distcleancheck: distclean ++ @if test '$(srcdir)' = . ; then \ ++ echo "ERROR: distcleancheck can only run from a VPATH build" ; \ ++ exit 1 ; \ ++ fi ++ @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ ++ || { echo "ERROR: files left in build directory after distclean:" ; \ ++ $(distcleancheck_listfiles) ; \ ++ exit 1; } >&2 ++check-am: all-am ++check: check-recursive ++all-am: Makefile $(LTLIBRARIES) $(SCRIPTS) $(DATA) ++installdirs: installdirs-recursive ++installdirs-am: ++ for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(m4datadir)"; do \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ ++ done ++install: install-recursive ++install-exec: install-exec-recursive ++install-data: install-data-recursive ++uninstall: uninstall-recursive ++ ++install-am: all-am ++ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am ++ ++installcheck: installcheck-recursive ++install-strip: ++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ ++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ ++ `test -z '$(STRIP)' || \ ++ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install ++mostlyclean-generic: ++ ++clean-generic: ++ ++distclean-generic: ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) ++ ++maintainer-clean-generic: ++ @echo "This command is intended for maintainers to use" ++ @echo "it deletes files that may require special tools to rebuild." ++clean: clean-recursive ++ ++clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ ++ mostlyclean-am ++ ++distclean: distclean-recursive ++ -rm -f $(am__CONFIG_DISTCLEAN_FILES) ++ -rm -f Makefile ++distclean-am: clean-am distclean-compile distclean-generic \ ++ distclean-libtool distclean-tags ++ ++dvi: dvi-recursive ++ ++dvi-am: ++ ++html: html-recursive ++ ++html-am: ++ ++info: info-recursive ++ ++info-am: ++ ++install-data-am: install-m4dataDATA ++ @$(NORMAL_INSTALL) ++ $(MAKE) $(AM_MAKEFLAGS) install-data-hook ++install-dvi: install-dvi-recursive ++ ++install-dvi-am: ++ ++install-exec-am: install-binSCRIPTS install-libLTLIBRARIES ++ @$(NORMAL_INSTALL) ++ $(MAKE) $(AM_MAKEFLAGS) install-exec-hook ++install-html: install-html-recursive ++ ++install-html-am: ++ ++install-info: install-info-recursive ++ ++install-info-am: ++ ++install-man: ++ ++install-pdf: install-pdf-recursive ++ ++install-pdf-am: ++ ++install-ps: install-ps-recursive ++ ++install-ps-am: ++ ++installcheck-am: ++ ++maintainer-clean: maintainer-clean-recursive ++ -rm -f $(am__CONFIG_DISTCLEAN_FILES) ++ -rm -rf $(top_srcdir)/autom4te.cache ++ -rm -f Makefile ++maintainer-clean-am: distclean-am maintainer-clean-generic ++ ++mostlyclean: mostlyclean-recursive ++ ++mostlyclean-am: mostlyclean-compile mostlyclean-generic \ ++ mostlyclean-libtool ++ ++pdf: pdf-recursive ++ ++pdf-am: ++ ++ps: ps-recursive ++ ++ps-am: ++ ++uninstall-am: uninstall-binSCRIPTS uninstall-libLTLIBRARIES \ ++ uninstall-m4dataDATA ++ @$(NORMAL_INSTALL) ++ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook ++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ ++ install-am install-data-am install-exec-am install-strip \ ++ tags-recursive uninstall-am ++ ++.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ ++ all all-am am--refresh check check-am clean clean-generic \ ++ clean-libLTLIBRARIES clean-libtool ctags ctags-recursive dist \ ++ dist-all dist-bzip2 dist-gzip dist-lzma dist-shar dist-tarZ \ ++ dist-xz dist-zip distcheck distclean distclean-compile \ ++ distclean-generic distclean-libtool distclean-tags \ ++ distcleancheck distdir distuninstallcheck dvi dvi-am html \ ++ html-am info info-am install install-am install-binSCRIPTS \ ++ install-data install-data-am install-data-hook install-dvi \ ++ install-dvi-am install-exec install-exec-am install-exec-hook \ ++ install-html install-html-am install-info install-info-am \ ++ install-libLTLIBRARIES install-m4dataDATA 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-compile mostlyclean-generic \ ++ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ ++ uninstall uninstall-am uninstall-binSCRIPTS uninstall-hook \ ++ uninstall-libLTLIBRARIES uninstall-m4dataDATA ++ ++#nasty awful horrible but effective hook :P ++uninstall-hook: ++ rm -rf $(includedir)/Kyra ++ ++#and another ++install-data-hook: ++ mkdir -p $(includedir)/Kyra/util ++ cp util/*.h $(includedir)/Kyra/util ++ cp kyra.h $(includedir)/Kyra ++ mkdir -p $(includedir)/Kyra/gui ++ cp gui/*.h $(includedir)/Kyra/gui ++ mkdir -p $(includedir)/Kyra/guiExtended ++ cp guiExtended/*.h $(includedir)/Kyra/guiExtended ++ ++#and another ... could probably be combined with install-data-hook ++install-exec-hook: ++ ++# Tell versions [3.59,3.63) of GNU make to not export all variables. ++# Otherwise a system limit (for SysV at least) may be exceeded. ++.NOEXPORT: +diff -ur kyra.orig/Makefile.am kyra/Makefile.am +--- kyra.orig/Makefile.am 2005-04-10 07:58:48.000000000 +0300 ++++ kyra/Makefile.am 2009-08-13 09:03:39.000000000 +0300 +@@ -1,4 +1,4 @@ +-SUBDIRS = engine gui util guiExtended tinyxml encoder spriteed ++SUBDIRS = engine gui util guiExtended encoder spriteed + bin_SCRIPTS = kyra-config + + EXTRA_DIST = ltconfig kyra.m4 kyra.h +@@ -16,13 +16,13 @@ + + #and another + install-data-hook: +- mkdir -p $(includedir)/Kyra/util +- cp util/*.h $(includedir)/Kyra/util +- cp kyra.h $(includedir)/Kyra +- mkdir -p $(includedir)/Kyra/gui +- cp gui/*.h $(includedir)/Kyra/gui +- mkdir -p $(includedir)/Kyra/guiExtended +- cp guiExtended/*.h $(includedir)/Kyra/guiExtended ++ mkdir -p $(DESTDIR)$(includedir)/Kyra/util ++ cp util/*.h $(DESTDIR)$(includedir)/Kyra/util ++ cp kyra.h $(DESTDIR)$(includedir)/Kyra ++ mkdir -p $(DESTDIR)$(includedir)/Kyra/gui ++ cp gui/*.h $(DESTDIR)$(includedir)/Kyra/gui ++ mkdir -p $(DESTDIR)$(includedir)/Kyra/guiExtended ++ cp guiExtended/*.h $(DESTDIR)$(includedir)/Kyra/guiExtended + + #and another ... could probably be combined with install-data-hook + install-exec-hook: +Only in kyra: Makefile.in +diff -ur kyra.orig/mapmaker/xmlutil.h kyra/mapmaker/xmlutil.h +--- kyra.orig/mapmaker/xmlutil.h 2005-03-31 04:03:28.000000000 +0300 ++++ kyra/mapmaker/xmlutil.h 2009-08-13 08:49:34.000000000 +0300 +@@ -1,7 +1,9 @@ + #ifndef MAPMAKER_XMLUTIL_INCLUDED + #define MAPMAKER_XMLUTIL_INCLUDED + +-#include "../tinyxml/tinyxml.h" ++#define TIXML_USE_STL ++#include <tinyxml.h> ++ + #ifdef _MSC_VER + // Disable the no-exception handling warning. + #pragma warning( disable : 4530 ) +@@ -68,4 +70,4 @@ + KrSquareWorldMap* worldMap; + }; + +-#endif +\ No newline at end of file ++#endif +Only in kyra: missing +Only in kyra/spriteed: .deps +diff -ur kyra.orig/spriteed/dom.cpp kyra/spriteed/dom.cpp +--- kyra.orig/spriteed/dom.cpp 2005-04-06 08:07:22.000000000 +0300 ++++ kyra/spriteed/dom.cpp 2009-08-13 08:49:52.000000000 +0300 +@@ -36,7 +36,9 @@ + #include "../engine/imagetree.h" + #include "../engine/textbox.h" + +-#include "../../tinyxml/tinyxml.h" ++#define TIXML_USE_STL ++#include <tinyxml.h> ++ + #ifdef _MSC_VER + // Disable the no-exception handling warning. + #pragma warning( disable : 4530 ) +diff -ur kyra.orig/spriteed/Makefile kyra/spriteed/Makefile +--- kyra.orig/spriteed/Makefile 2005-09-23 18:10:21.000000000 +0300 ++++ kyra/spriteed/Makefile 2009-08-13 08:52:35.000000000 +0300 +@@ -1,79 +1,564 @@ +-#**************************************************************************** +-# +-# Makefile for Kyra. +-# Lee Thomason and David Leimbach +-# www.grinninglizard.com +-# www.sourceforge.net/projects/kyra +-# +-# This is a GNU make (gmake) makefile +-#**************************************************************************** +- +-include ../makefilebuild +- +- +-#**************************************************************************** +-# Targets of the build +-#**************************************************************************** +- +-OUTPUT := krspriteed +- +-all: ${OUTPUT} +- +-#**************************************************************************** +-# Source files +-#**************************************************************************** +- +-SRCS := dom.cpp \ +- CONSOLEFONT.cpp \ +- sharedstate.cpp \ +- spriteed.cpp \ +- statealign.cpp \ +- stateempty.cpp \ +- statemachine.cpp \ +- statemovie.cpp \ +- stateview.cpp \ +- statehelp.cpp +- +-# Add on the sources for libraries +-SRCS := ${SRCS} +- +-OBJS := $(addsuffix .o,$(basename ${SRCS})) +- +-#**************************************************************************** +-# Output +-#**************************************************************************** +- +-${OUTPUT}: ${OBJS} ../engine/libkyra.a +- ${LD} -o $@ ${LDFLAGS} ${OBJS} ../engine/libkyra.a ${LIBS} ${EXTRA_LIBS} +- +-#**************************************************************************** +-# common rules +-#**************************************************************************** +- +-# Rules for compiling source files to object files +-%.o : %.cpp +- ${CXX} -c ${CXXFLAGS} ${INCS} $< -o $@ +- +-%.o : %.c +- ${CC} -c ${CFLAGS} ${INCS} $< -o $@ +- +-clean: +- -rm -f core ${OBJS} ${OUTPUT} +- +-#depend: +-# makedepend ${INCS} ${SRCS} +- +-install: ${OUTPUT} +- install -m755 krspriteed /usr/local/bin +- +- #mkdir -p /usr/local/include/Kyra/spriteed ; \ +- #install -m755 *.h /usr/local/include/Kyra/spriteed +- +-# Dependencies. Badly over included, but there were just too many problems +-# using makedepend and sharing the makefiles. +- +-include ../makefiledefines +-${OBJS} : $(addprefix ../engine/, ${ENGINE_HEADERS}) $(addprefix ../util/, ${UTIL_HEADERS}) $(addprefix ../gui/, ${GUI_HEADERS}) \ +- dom.h sharedstate.h statemachine.h statemovie.h states.h +- ++# Makefile.in generated by automake 1.11 from Makefile.am. ++# spriteed/Makefile. Generated from Makefile.in by configure. + ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 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. ++ ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without ++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A ++# PARTICULAR PURPOSE. ++ ++ ++ ++ ++pkgdatadir = $(datadir)/Kyra ++pkgincludedir = $(includedir)/Kyra ++pkglibdir = $(libdir)/Kyra ++pkglibexecdir = $(libexecdir)/Kyra ++am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd ++install_sh_DATA = $(install_sh) -c -m 644 ++install_sh_PROGRAM = $(install_sh) -c ++install_sh_SCRIPT = $(install_sh) -c ++INSTALL_HEADER = $(INSTALL_DATA) ++transform = $(program_transform_name) ++NORMAL_INSTALL = : ++PRE_INSTALL = : ++POST_INSTALL = : ++NORMAL_UNINSTALL = : ++PRE_UNINSTALL = : ++POST_UNINSTALL = : ++build_triplet = x86_64-unknown-linux-gnu ++host_triplet = x86_64-unknown-linux-gnu ++target_triplet = x86_64-unknown-linux-gnu ++bin_PROGRAMS = krspriteed$(EXEEXT) ++subdir = spriteed ++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/configure.in ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(install_sh) -d ++CONFIG_CLEAN_FILES = ++CONFIG_CLEAN_VPATH_FILES = ++am__installdirs = "$(DESTDIR)$(bindir)" ++PROGRAMS = $(bin_PROGRAMS) ++am_krspriteed_OBJECTS = CONSOLEFONT.$(OBJEXT) dom.$(OBJEXT) \ ++ sharedstate.$(OBJEXT) spriteed.$(OBJEXT) statealign.$(OBJEXT) \ ++ stateempty.$(OBJEXT) statemachine.$(OBJEXT) \ ++ statemovie.$(OBJEXT) stateview.$(OBJEXT) statehelp.$(OBJEXT) ++krspriteed_OBJECTS = $(am_krspriteed_OBJECTS) ++krspriteed_DEPENDENCIES = ../engine/libengine.la ../gui/libgui.la \ ++ ../util/libutil.la ++DEFAULT_INCLUDES = -I. ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++am__mv = mv -f ++CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) ++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) ++CXXLD = $(CXX) ++CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ ++SOURCES = $(krspriteed_SOURCES) ++DIST_SOURCES = $(krspriteed_SOURCES) ++ETAGS = etags ++CTAGS = ctags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ACLOCAL = ${SHELL} /tmp/kyra/missing --run aclocal-1.11 ++AMTAR = ${SHELL} /tmp/kyra/missing --run tar ++AR = ar ++AUTOCONF = ${SHELL} /tmp/kyra/missing --run autoconf ++AUTOHEADER = ${SHELL} /tmp/kyra/missing --run autoheader ++AUTOMAKE = ${SHELL} /tmp/kyra/missing --run automake-1.11 ++AWK = gawk ++CC = gcc ++CCDEPMODE = depmode=gcc3 ++CFLAGS = -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -I/usr/local/include -I/usr/X11R6/include ++CPP = gcc -E ++CPPFLAGS = ++CXX = g++ ++CXXCPP = g++ -E ++CXXDEPMODE = depmode=gcc3 ++CXXFLAGS = -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -I/usr/local/include -I/usr/X11R6/include ++CYGPATH_W = echo ++DEFS = -DPACKAGE_NAME=\"Kyra\" -DPACKAGE_TARNAME=\"kyra\" -DPACKAGE_VERSION=\"2.1.3\" -DPACKAGE_STRING=\"Kyra\ 2.1.3\" -DPACKAGE_BUGREPORT=\"kyra-general@lists.sourceforge.net\" -DPACKAGE=\"Kyra\" -DVERSION=\"2.1.3\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DLT_OBJDIR=\".libs/\" -DSTDC_HEADERS=1 -DHAVE_LIMITS_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_STDLIB_H=1 -DHAVE_MALLOC=1 -DHAVE_VPRINTF=1 -DHAVE_ATEXIT=1 -DHAVE_MEMSET=1 -DHAVE_STRCHR=1 -DHAVE_STRRCHR=1 -DHAVE_STRSTR=1 -DHAVE_STRTOUL=1 ++DEPDIR = .deps ++DSYMUTIL = ++DUMPBIN = ++ECHO_C = ++ECHO_N = -n ++ECHO_T = ++EGREP = /bin/grep -E ++EXEEXT = ++FGREP = /bin/grep -F ++GREP = /bin/grep ++INSTALL = /usr/bin/install -c ++INSTALL_DATA = ${INSTALL} -m 644 ++INSTALL_PROGRAM = ${INSTALL} ++INSTALL_SCRIPT = ${INSTALL} ++INSTALL_STRIP_PROGRAM = $(install_sh) -c -s ++KYRA_BUILD_VERSION = 3 ++KYRA_LIBS = -lkyra -L/usr/lib -L/usr/local/lib -L/usr/X11R6/lib -lSDL -lpthread -lSDL_image ++KYRA_MAJOR_VERSION = 2 ++KYRA_MINOR_VERSION = 1 ++KYRA_VERSION = 2.1.3 ++LD = /usr/x86_64-pc-linux-gnu/bin/ld -m elf_x86_64 ++LDFLAGS = -L/usr/lib -L/usr/local/lib -L/usr/X11R6/lib ++LIBOBJS = ++LIBS = -L/usr/lib -L/usr/local/lib -L/usr/X11R6/lib -lSDL -lpthread -lSDL_image ++LIBTOOL = $(SHELL) $(top_builddir)/libtool ++LIPO = ++LN_S = ln -s ++LTLIBOBJS = ++MAKEINFO = ${SHELL} /tmp/kyra/missing --run makeinfo ++MKDIR_P = /bin/mkdir -p ++NM = /usr/bin/nm -B ++NMEDIT = ++OBJDUMP = objdump ++OBJEXT = o ++OTOOL = ++OTOOL64 = ++PACKAGE = Kyra ++PACKAGE_BUGREPORT = kyra-general@lists.sourceforge.net ++PACKAGE_NAME = Kyra ++PACKAGE_STRING = Kyra 2.1.3 ++PACKAGE_TARNAME = kyra ++PACKAGE_VERSION = 2.1.3 ++PATH_SEPARATOR = : ++RANLIB = ranlib ++SDL_CFLAGS = -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT ++SDL_CONFIG = /usr/bin/sdl-config ++SDL_LIBS = -lSDL -lpthread ++SED = /bin/sed ++SET_MAKE = ++SHELL = /bin/sh ++STRIP = strip ++VERSION = 2.1.3 ++abs_builddir = /tmp/kyra/spriteed ++abs_srcdir = /tmp/kyra/spriteed ++abs_top_builddir = /tmp/kyra ++abs_top_srcdir = /tmp/kyra ++ac_ct_CC = gcc ++ac_ct_CXX = g++ ++ac_ct_DUMPBIN = ++am__include = include ++am__leading_dot = . ++am__quote = ++am__tar = ${AMTAR} chof - "$$tardir" ++am__untar = ${AMTAR} xf - ++bindir = ${exec_prefix}/bin ++build = x86_64-unknown-linux-gnu ++build_alias = ++build_cpu = x86_64 ++build_os = linux-gnu ++build_vendor = unknown ++builddir = . ++datadir = ${datarootdir} ++datarootdir = ${prefix}/share ++docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} ++dvidir = ${docdir} ++exec_prefix = ${prefix} ++host = x86_64-unknown-linux-gnu ++host_alias = ++host_cpu = x86_64 ++host_os = linux-gnu ++host_vendor = unknown ++htmldir = ${docdir} ++includedir = ${prefix}/include ++infodir = ${datarootdir}/info ++install_sh = ${SHELL} /tmp/kyra/install-sh ++libdir = ${exec_prefix}/lib ++libexecdir = ${exec_prefix}/libexec ++localedir = ${datarootdir}/locale ++localstatedir = ${prefix}/var ++lt_ECHO = echo ++mandir = ${datarootdir}/man ++mkdir_p = /bin/mkdir -p ++oldincludedir = /usr/include ++pdfdir = ${docdir} ++prefix = /usr/local ++program_transform_name = s,x,x, ++psdir = ${docdir} ++sbindir = ${exec_prefix}/sbin ++sharedstatedir = ${prefix}/com ++srcdir = . ++sysconfdir = ${prefix}/etc ++target = x86_64-unknown-linux-gnu ++target_alias = ++target_cpu = x86_64 ++target_os = linux-gnu ++target_vendor = unknown ++top_build_prefix = ../ ++top_builddir = .. ++top_srcdir = .. ++krspriteed_SOURCES = CONSOLEFONT.cpp \ ++CONSOLEFONT.h \ ++dom.cpp \ ++sharedstate.cpp \ ++spriteed.cpp \ ++statealign.cpp \ ++stateempty.cpp \ ++statemachine.cpp \ ++statemovie.cpp \ ++stateview.cpp \ ++statehelp.cpp \ ++boximage.h \ ++dom.h \ ++sharedstate.h \ ++spritedom.h \ ++statemachine.h \ ++statemovie.h \ ++states.h ++ ++krspriteed_LDADD = ../engine/libengine.la \ ++../gui/libgui.la \ ++-ltinyxml \ ++../util/libutil.la \ ++-lSDL -lpthread ++ ++all: all-am ++ ++.SUFFIXES: ++.SUFFIXES: .cpp .lo .o .obj ++$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu spriteed/Makefile'; \ ++ $(am__cd) $(top_srcdir) && \ ++ $(AUTOMAKE) --gnu spriteed/Makefile ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++$(top_srcdir)/configure: $(am__configure_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(am__aclocal_m4_deps): ++install-binPROGRAMS: $(bin_PROGRAMS) ++ @$(NORMAL_INSTALL) ++ test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" ++ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ ++ for p in $$list; do echo "$$p $$p"; done | \ ++ sed 's/$(EXEEXT)$$//' | \ ++ while read p p1; do if test -f $$p || test -f $$p1; \ ++ then echo "$$p"; echo "$$p"; else :; fi; \ ++ done | \ ++ sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ ++ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ ++ sed 'N;N;N;s,\n, ,g' | \ ++ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ ++ { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ ++ if ($$2 == $$4) files[d] = files[d] " " $$1; \ ++ else { print "f", $$3 "/" $$4, $$1; } } \ ++ END { for (d in files) print "f", d, files[d] }' | \ ++ while read type dir files; do \ ++ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ ++ test -z "$$files" || { \ ++ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \ ++ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \ ++ } \ ++ ; done ++ ++uninstall-binPROGRAMS: ++ @$(NORMAL_UNINSTALL) ++ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ ++ files=`for p in $$list; do echo "$$p"; done | \ ++ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ ++ -e 's/$$/$(EXEEXT)/' `; \ ++ test -n "$$list" || exit 0; \ ++ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ ++ cd "$(DESTDIR)$(bindir)" && rm -f $$files ++ ++clean-binPROGRAMS: ++ @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \ ++ echo " rm -f" $$list; \ ++ rm -f $$list || exit $$?; \ ++ test -n "$(EXEEXT)" || exit 0; \ ++ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ ++ echo " rm -f" $$list; \ ++ rm -f $$list ++krspriteed$(EXEEXT): $(krspriteed_OBJECTS) $(krspriteed_DEPENDENCIES) ++ @rm -f krspriteed$(EXEEXT) ++ $(CXXLINK) $(krspriteed_OBJECTS) $(krspriteed_LDADD) $(LIBS) ++ ++mostlyclean-compile: ++ -rm -f *.$(OBJEXT) ++ ++distclean-compile: ++ -rm -f *.tab.c ++ ++include ./$(DEPDIR)/CONSOLEFONT.Po ++include ./$(DEPDIR)/dom.Po ++include ./$(DEPDIR)/sharedstate.Po ++include ./$(DEPDIR)/spriteed.Po ++include ./$(DEPDIR)/statealign.Po ++include ./$(DEPDIR)/stateempty.Po ++include ./$(DEPDIR)/statehelp.Po ++include ./$(DEPDIR)/statemachine.Po ++include ./$(DEPDIR)/statemovie.Po ++include ./$(DEPDIR)/stateview.Po ++ ++.cpp.o: ++ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ++# source='$<' object='$@' libtool=no \ ++# DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \ ++# $(CXXCOMPILE) -c -o $@ $< ++ ++.cpp.obj: ++ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ++ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ++# source='$<' object='$@' libtool=no \ ++# DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \ ++# $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` ++ ++.cpp.lo: ++ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo ++# source='$<' object='$@' libtool=yes \ ++# DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \ ++# $(LTCXXCOMPILE) -c -o $@ $< ++ ++mostlyclean-libtool: ++ -rm -f *.lo ++ ++clean-libtool: ++ -rm -rf .libs _libs ++ ++ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) ++ 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; }; }'`; \ ++ mkid -fID $$unique ++tags: TAGS ++ ++TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ ++ $(TAGS_FILES) $(LISP) ++ set x; \ ++ 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; }; }'`; \ ++ shift; \ ++ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ ++ test -n "$$unique" || unique=$$empty_fix; \ ++ if test $$# -gt 0; then \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ "$$@" $$unique; \ ++ else \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$unique; \ ++ fi; \ ++ fi ++ctags: CTAGS ++CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ ++ $(TAGS_FILES) $(LISP) ++ 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; }; }'`; \ ++ test -z "$(CTAGS_ARGS)$$unique" \ ++ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ ++ $$unique ++ ++GTAGS: ++ here=`$(am__cd) $(top_builddir) && pwd` \ ++ && $(am__cd) $(top_srcdir) \ ++ && gtags -i $(GTAGS_ARGS) "$$here" ++ ++distclean-tags: ++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++ ++distdir: $(DISTFILES) ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ ++ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ ++ if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test -d "$(distdir)/$$file"; then \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ fi; \ ++ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ ++ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ fi; \ ++ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ ++ else \ ++ test -f "$(distdir)/$$file" \ ++ || cp -p $$d/$$file "$(distdir)/$$file" \ ++ || exit 1; \ ++ fi; \ ++ done ++check-am: all-am ++check: check-am ++all-am: Makefile $(PROGRAMS) ++installdirs: ++ for dir in "$(DESTDIR)$(bindir)"; do \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ ++ done ++install: install-am ++install-exec: install-exec-am ++install-data: install-data-am ++uninstall: uninstall-am ++ ++install-am: all-am ++ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am ++ ++installcheck: installcheck-am ++install-strip: ++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ ++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ ++ `test -z '$(STRIP)' || \ ++ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install ++mostlyclean-generic: ++ ++clean-generic: ++ ++distclean-generic: ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) ++ ++maintainer-clean-generic: ++ @echo "This command is intended for maintainers to use" ++ @echo "it deletes files that may require special tools to rebuild." ++clean: clean-am ++ ++clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am ++ ++distclean: distclean-am ++ -rm -rf ./$(DEPDIR) ++ -rm -f Makefile ++distclean-am: clean-am distclean-compile distclean-generic \ ++ distclean-tags ++ ++dvi: dvi-am ++ ++dvi-am: ++ ++html: html-am ++ ++html-am: ++ ++info: info-am ++ ++info-am: ++ ++install-data-am: ++ ++install-dvi: install-dvi-am ++ ++install-dvi-am: ++ ++install-exec-am: install-binPROGRAMS ++ ++install-html: install-html-am ++ ++install-html-am: ++ ++install-info: install-info-am ++ ++install-info-am: ++ ++install-man: ++ ++install-pdf: install-pdf-am ++ ++install-pdf-am: ++ ++install-ps: install-ps-am ++ ++install-ps-am: ++ ++installcheck-am: ++ ++maintainer-clean: maintainer-clean-am ++ -rm -rf ./$(DEPDIR) ++ -rm -f Makefile ++maintainer-clean-am: distclean-am maintainer-clean-generic ++ ++mostlyclean: mostlyclean-am ++ ++mostlyclean-am: mostlyclean-compile mostlyclean-generic \ ++ mostlyclean-libtool ++ ++pdf: pdf-am ++ ++pdf-am: ++ ++ps: ps-am ++ ++ps-am: ++ ++uninstall-am: uninstall-binPROGRAMS ++ ++.MAKE: install-am install-strip ++ ++.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ ++ clean-generic clean-libtool ctags distclean distclean-compile \ ++ distclean-generic distclean-libtool distclean-tags distdir dvi \ ++ dvi-am html html-am info info-am install install-am \ ++ install-binPROGRAMS install-data install-data-am 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 \ ++ maintainer-clean maintainer-clean-generic mostlyclean \ ++ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ ++ pdf pdf-am ps ps-am tags uninstall uninstall-am \ ++ uninstall-binPROGRAMS ++ ++ ++# Tell versions [3.59,3.63) of GNU make to not export all variables. ++# Otherwise a system limit (for SysV at least) may be exceeded. ++.NOEXPORT: +diff -ur kyra.orig/spriteed/Makefile.am kyra/spriteed/Makefile.am +--- kyra.orig/spriteed/Makefile.am 2004-03-09 08:41:46.000000000 +0200 ++++ kyra/spriteed/Makefile.am 2009-08-13 08:50:12.000000000 +0300 +@@ -21,6 +21,6 @@ + + krspriteed_LDADD = ../engine/libengine.la \ + ../gui/libgui.la \ +-../tinyxml/libtinyxml.la \ ++-ltinyxml \ + ../util/libutil.la \ + @SDL_LIBS@ +Only in kyra/spriteed: Makefile.in +diff -ur kyra.orig/spriteed/sharedstate.h kyra/spriteed/sharedstate.h +--- kyra.orig/spriteed/sharedstate.h 2006-08-12 23:04:37.000000000 +0300 ++++ kyra/spriteed/sharedstate.h 2009-08-13 08:50:39.000000000 +0300 +@@ -40,7 +40,10 @@ + #endif + + #include <string> +-#include "../../tinyxml/tinyxml.h" ++ ++#define TIXML_USE_STL ++#include <tinyxml.h> ++ + #include "SDL.h" + + #include "../engine/color.h" +diff -ur kyra.orig/spriteed/states.h kyra/spriteed/states.h +--- kyra.orig/spriteed/states.h 2005-04-06 08:07:22.000000000 +0300 ++++ kyra/spriteed/states.h 2009-08-13 08:51:05.000000000 +0300 +@@ -33,7 +33,10 @@ + #define STATES_INCLUDED + + #include "../engine/krmath.h" +-#include "../../tinyxml/tinyxml.h" ++ ++#define TIXML_USE_STL ++#include <tinyxml.h> ++ + #ifdef _MSC_VER + // Disable the no-exception handling warning. + #pragma warning( disable : 4530 ) +diff -ur kyra.orig/stitch/main.cpp kyra/stitch/main.cpp +--- kyra.orig/stitch/main.cpp 2005-04-06 08:07:22.000000000 +0300 ++++ kyra/stitch/main.cpp 2009-08-13 08:51:28.000000000 +0300 +@@ -24,7 +24,10 @@ + #include "stitch.h" + #include "../engine/color.h" + #include "../engine/painter.h" +-#include "../../tinyxml/tinyxml.h" ++ ++#define TIXML_USE_STL ++#include <tinyxml.h> ++ + #ifdef _MSC_VER + // Disable the no-exception handling warning. + #pragma warning( disable : 4530 ) +@@ -444,4 +447,4 @@ + SDL_FreeSurface( s ); + SDL_Quit(); + return 0; +-} +\ No newline at end of file ++} +Only in kyra/tests: aclocal.m4 +Only in kyra/tests: autom4te.cache +Only in kyra/tests: config.guess +Only in kyra/tests: config.sub +Only in kyra/tests: configure +Only in kyra/tests: COPYING +Only in kyra/tests: depcomp +Only in kyra/tests: INSTALL +Only in kyra/tests: install-sh +Only in kyra/tests: ltmain.sh +Only in kyra/tests: Makefile.in +Only in kyra/tests: missing +Only in kyra/util: .deps +Only in kyra/util: Makefile +Only in kyra/util: Makefile.in diff --git a/dev-games/kyra/kyra-2.1.3_p20090813.ebuild b/dev-games/kyra/kyra-2.1.3_p20090813.ebuild new file mode 100644 index 000000000000..e957838fd700 --- /dev/null +++ b/dev-games/kyra/kyra-2.1.3_p20090813.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-games/kyra/kyra-2.1.3_p20090813.ebuild,v 1.1 2009/08/13 06:06:32 ssuominen Exp $ + +EAPI=2 +inherit autotools eutils + +DESCRIPTION="Kyra Sprite Engine" +HOMEPAGE="http://www.grinninglizard.com/kyra/" +SRC_URI="mirror://gentoo/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64" +IUSE="opengl" + +DEPEND="media-libs/libsdl[opengl?] + media-libs/sdl-image + dev-libs/tinyxml + opengl? ( virtual/opengl )" + +S=${WORKDIR}/${PN} + +src_prepare() { + epatch "${FILESDIR}"/${P}-build.patch + eautoreconf +} + +src_configure() { + econf \ + --disable-dependency-tracking \ + $(use_with opengl) +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + dodoc AUTHORS ChangeLog NEWS README +} |