tag 380756 patch
thanks
On Wed, Aug 09, 2006, Mohammed Adnène Trojette wrote:
> So please consider build depending on libsdl-ttf2.0-dev.
Same thing about libsdl-mixer and libsdl.
I've prepared a patch but it is not perfect. Here it is, but I don't tag
all the reports "patch" yet, though.
The patch also covers the python transition and Julien Danjou's patch.
--
adn
Mohammed Adnène Trojette
diff -u adonthell-0.3.4.cvs.20050813/debian/control
adonthell-0.3.4.cvs.20050813/debian/control
--- adonthell-0.3.4.cvs.20050813/debian/control
+++ adonthell-0.3.4.cvs.20050813/debian/control
@@ -2,12 +2,12 @@
Section: games
Priority: optional
Maintainer: Gordon Fraser <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 4), libsdl1.2-dev, python (>= 2.3), python-dev
(>=2.3), libvorbis-dev, zlib1g-dev, swig1.3 (>= 1.3.14), libfreetype6-dev,
libaa1-dev
-Standards-Version: 3.6.1
+Build-Depends: debhelper (>= 5.0.37.2), libsdl1.2-dev, libvorbis-dev,
zlib1g-dev, swig1.3 (>= 1.3.14), libfreetype6-dev, libaa1-dev, python-dev (>=
2.3.5-11), python-support (>= 0.4.0), libsdl-ttf2.0-dev, libsdl-mixer1.2-dev,
libsdl1.2-dev, quilt
+Standards-Version: 3.7.2
Package: adonthell
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${python:Depends}
Recommends: adonthell-data (>= 0.3.3-3), adonthell-data (<< 0.4)
Conflicts: adonthell-data (<< 0.3.3-3)
Description: A 2D graphical roleplaying game
diff -u adonthell-0.3.4.cvs.20050813/debian/changelog
adonthell-0.3.4.cvs.20050813/debian/changelog
--- adonthell-0.3.4.cvs.20050813/debian/changelog
+++ adonthell-0.3.4.cvs.20050813/debian/changelog
@@ -1,3 +1,25 @@
+adonthell (0.3.4.cvs.20050813-2.2) unstable; urgency=medium
+
+ * Non-maintainer upload with medium urgency.
+ * Update to the New Python Policy (Closes: #380756)
+ + debian/control
+ - bump build-dependency on debhelper to (>= 5.0.37.2)
+ - remove build-dependency on python and python-dev
+ - build-depend on python-dev (>= 2.3.5-11)
+ - build-depend on python-support (>= 0.4)
+ - depend on ${python:Depends}
+ + debian/rules
+ - build with $(shell pyversions -d) to make the package bin-NMUable
+ - run dh_pythonsupport only (hence the >= 0.4 build-dep)
+ * Build-Depend on libsdl1.2-dev, libsdl-ttf2.0-dev and libsdl-mixer1.2-dev
instead
+ of with the embedded version, add -lSDL_ttf to --with-py-libs in
debian/rules
+ and rebootstrap (Closes: #382202)
+ * Work around #374062 using a patch from Julien Danjou (Closes: #381456)
+ * Build-Depend on quilt for patch management and add adequate rules.
+ * Bump Standards-Version to 3.7.2.
+
+ -- Mohammed Adnène Trojette <[EMAIL PROTECTED]> Thu, 10 Aug 2006 20:47:56
+0200
+
adonthell (0.3.4.cvs.20050813-2.1) unstable; urgency=low
* Non-maintainer upload.
diff -u adonthell-0.3.4.cvs.20050813/debian/rules
adonthell-0.3.4.cvs.20050813/debian/rules
--- adonthell-0.3.4.cvs.20050813/debian/rules
+++ adonthell-0.3.4.cvs.20050813/debian/rules
@@ -8,6 +8,7 @@
CFGDEBUG = ""
INSTALL = /usr/bin/install -c
INSTALL_PROGRAM = ${INSTALL} -p -o root -g root -m 755
+PYVERSION=$(shell pyversions -d)
ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
CXXFLAGS += -g
@@ -31,8 +32,8 @@
--mandir=\$${prefix}/share/man \
--bindir=\$${prefix}/games \
--datadir=\$${prefix}/share/games \
- --with-py-libs="-Wl,-E -L/usr/lib/python2.3/config
-lpython2.3 -ldl -lpthread -lutil" \
- --with-py-cflags="-I/usr/include/python2.3" \
+ --with-py-libs="-Wl,-E -L/usr/lib/$(PYVERSION)/config
-l$(PYVERSION) -ldl -lpthread -lutil -lSDL -lSDL_ttf -lSDL_mixer" \
+ --with-py-cflags="-I/usr/include/$(PYVERSION)" \
$(CFGDEBUG)
touch configure-stamp
@@ -41,6 +42,7 @@
build-stamp:
dh_testdir
+ QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
$(MAKE) CXXFLAGS="$(CXXFLAGS)" INSTALL_PROGRAM="$(INSTALL_PROGRAM)"
touch build-stamp
@@ -56,6 +58,8 @@
cp -f /usr/share/misc/config.guess config.guess
-rm -f `find . -name "*~"`
-rm -f src/adonthell.pyc
+ QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
+ rm -rf .pc
dh_clean
install: build
only in patch2:
unchanged:
--- adonthell-0.3.4.cvs.20050813.orig/debian/pyversions
+++ adonthell-0.3.4.cvs.20050813/debian/pyversions
@@ -0,0 +1 @@
+2.3-
only in patch2:
unchanged:
--- adonthell-0.3.4.cvs.20050813.orig/debian/patches/03_use_libsdl-mixer.diff
+++ adonthell-0.3.4.cvs.20050813/debian/patches/03_use_libsdl-mixer.diff
@@ -0,0 +1,17 @@
+Index: adonthell-0.3.4.cvs.20050813/src/music.c
+===================================================================
+--- adonthell-0.3.4.cvs.20050813.orig/src/music.c 2006-08-10
22:03:39.000000000 +0200
++++ adonthell-0.3.4.cvs.20050813/src/music.c 2006-08-10 22:09:21.000000000
+0200
+@@ -24,9 +24,9 @@
+
+ #include <stdlib.h>
+ #include <string.h>
+-#include "SDL_endian.h"
+-#include "SDL_audio.h"
+-#include "SDL_timer.h"
++#include <SDL/SDL_endian.h>
++#include <SDL/SDL_audio.h>
++#include <SDL/SDL_timer.h>
+
+ #include "SDL_mixer.h"
+
only in patch2:
unchanged:
--- adonthell-0.3.4.cvs.20050813.orig/debian/patches/series
+++ adonthell-0.3.4.cvs.20050813/debian/patches/series
@@ -0,0 +1,3 @@
+01_work_around_bug_381456.diff
+02_use_libsdl-ttf.diff
+03_use_libsdl-mixer.diff
only in patch2:
unchanged:
--- adonthell-0.3.4.cvs.20050813.orig/debian/patches/02_use_libsdl-ttf.diff
+++ adonthell-0.3.4.cvs.20050813/debian/patches/02_use_libsdl-ttf.diff
@@ -0,0 +1,946 @@
+Index: adonthell-0.3.4.cvs.20050813/src/audio.h
+===================================================================
+--- adonthell-0.3.4.cvs.20050813.orig/src/audio.h 2006-08-10
21:33:48.000000000 +0200
++++ adonthell-0.3.4.cvs.20050813/src/audio.h 2006-08-10 21:59:32.000000000
+0200
+@@ -15,7 +15,7 @@
+ #ifndef __AUDIO_H__
+ #define __AUDIO_H__
+
+-#include "SDL_mixer.h"
++#include <SDL/SDL_mixer.h>
+ #include "prefs.h"
+ #include "py_object.h"
+ // #include "audio_loop.h"
+Index: adonthell-0.3.4.cvs.20050813/src/audio_loop.cc
+===================================================================
+--- adonthell-0.3.4.cvs.20050813.orig/src/audio_loop.cc 2006-08-10
21:33:48.000000000 +0200
++++ adonthell-0.3.4.cvs.20050813/src/audio_loop.cc 2006-08-10
21:59:32.000000000 +0200
+@@ -22,7 +22,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <errno.h>
+-#include "SDL_mixer.h"
++#include <SDL/SDL_mixer.h>
+
+ #include "types.h"
+ #include "fileops.h"
+Index: adonthell-0.3.4.cvs.20050813/src/input.h
+===================================================================
+--- adonthell-0.3.4.cvs.20050813.orig/src/input.h 2006-08-10
21:33:48.000000000 +0200
++++ adonthell-0.3.4.cvs.20050813/src/input.h 2006-08-10 21:59:32.000000000
+0200
+@@ -28,7 +28,7 @@
+ #define INPUT_H__
+
+ #include "types.h"
+-#include "SDL_keysym.h"
++#include <SDL/SDL_keysym.h>
+
+
+ /**
+Index: adonthell-0.3.4.cvs.20050813/src/Makefile.am
+===================================================================
+--- adonthell-0.3.4.cvs.20050813.orig/src/Makefile.am 2006-08-10
21:33:48.000000000 +0200
++++ adonthell-0.3.4.cvs.20050813/src/Makefile.am 2006-08-10
21:59:32.000000000 +0200
+@@ -24,7 +24,7 @@
+ win_base.h win_border.h win_container.h str_hash.h win_font.h win_image.h \
+ win_label.h win_mapview.h label.h label_input.h win_scrollbar.h win_scroll.h \
+ win_select.h win_theme.h win_keys.h win_event.h win_types.h win_write.h \
+-win_ttf.h win_manager.h win_object.h window.h win_wrappers.h yarg.h SDL_ttf.h
++win_ttf.h win_manager.h win_object.h window.h win_wrappers.h yarg.h
+
+ libadonthell_a_SOURCES = adonthell.cc animation.cc audio.cc \
+ character_base.cc character.cc data_screen.cc dialog.cc dialog_screen.cc \
+@@ -40,8 +40,7 @@
+ win_ttf.cc win_keys.cc win_manager.cc win_scrollbar.cc win_scroll.cc \
+ win_select.cc \
+ win_theme.cc win_event.cc yarg.cc mixer.c music.c music_cmd.c music_cmd.h \
+-music_ogg.c music_ogg.h wave.h wavestream.c wavestream.h SDL_mixer.h \
+-SDL_ttf.c $(headers)
++music_ogg.c music_ogg.h wave.h wavestream.c wavestream.h $(headers)
+
+ libadonthell_LDADD = $(SDL_LIBS) $(OGG_LIBS) $(PY_LIBS) $(INTLLIBS)
$(FT2_LIBS)
+
+Index: adonthell-0.3.4.cvs.20050813/src/mixer.c
+===================================================================
+--- adonthell-0.3.4.cvs.20050813.orig/src/mixer.c 2006-08-10
21:33:48.000000000 +0200
++++ adonthell-0.3.4.cvs.20050813/src/mixer.c 2006-08-10 21:59:32.000000000
+0200
+@@ -28,11 +28,11 @@
+ #include <stdlib.h>
+ #include <string.h>
+
+-#include "SDL_mutex.h"
+-#include "SDL_endian.h"
+-#include "SDL_timer.h"
++#include <SDL/SDL_mutex.h>
++#include <SDL/SDL_endian.h>
++#include <SDL/SDL_timer.h>
+
+-#include "SDL_mixer.h"
++#include <SDL/SDL_mixer.h>
+
+ static int audio_opened = 0;
+
+Index: adonthell-0.3.4.cvs.20050813/src/music_cmd.c
+===================================================================
+--- adonthell-0.3.4.cvs.20050813.orig/src/music_cmd.c 2006-08-10
21:33:48.000000000 +0200
++++ adonthell-0.3.4.cvs.20050813/src/music_cmd.c 2006-08-10
21:59:32.000000000 +0200
+@@ -34,7 +34,7 @@
+ #include <string.h>
+ #include <signal.h>
+
+-#include "SDL_mixer.h"
++#include <SDL/SDL_mixer.h>
+ #include "music_cmd.h"
+
+ /* Unimplemented */
+Index: adonthell-0.3.4.cvs.20050813/src/music_ogg.c
+===================================================================
+--- adonthell-0.3.4.cvs.20050813.orig/src/music_ogg.c 2006-08-10
21:33:48.000000000 +0200
++++ adonthell-0.3.4.cvs.20050813/src/music_ogg.c 2006-08-10
21:59:32.000000000 +0200
+@@ -30,7 +30,7 @@
+ #include <stdio.h>
+ #include <string.h>
+
+-#include "SDL_mixer.h"
++#include <SDL/SDL_mixer.h>
+ #include "music_ogg.h"
+
+ /* This is the format of the audio mixer data */
+Index: adonthell-0.3.4.cvs.20050813/src/py_adonthell.i
+===================================================================
+--- adonthell-0.3.4.cvs.20050813.orig/src/py_adonthell.i 2006-08-10
21:33:48.000000000 +0200
++++ adonthell-0.3.4.cvs.20050813/src/py_adonthell.i 2006-08-10
21:59:32.000000000 +0200
+@@ -11,7 +11,7 @@
+ #include "storage.h"
+ #include "gametime.h"
+ #include "gamedate.h"
+-#include "SDL_keysym.h"
++#include <SDL/SDL_keysym.h>
+ #include "input.h"
+ #include "audio.h"
+ #include "character_base.h"
+@@ -104,7 +104,7 @@
+ %include "storage.h"
+ %include "gametime.h"
+ %include "gamedate.h"
+-%include "SDL_keysym.h"
++%include <SDL/SDL_keysym.h>
+ %include "input.h"
+ %include "audio.h"
+ %include "character_base.h"
+Index: adonthell-0.3.4.cvs.20050813/src/py_adonthell_wrap.cc
+===================================================================
+--- adonthell-0.3.4.cvs.20050813.orig/src/py_adonthell_wrap.cc 2006-08-10
21:33:48.000000000 +0200
++++ adonthell-0.3.4.cvs.20050813/src/py_adonthell_wrap.cc 2006-08-10
21:59:32.000000000 +0200
+@@ -1442,7 +1442,7 @@
+ #include "storage.h"
+ #include "gametime.h"
+ #include "gamedate.h"
+-#include "SDL_keysym.h"
++#include <SDL/SDL_keysym.h>
+ #include "input.h"
+ #include "audio.h"
+ #include "character_base.h"
+Index: adonthell-0.3.4.cvs.20050813/src/tools/fontedit/font_editor.cc
+===================================================================
+--- adonthell-0.3.4.cvs.20050813.orig/src/tools/fontedit/font_editor.cc
2006-08-10 21:33:48.000000000 +0200
++++ adonthell-0.3.4.cvs.20050813/src/tools/fontedit/font_editor.cc
2006-08-10 21:59:32.000000000 +0200
+@@ -2,7 +2,7 @@
+ #include <unistd.h>
+ #include <list>
+ #include <stdlib.h>
+-#include "SDL_thread.h"
++#include <SDL/SDL_thread.h>
+ #include "types.h"
+ #include "screen.h"
+ #include "image.h"
+Index: adonthell-0.3.4.cvs.20050813/src/wavestream.c
+===================================================================
+--- adonthell-0.3.4.cvs.20050813.orig/src/wavestream.c 2006-08-10
21:33:48.000000000 +0200
++++ adonthell-0.3.4.cvs.20050813/src/wavestream.c 2006-08-10
21:59:32.000000000 +0200
+@@ -27,10 +27,10 @@
+ #include <stdlib.h>
+ #include <string.h>
+
+-#include "SDL_audio.h"
+-#include "SDL_mutex.h"
+-#include "SDL_rwops.h"
+-#include "SDL_endian.h"
++#include <SDL/SDL_audio.h>
++#include <SDL/SDL_mutex.h>
++#include <SDL/SDL_rwops.h>
++#include <SDL/SDL_endian.h>
+
+ #include "wave.h"
+ #include "wavestream.h"
+Index: adonthell-0.3.4.cvs.20050813/src/win_ttf.h
+===================================================================
+--- adonthell-0.3.4.cvs.20050813.orig/src/win_ttf.h 2006-08-10
21:33:48.000000000 +0200
++++ adonthell-0.3.4.cvs.20050813/src/win_ttf.h 2006-08-10 21:59:32.000000000
+0200
+@@ -15,7 +15,7 @@
+ #ifndef WIN_TTF_H
+ #define WIN_TTF_H
+
+-#include "SDL_ttf.h"
++#include <SDL/SDL_ttf.h>
+ #include "win_font.h"
+
+ class win_ttf : public win_font
+Index: adonthell-0.3.4.cvs.20050813/src/Makefile.in
+===================================================================
+--- adonthell-0.3.4.cvs.20050813.orig/src/Makefile.in 2006-08-10
21:33:48.000000000 +0200
++++ adonthell-0.3.4.cvs.20050813/src/Makefile.in 2006-08-10
21:59:32.000000000 +0200
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # @configure_input@
+
+-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+-# Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005 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.
+@@ -14,6 +14,7 @@
+
+ @SET_MAKE@
+
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -21,7 +22,6 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ..
+-
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -35,11 +35,100 @@
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
++build_triplet = @build@
+ host_triplet = @host@
++target_triplet = @target@
++bin_PROGRAMS = adonthell$(EXEEXT)
++subdir = src
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
++ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
++ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
++ $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
++ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++ $(ACLOCAL_M4)
++mkinstalldirs = $(install_sh) -d
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++LIBRARIES = $(noinst_LIBRARIES)
++ARFLAGS = cru
++libadonthell_a_AR = $(AR) $(ARFLAGS)
++libadonthell_a_LIBADD =
++am__objects_1 =
++am_libadonthell_a_OBJECTS = adonthell.$(OBJEXT) animation.$(OBJEXT) \
++ audio.$(OBJEXT) character_base.$(OBJEXT) character.$(OBJEXT) \
++ data_screen.$(OBJEXT) dialog.$(OBJEXT) dialog_screen.$(OBJEXT) \
++ drawable.$(OBJEXT) drawing_area.$(OBJEXT) event.$(OBJEXT) \
++ event_handler.$(OBJEXT) event_list.$(OBJEXT) fileops.$(OBJEXT) \
++ game.$(OBJEXT) gamedata.$(OBJEXT) gamedate.$(OBJEXT) \
++ gametime.$(OBJEXT) image.$(OBJEXT) input.$(OBJEXT) \
++ label.$(OBJEXT) label_input.$(OBJEXT) landmap.$(OBJEXT) \
++ lex.prefs.$(OBJEXT) map_event.$(OBJEXT) \
++ map_event_handler.$(OBJEXT) mapsquare_walkable.$(OBJEXT) \
++ mapcharacter.$(OBJEXT) mapsquare.$(OBJEXT) mapobject.$(OBJEXT) \
++ mapview.$(OBJEXT) nls.$(OBJEXT) path.$(OBJEXT) pnm.$(OBJEXT) \
++ prefs.$(OBJEXT) py_callback.$(OBJEXT) python_class.$(OBJEXT) \
++ py_adonthell_wrap.$(OBJEXT) py_object.$(OBJEXT) \
++ quest.$(OBJEXT) screen.$(OBJEXT) surface.$(OBJEXT) \
++ storage.$(OBJEXT) text_bubble.$(OBJEXT) time_event.$(OBJEXT) \
++ time_event_handler.$(OBJEXT) win_background.$(OBJEXT) \
++ win_base.$(OBJEXT) win_border.$(OBJEXT) \
++ win_container.$(OBJEXT) win_font.$(OBJEXT) win_ttf.$(OBJEXT) \
++ win_keys.$(OBJEXT) win_manager.$(OBJEXT) \
++ win_scrollbar.$(OBJEXT) win_scroll.$(OBJEXT) \
++ win_select.$(OBJEXT) win_theme.$(OBJEXT) win_event.$(OBJEXT) \
++ yarg.$(OBJEXT) mixer.$(OBJEXT) music.$(OBJEXT) \
++ music_cmd.$(OBJEXT) music_ogg.$(OBJEXT) wavestream.$(OBJEXT) \
++ $(am__objects_1)
++libadonthell_a_OBJECTS = $(am_libadonthell_a_OBJECTS)
++am__installdirs = "$(DESTDIR)$(bindir)"
++binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
++PROGRAMS = $(bin_PROGRAMS)
++am_adonthell_OBJECTS = main.$(OBJEXT)
++adonthell_OBJECTS = $(am_adonthell_OBJECTS)
++am__DEPENDENCIES_1 =
++am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
++ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
++ $(am__DEPENDENCIES_1)
++adonthell_DEPENDENCIES = libadonthell.a $(am__DEPENDENCIES_2)
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++depcomp = $(SHELL) $(top_srcdir)/depcomp
++am__depfiles_maybe = depfiles
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
++ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++ $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++ $(AM_CXXFLAGS) $(CXXFLAGS)
++CXXLD = $(CXX)
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++SOURCES = $(libadonthell_a_SOURCES) $(adonthell_SOURCES)
++DIST_SOURCES = $(libadonthell_a_SOURCES) $(adonthell_SOURCES)
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++ html-recursive info-recursive install-data-recursive \
++ install-exec-recursive install-info-recursive \
++ install-recursive installcheck-recursive installdirs-recursive \
++ pdf-recursive ps-recursive uninstall-info-recursive \
++ uninstall-recursive
++ETAGS = etags
++CTAGS = ctags
++DIST_SUBDIRS = $(SUBDIRS)
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
++AR = @AR@
+ AUTOCONF = @AUTOCONF@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
+@@ -66,10 +155,13 @@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+ EXEEXT = @EXEEXT@
++F77 = @F77@
++FFLAGS = @FFLAGS@
+ FT2_CFLAGS = @FT2_CFLAGS@
+ FT2_CONFIG = @FT2_CONFIG@
+ FT2_LIBS = @FT2_LIBS@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GTK_FALSE = @HAVE_GTK_FALSE@
+ HAVE_GTK_TRUE = @HAVE_GTK_TRUE@
+ HAVE_OGG_VORBIS_FALSE = @HAVE_OGG_VORBIS_FALSE@
+@@ -132,8 +224,7 @@
+ XGETTEXT = @XGETTEXT@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
++ac_ct_F77 = @ac_ct_F77@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+@@ -141,6 +232,8 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+@@ -148,6 +241,9 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ gamedatadir = @gamedatadir@
+ haveldd = @haveldd@
+@@ -156,16 +252,21 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+@@ -174,19 +275,11 @@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-
+ SUBDIRS = . modules
+-
+-bin_PROGRAMS = adonthell
+-
+ EXTRA_DIST = .indent.pro prefs.l py_adonthell.i
+-
+ AM_CPPFLAGS = $(SDL_DEFS) $(OGG_DEFS) $(SDL_CFLAGS) $(OGG_CFLAGS)
$(PY_CFLAGS) $(FT2_CFLAGS)
+-
+ noinst_LIBRARIES = libadonthell.a
+-
+ CLEANFILES = $(moddata_SCRIPTS)
+-
+ headers = \
+ adonthell.h animation.h audio.h callback.h py_callback.h character_base.h \
+ character.h gamedata.h data_screen.h dialog.h dialog_screen.h drawable.h \
+@@ -199,8 +292,7 @@
+ win_base.h win_border.h win_container.h str_hash.h win_font.h win_image.h \
+ win_label.h win_mapview.h label.h label_input.h win_scrollbar.h win_scroll.h \
+ win_select.h win_theme.h win_keys.h win_event.h win_types.h win_write.h \
+-win_ttf.h win_manager.h win_object.h window.h win_wrappers.h yarg.h SDL_ttf.h
+-
++win_ttf.h win_manager.h win_object.h window.h win_wrappers.h yarg.h
+
+ libadonthell_a_SOURCES = adonthell.cc animation.cc audio.cc \
+ character_base.cc character.cc data_screen.cc dialog.cc dialog_screen.cc \
+@@ -216,142 +308,47 @@
+ win_ttf.cc win_keys.cc win_manager.cc win_scrollbar.cc win_scroll.cc \
+ win_select.cc \
+ win_theme.cc win_event.cc yarg.cc mixer.c music.c music_cmd.c music_cmd.h \
+-music_ogg.c music_ogg.h wave.h wavestream.c wavestream.h SDL_mixer.h \
+-SDL_ttf.c $(headers)
+-
++music_ogg.c music_ogg.h wave.h wavestream.c wavestream.h $(headers)
+
+ libadonthell_LDADD = $(SDL_LIBS) $(OGG_LIBS) $(PY_LIBS) $(INTLLIBS)
$(FT2_LIBS)
+-
+ adonthell_LDADD = libadonthell.a $(libadonthell_LDADD)
+-
+ adonthell_SOURCES = main.cc
+
+ # -- MacOS X App Bundle
+ @[EMAIL PROTECTED] = Adonthell.app/Contents
+-subdir = src
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-LIBRARIES = $(noinst_LIBRARIES)
+-
+-libadonthell_a_AR = $(AR) cru
+-libadonthell_a_LIBADD =
+-am__objects_1 =
+-am_libadonthell_a_OBJECTS = adonthell.$(OBJEXT) animation.$(OBJEXT) \
+- audio.$(OBJEXT) character_base.$(OBJEXT) character.$(OBJEXT) \
+- data_screen.$(OBJEXT) dialog.$(OBJEXT) dialog_screen.$(OBJEXT) \
+- drawable.$(OBJEXT) drawing_area.$(OBJEXT) event.$(OBJEXT) \
+- event_handler.$(OBJEXT) event_list.$(OBJEXT) fileops.$(OBJEXT) \
+- game.$(OBJEXT) gamedata.$(OBJEXT) gamedate.$(OBJEXT) \
+- gametime.$(OBJEXT) image.$(OBJEXT) input.$(OBJEXT) \
+- label.$(OBJEXT) label_input.$(OBJEXT) landmap.$(OBJEXT) \
+- lex.prefs.$(OBJEXT) map_event.$(OBJEXT) \
+- map_event_handler.$(OBJEXT) mapsquare_walkable.$(OBJEXT) \
+- mapcharacter.$(OBJEXT) mapsquare.$(OBJEXT) mapobject.$(OBJEXT) \
+- mapview.$(OBJEXT) nls.$(OBJEXT) path.$(OBJEXT) pnm.$(OBJEXT) \
+- prefs.$(OBJEXT) py_callback.$(OBJEXT) python_class.$(OBJEXT) \
+- py_adonthell_wrap.$(OBJEXT) py_object.$(OBJEXT) quest.$(OBJEXT) \
+- screen.$(OBJEXT) surface.$(OBJEXT) storage.$(OBJEXT) \
+- text_bubble.$(OBJEXT) time_event.$(OBJEXT) \
+- time_event_handler.$(OBJEXT) win_background.$(OBJEXT) \
+- win_base.$(OBJEXT) win_border.$(OBJEXT) win_container.$(OBJEXT) \
+- win_font.$(OBJEXT) win_ttf.$(OBJEXT) win_keys.$(OBJEXT) \
+- win_manager.$(OBJEXT) win_scrollbar.$(OBJEXT) \
+- win_scroll.$(OBJEXT) win_select.$(OBJEXT) win_theme.$(OBJEXT) \
+- win_event.$(OBJEXT) yarg.$(OBJEXT) mixer.$(OBJEXT) \
+- music.$(OBJEXT) music_cmd.$(OBJEXT) music_ogg.$(OBJEXT) \
+- wavestream.$(OBJEXT) SDL_ttf.$(OBJEXT) $(am__objects_1)
+-libadonthell_a_OBJECTS = $(am_libadonthell_a_OBJECTS)
+-bin_PROGRAMS = adonthell$(EXEEXT)
+-PROGRAMS = $(bin_PROGRAMS)
+-
+-am_adonthell_OBJECTS = main.$(OBJEXT)
+-adonthell_OBJECTS = $(am_adonthell_OBJECTS)
+-adonthell_DEPENDENCIES = libadonthell.a
+-adonthell_LDFLAGS =
+-
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+-depcomp = $(SHELL) $(top_srcdir)/depcomp
+-am__depfiles_maybe = depfiles
[EMAIL PROTECTED]@DEP_FILES = ./$(DEPDIR)/SDL_ttf.Po ./$(DEPDIR)/adonthell.Po \
[EMAIL PROTECTED]@ ./$(DEPDIR)/animation.Po ./$(DEPDIR)/audio.Po \
[EMAIL PROTECTED]@ ./$(DEPDIR)/character.Po \
[EMAIL PROTECTED]@ ./$(DEPDIR)/character_base.Po \
[EMAIL PROTECTED]@ ./$(DEPDIR)/data_screen.Po ./$(DEPDIR)/dialog.Po \
[EMAIL PROTECTED]@ ./$(DEPDIR)/dialog_screen.Po \
[EMAIL PROTECTED]@ ./$(DEPDIR)/drawable.Po ./$(DEPDIR)/drawing_area.Po \
[EMAIL PROTECTED]@ ./$(DEPDIR)/event.Po ./$(DEPDIR)/event_handler.Po \
[EMAIL PROTECTED]@ ./$(DEPDIR)/event_list.Po ./$(DEPDIR)/fileops.Po \
[EMAIL PROTECTED]@ ./$(DEPDIR)/game.Po ./$(DEPDIR)/gamedata.Po \
[EMAIL PROTECTED]@ ./$(DEPDIR)/gamedate.Po ./$(DEPDIR)/gametime.Po \
[EMAIL PROTECTED]@ ./$(DEPDIR)/image.Po ./$(DEPDIR)/input.Po \
[EMAIL PROTECTED]@ ./$(DEPDIR)/label.Po ./$(DEPDIR)/label_input.Po \
[EMAIL PROTECTED]@ ./$(DEPDIR)/landmap.Po ./$(DEPDIR)/lex.prefs.Po \
[EMAIL PROTECTED]@ ./$(DEPDIR)/main.Po ./$(DEPDIR)/map_event.Po \
[EMAIL PROTECTED]@ ./$(DEPDIR)/map_event_handler.Po \
[EMAIL PROTECTED]@ ./$(DEPDIR)/mapcharacter.Po \
[EMAIL PROTECTED]@ ./$(DEPDIR)/mapobject.Po ./$(DEPDIR)/mapsquare.Po \
[EMAIL PROTECTED]@ ./$(DEPDIR)/mapsquare_walkable.Po \
[EMAIL PROTECTED]@ ./$(DEPDIR)/mapview.Po ./$(DEPDIR)/mixer.Po \
[EMAIL PROTECTED]@ ./$(DEPDIR)/music.Po ./$(DEPDIR)/music_cmd.Po \
[EMAIL PROTECTED]@ ./$(DEPDIR)/music_ogg.Po ./$(DEPDIR)/nls.Po \
[EMAIL PROTECTED]@ ./$(DEPDIR)/path.Po ./$(DEPDIR)/pnm.Po \
[EMAIL PROTECTED]@ ./$(DEPDIR)/prefs.Po \
[EMAIL PROTECTED]@ ./$(DEPDIR)/py_adonthell_wrap.Po \
[EMAIL PROTECTED]@ ./$(DEPDIR)/py_callback.Po ./$(DEPDIR)/py_object.Po \
[EMAIL PROTECTED]@ ./$(DEPDIR)/python_class.Po ./$(DEPDIR)/quest.Po \
[EMAIL PROTECTED]@ ./$(DEPDIR)/screen.Po ./$(DEPDIR)/storage.Po \
[EMAIL PROTECTED]@ ./$(DEPDIR)/surface.Po ./$(DEPDIR)/text_bubble.Po \
[EMAIL PROTECTED]@ ./$(DEPDIR)/time_event.Po \
[EMAIL PROTECTED]@ ./$(DEPDIR)/time_event_handler.Po \
[EMAIL PROTECTED]@ ./$(DEPDIR)/wavestream.Po \
[EMAIL PROTECTED]@ ./$(DEPDIR)/win_background.Po \
[EMAIL PROTECTED]@ ./$(DEPDIR)/win_base.Po ./$(DEPDIR)/win_border.Po \
[EMAIL PROTECTED]@ ./$(DEPDIR)/win_container.Po \
[EMAIL PROTECTED]@ ./$(DEPDIR)/win_event.Po ./$(DEPDIR)/win_font.Po \
[EMAIL PROTECTED]@ ./$(DEPDIR)/win_keys.Po ./$(DEPDIR)/win_manager.Po \
[EMAIL PROTECTED]@ ./$(DEPDIR)/win_scroll.Po \
[EMAIL PROTECTED]@ ./$(DEPDIR)/win_scrollbar.Po \
[EMAIL PROTECTED]@ ./$(DEPDIR)/win_select.Po ./$(DEPDIR)/win_theme.Po \
[EMAIL PROTECTED]@ ./$(DEPDIR)/win_ttf.Po ./$(DEPDIR)/yarg.Po
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
+- $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+- $(AM_CXXFLAGS) $(CXXFLAGS)
+-CXXLD = $(CXX)
+-CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
+- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-DIST_SOURCES = $(libadonthell_a_SOURCES) $(adonthell_SOURCES)
+-
+-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+- ps-recursive install-info-recursive uninstall-info-recursive \
+- all-recursive install-data-recursive install-exec-recursive \
+- installdirs-recursive install-recursive uninstall-recursive \
+- check-recursive installcheck-recursive
+-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+-DIST_SUBDIRS = $(SUBDIRS)
+-SOURCES = $(libadonthell_a_SOURCES) $(adonthell_SOURCES)
+-
+ all: all-recursive
+
+ .SUFFIXES:
+ .SUFFIXES: .c .cc .lo .o .obj
+-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
++$(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 \
++ && exit 0; \
++ exit 1;; \
++ esac; \
++ done; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu src/Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
$(am__depfiles_maybe)
+-
+-AR = ar
++ $(AUTOMAKE) --foreign src/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
+
+ clean-noinstLIBRARIES:
+ -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
+@@ -359,18 +356,17 @@
+ -rm -f libadonthell.a
+ $(libadonthell_a_AR) libadonthell.a $(libadonthell_a_OBJECTS)
$(libadonthell_a_LIBADD)
+ $(RANLIB) libadonthell.a
+-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ @$(NORMAL_INSTALL)
+- $(mkinstalldirs) $(DESTDIR)$(bindir)
++ test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+ @list='$(bin_PROGRAMS)'; for p in $$list; do \
+ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ if test -f $$p \
+ || test -f $$p1 \
+ ; then \
+ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install
$(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
+- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install
$(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \
++ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install
$(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
++ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install
$(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
+ else :; fi; \
+ done
+
+@@ -378,8 +374,8 @@
+ @$(NORMAL_UNINSTALL)
+ @list='$(bin_PROGRAMS)'; for p in $$list; do \
+ f=`echo "$$p" | sed
's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+- echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
+- rm -f $(DESTDIR)$(bindir)/$$f; \
++ echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
++ rm -f "$(DESTDIR)$(bindir)/$$f"; \
+ done
+
+ clean-binPROGRAMS:
+@@ -393,12 +389,11 @@
+ $(CXXLINK) $(adonthell_LDFLAGS) $(adonthell_OBJECTS) $(adonthell_LDADD)
$(LIBS)
+
+ mostlyclean-compile:
+- -rm -f *.$(OBJEXT) core *.core
++ -rm -f *.$(OBJEXT)
+
+ distclean-compile:
+ -rm -f *.tab.c
+
[EMAIL PROTECTED]@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
+ @AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
+ @AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
+ @AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
+@@ -467,70 +462,46 @@
+ @AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
+
+ .c.o:
[EMAIL PROTECTED]@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
[EMAIL PROTECTED]@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
[EMAIL PROTECTED]@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
[EMAIL PROTECTED]@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
[EMAIL PROTECTED]@ fi
[EMAIL PROTECTED]@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c
-o $@ $<; \
[EMAIL PROTECTED]@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else
rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no
@AMDEPBACKSLASH@
[EMAIL PROTECTED]@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po'
tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
[EMAIL PROTECTED]@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
[EMAIL PROTECTED]@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
[EMAIL PROTECTED]@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
[EMAIL PROTECTED]@ $(COMPILE) -c $<
+
+ .c.obj:
[EMAIL PROTECTED]@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
[EMAIL PROTECTED]@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<';
else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
[EMAIL PROTECTED]@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
[EMAIL PROTECTED]@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
[EMAIL PROTECTED]@ fi
[EMAIL PROTECTED]@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c
-o $@ `$(CYGPATH_W) '$<'`; \
[EMAIL PROTECTED]@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else
rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no
@AMDEPBACKSLASH@
[EMAIL PROTECTED]@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po'
tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
[EMAIL PROTECTED]@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
[EMAIL PROTECTED]@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<';
else $(CYGPATH_W) '$(srcdir)/$<'; fi`
[EMAIL PROTECTED]@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
[EMAIL PROTECTED]@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+ .c.lo:
[EMAIL PROTECTED]@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
[EMAIL PROTECTED]@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
[EMAIL PROTECTED]@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
[EMAIL PROTECTED]@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
[EMAIL PROTECTED]@ fi
[EMAIL PROTECTED]@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo"
-c -o $@ $<; \
[EMAIL PROTECTED]@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else
rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes
@AMDEPBACKSLASH@
[EMAIL PROTECTED]@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo'
tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
[EMAIL PROTECTED]@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
[EMAIL PROTECTED]@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo
'$(srcdir)/'`$<
[EMAIL PROTECTED]@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
[EMAIL PROTECTED]@ $(LTCOMPILE) -c -o $@ $<
+
+ .cc.o:
[EMAIL PROTECTED]@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
[EMAIL PROTECTED]@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
[EMAIL PROTECTED]@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
[EMAIL PROTECTED]@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
[EMAIL PROTECTED]@ fi
[EMAIL PROTECTED]@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo"
-c -o $@ $<; \
[EMAIL PROTECTED]@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else
rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no
@AMDEPBACKSLASH@
[EMAIL PROTECTED]@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po'
tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
[EMAIL PROTECTED]@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp)
@AMDEPBACKSLASH@
[EMAIL PROTECTED]@ $(CXXCOMPILE) -c -o $@ `test -f '$<' || echo
'$(srcdir)/'`$<
[EMAIL PROTECTED]@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
[EMAIL PROTECTED]@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cc.obj:
[EMAIL PROTECTED]@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
[EMAIL PROTECTED]@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<';
else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
[EMAIL PROTECTED]@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
[EMAIL PROTECTED]@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
[EMAIL PROTECTED]@ fi
[EMAIL PROTECTED]@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo"
-c -o $@ `$(CYGPATH_W) '$<'`; \
[EMAIL PROTECTED]@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else
rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no
@AMDEPBACKSLASH@
[EMAIL PROTECTED]@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po'
tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
[EMAIL PROTECTED]@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp)
@AMDEPBACKSLASH@
[EMAIL PROTECTED]@ $(CXXCOMPILE) -c -o $@ `if test -f '$<'; then
$(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
[EMAIL PROTECTED]@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
[EMAIL PROTECTED]@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cc.lo:
[EMAIL PROTECTED]@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF
"$(DEPDIR)/$*.Tpo" \
[EMAIL PROTECTED]@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
[EMAIL PROTECTED]@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
[EMAIL PROTECTED]@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
[EMAIL PROTECTED]@ fi
[EMAIL PROTECTED]@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF
"$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
[EMAIL PROTECTED]@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else
rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes
@AMDEPBACKSLASH@
[EMAIL PROTECTED]@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo'
tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
[EMAIL PROTECTED]@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp)
@AMDEPBACKSLASH@
[EMAIL PROTECTED]@ $(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo
'$(srcdir)/'`$<
[EMAIL PROTECTED]@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
[EMAIL PROTECTED]@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -549,7 +520,13 @@
+ # (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):
+- @set fnord $$MAKEFLAGS; amf=$$2; \
++ @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 \
+@@ -561,7 +538,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++ || eval $$failcom; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -569,7 +546,13 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @set fnord $$MAKEFLAGS; amf=$$2; \
++ @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)' ;; \
+@@ -590,7 +573,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++ || eval $$failcom; \
+ done && test -z "$$fail"
+ tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -601,14 +584,6 @@
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS)
ctags); \
+ done
+
+-ETAGS = etags
+-ETAGSFLAGS =
+-
+-CTAGS = ctags
+-CTAGSFLAGS =
+-
+-tags: TAGS
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -617,19 +592,22 @@
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
++tags: TAGS
+
+ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
+- if (etags --etags-include --version) >/dev/null 2>&1; then \
++ 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 && \
++ test ! -f $$subdir/TAGS || \
+ tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+ fi; \
+ done; \
+@@ -639,10 +617,11 @@
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+- test -z "$(ETAGS_ARGS)$$tags$$unique" \
+- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+- $$tags $$unique
+-
++ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
++ test -n "$$unique" || unique=$$empty_fix; \
++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++ $$tags $$unique; \
++ fi
+ ctags: CTAGS
+ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+@@ -665,10 +644,6 @@
+
+ distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-
+-top_distdir = ..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+@@ -682,7 +657,7 @@
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkinstalldirs) "$(distdir)$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -697,15 +672,17 @@
+ || exit 1; \
+ fi; \
+ done
+- list='$(SUBDIRS)'; for subdir in $$list; do \
++ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+- test -d $(distdir)/$$subdir \
+- || mkdir $(distdir)/$$subdir \
++ test -d "$(distdir)/$$subdir" \
++ || $(mkdir_p) "$(distdir)/$$subdir" \
+ || exit 1; \
++ distdir=`$(am__cd) $(distdir) && pwd`; \
++ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ (cd $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+- top_distdir="$(top_distdir)" \
+- distdir=../$(distdir)/$$subdir \
++ top_distdir="$$top_distdir" \
++ distdir="$$distdir/$$subdir" \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -715,8 +692,9 @@
+ all-am: Makefile $(LIBRARIES) $(PROGRAMS)
+ installdirs: installdirs-recursive
+ installdirs-am:
+- $(mkinstalldirs) $(DESTDIR)$(bindir)
+-
++ for dir in "$(DESTDIR)$(bindir)"; do \
++ test -z "$$dir" || $(mkdir_p) "$$dir"; \
++ done
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -737,7 +715,7 @@
+ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+ distclean-generic:
+- -rm -f $(CONFIG_CLEAN_FILES)
++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+@@ -757,6 +735,8 @@
+
+ dvi-am:
+
++html: html-recursive
++
+ info: info-recursive
+
+ info-am:
+@@ -795,24 +775,21 @@
+
+ uninstall-info: uninstall-info-recursive
+
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+- clean-binPROGRAMS clean-generic clean-libtool \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++ clean clean-binPROGRAMS clean-generic clean-libtool \
+ clean-noinstLIBRARIES clean-recursive ctags ctags-recursive \
+- distclean distclean-compile distclean-generic distclean-libtool \
+- distclean-recursive distclean-tags distdir dvi dvi-am \
+- dvi-recursive info info-am info-recursive install install-am \
+- install-binPROGRAMS install-data install-data-am \
+- install-data-recursive install-exec install-exec-am \
+- install-exec-recursive install-info install-info-am \
+- install-info-recursive install-man install-recursive \
+- install-strip installcheck installcheck-am installdirs \
+- installdirs-am installdirs-recursive maintainer-clean \
+- maintainer-clean-generic maintainer-clean-recursive mostlyclean \
+- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+- mostlyclean-recursive pdf pdf-am pdf-recursive ps ps-am \
+- ps-recursive tags tags-recursive uninstall uninstall-am \
+- uninstall-binPROGRAMS uninstall-info-am \
+- uninstall-info-recursive uninstall-recursive
++ distclean distclean-compile distclean-generic \
++ distclean-libtool distclean-recursive distclean-tags distdir \
++ dvi dvi-am html html-am info info-am install install-am \
++ install-binPROGRAMS install-data install-data-am install-exec \
++ install-exec-am install-exec-hook install-info install-info-am \
++ install-man install-strip installcheck installcheck-am \
++ installdirs installdirs-am maintainer-clean \
++ maintainer-clean-generic maintainer-clean-recursive \
++ mostlyclean mostlyclean-compile mostlyclean-generic \
++ mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
++ tags tags-recursive uninstall uninstall-am \
++ uninstall-binPROGRAMS uninstall-info-am
+
+
+ # Note: adonthell.py is also built by this target.
only in patch2:
unchanged:
---
adonthell-0.3.4.cvs.20050813.orig/debian/patches/01_work_around_bug_381456.diff
+++ adonthell-0.3.4.cvs.20050813/debian/patches/01_work_around_bug_381456.diff
@@ -0,0 +1,13 @@
+Index: adonthell-0.3.4.cvs.20050813/src/win_ttf.cc
+===================================================================
+--- adonthell-0.3.4.cvs.20050813.orig/src/win_ttf.cc 2006-08-10
20:50:05.000000000 +0200
++++ adonthell-0.3.4.cvs.20050813/src/win_ttf.cc 2006-08-10
20:50:18.000000000 +0200
+@@ -137,7 +137,7 @@
+ if (s == NULL) return *(glyphs[' ']);
+
+ image tmp (s, bg);
+- image shadow (TTF_RenderUNICODE_Solid (ttf, unichar, bg), white);
++ image shadow (TTF_RenderUNICODE_Shaded (ttf, unichar, bg, bg), white);
+ image *glph = new image (tmp.length(), height_, false);
+ glph->fillrect (0, 0, tmp.length()+1, height_+1, screen::trans_col(),
NULL);
+ shadow.draw (1, 1+height_-shadow.height(), 0, 0, shadow.length(),
shadow.height(), NULL, glph);
