blockout/automake.diff

From: Jan Engelhardt <jengelh@medozas.de>
Date: 2012-03-25 16:12:52.925160061 +0200

---
 BlockOut/Makefile.am     |   14 ++++++++++++++
 ImageLib/src/Makefile.am |   12 ++++++++++++
 ImageLib/src/png/hpng.c  |    2 +-
 Makefile.am              |    3 +++
 configure.ac             |   14 ++++++++++++++
 5 files changed, 44 insertions(+), 1 deletion(-)

Index: bl24_lin_src/BlockOut/Makefile.am
===================================================================
--- /dev/null
+++ bl24_lin_src/BlockOut/Makefile.am
@@ -0,0 +1,14 @@
+# -*- Makefile -*-
+
+AM_CPPFLAGS = -D_DEBUG -Dlinux -I../ImageLib/src -I. \
+              ${libSDL_CFLAGS} ${libSDL_mixer_CFLAGS}
+
+bin_PROGRAMS = blockout
+blockout_SOURCES = \
+	BlockOut.cpp BotPlayer.cpp EditControl.cpp Game.cpp Http.cpp InitPolyCube.cpp Menu.cpp MenuGraphics.cpp MenuGrid.cpp PageChangeSetup.cpp PageChooseSetup.cpp PageControls.cpp PageCredits.cpp PageGSOptions.cpp PageHallOfFame.cpp PageHallOfFameOnLine.cpp PageHttp.cpp PageMainMenu.cpp PageOptions.cpp PageScoreDetails.cpp PageStartGame.cpp Pit.cpp PolyCube.cpp SetupManager.cpp SoundManager.cpp Sprites.cpp Utils.cpp BlockOut.h BotPlayer.h EditControl.h Game.h Http.h Menu.h MenuGrid.h MenuPage.h Pit.h PolyCube.h SetupManager.h SoundManager.h Sprites.h Types.h GLApp/GLApp.cpp GLApp/GLFont.cpp GLApp/GLMatrix.cpp GLApp/GLSprite.cpp GLApp/GLApp.h GLApp/GLFont.h GLApp/GLMatrix.h GLApp/GLSprite.h
+blockout_LDADD = \
+	../ImageLib/src/libimagelib.la \
+	${libGL_LIBS} ${libGLU_LIBS} ${libSDL_LIBS} ${libSDL_mixer_LIBS}
+
+nobase_pkgdata_DATA = \
+	images/allPieces.png images/background.png images/background2.png images/background3.png images/font.png images/gameover.png images/gameovera.png images/marble.png images/marbleg.png images/menuback.png images/menucredits.png images/menufont.png images/menufont2.png images/menupit.png images/online.png images/onlinea.png images/spark.png images/sparka.png images/sprites.png images/spritesa.png images/star_crystal_grid.png sounds/blub.wav sounds/empty.wav sounds/empty2.wav sounds/hit.wav sounds/level.wav sounds/level2.wav sounds/line.wav sounds/line2.wav sounds/music.mp3 sounds/tchh.wav sounds/welldone.wav sounds/welldone2.wav sounds/wozz.wav
Index: bl24_lin_src/ImageLib/src/Makefile.am
===================================================================
--- /dev/null
+++ bl24_lin_src/ImageLib/src/Makefile.am
@@ -0,0 +1,12 @@
+# -*- Makefile -*-
+
+AM_CPPFLAGS = -I. ${libpng_CFLAGS}
+
+noinst_LTLIBRARIES = libimagelib.la
+
+libimagelib_la_SOURCES = \
+	gif/gif.c gif/gif.h \
+	jpg/H2v2.cpp jpg/idct.cpp jpg/jpegdecoder.cpp jpg/jpegdecodermain.cpp jpg/jpegdecoder.h jpg/main.h \
+	png/hpng.c png/hpng.h \
+	CImage.cpp CImage.h
+libimagelib_la_LIBADD = ${libpng_LIBS}
Index: bl24_lin_src/ImageLib/src/png/hpng.c
===================================================================
--- bl24_lin_src.orig/ImageLib/src/png/hpng.c
+++ bl24_lin_src/ImageLib/src/png/hpng.c
@@ -1,6 +1,6 @@
 #include <malloc.h>
 #include <math.h>
-#include "png/png.h"
+#include <png.h>
 #include "hpng.h"
 
 char PngErrorMessage[1024];
Index: bl24_lin_src/Makefile.am
===================================================================
--- /dev/null
+++ bl24_lin_src/Makefile.am
@@ -0,0 +1,3 @@
+# -*- Makefile -*-
+
+SUBDIRS = ImageLib/src BlockOut
Index: bl24_lin_src/configure.ac
===================================================================
--- /dev/null
+++ bl24_lin_src/configure.ac
@@ -0,0 +1,14 @@
+AC_INIT([blockout], [2.4])
+AC_CONFIG_AUX_DIR([build-aux])
+AM_INIT_AUTOMAKE([-Wall foreign subdir-objects tar-pax no-dist-gzip dist-xz])
+LT_INIT
+AC_PROG_CXX
+PKG_CHECK_MODULES([libGL], [gl])
+PKG_CHECK_MODULES([libGLU], [glu])
+PKG_CHECK_MODULES([libSDL], [sdl >= 1.2.12])
+PKG_CHECK_MODULES([libSDL_mixer], [SDL_mixer >= 1.2.8])
+PKG_CHECK_MODULES([libpng], [libpng16], [:], [
+	PKG_CHECK_MODULES([libpng], [libpng15])
+])
+AC_CONFIG_FILES([Makefile ImageLib/src/Makefile BlockOut/Makefile])
+AC_OUTPUT