[debian-edu-commits] debian-edu/ 10/437: Get it building with newer automake.

[Mike Gabriel]

This is an automated email from the git hooks/post-receive script.

sunweaver pushed a commit to branch master
in repository debian-edu-artwork.

commit fd6871d403f71cd2e6c9b5242a9125edaa003f12
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Tue Aug 1 12:19:30 2006 +0000

    Get it building with newer automake.
---
 README                  | 9 +++++++++
 art/usplash/Makefile.am | 5 ++++-
 configure.in            | 3 +++
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/README b/README
index d9cc1b3..dade560 100644
--- a/README
+++ b/README
@@ -8,3 +8,12 @@ Contact debian-edu at lists.debian.org if you have comments and suggestions.
 
 The source is available from 
 http://svn.debian.org/wsvn/debian-edu/trunk/src/debian-edu-artwork/
+
+Building from svn
+-----------------
+
+To build from svn, a few files need to be generated.  Use this command to bootstrap the
+source
+
+  automake -c -a
+  autoreconf
diff --git a/art/usplash/Makefile.am b/art/usplash/Makefile.am
index 38b2957..504a69b 100644
--- a/art/usplash/Makefile.am
+++ b/art/usplash/Makefile.am
@@ -4,6 +4,8 @@
 BUILT_SOURCES = debian-edu-usplash.c debian-edu-usplash.o debian-edu-usplash.so \
 	helvB10.o helvB10.c
 
+AM_CFLAGS = -I/usr/include/bogl -I$(srcdir)
+
 usplashdir = $(libdir)/usplash
 
 install-exec-local: debian-edu-usplash.so
@@ -15,6 +17,7 @@ usplash_DATA = debian-edu-usplash.png
 EXTRA_DIST = $(usplash_DATA) debian-edu-usplash.xcf \
 	debian-edu-usplash-theme.c usplash-theme.h helvB10.bdf
 
+SUFFIXES = .bdf .c .o
 .bdf.c:
 	bdftobogl $< > $@
 
@@ -22,7 +25,7 @@ debian-edu-usplash.c: debian-edu-usplash.png
 	pngtobogl $(srcdir)/debian-edu-usplash.png >$@.new && mv $@.new $@
 
 .c.o:
-	$(CC) -Os -g -I/usr/include/bogl -I$(srcdir) -fPIC -c $< -o $@
+	$(CC) -Os -g $(AM_CFLAGS) -fPIC -c $< -o $@
 
 debian-edu-usplash.so: debian-edu-usplash.o debian-edu-usplash-theme.o helvB10.o
 	$(CC) -shared -Wl,-soname,debian-edu-usplash.so $^ -o $@
diff --git a/configure.in b/configure.in
index eb0886e..7bb71f6 100644
--- a/configure.in
+++ b/configure.in
@@ -18,6 +18,9 @@ AC_DEFINE_UNQUOTED(MICRO_VERSION, $MICRO_VERSION, [Micro Version Number])
 
 AM_MAINTAINER_MODE
 
+AC_PROG_CC
+AC_PROG_INSTALL
+
 AC_OUTPUT([
 Makefile
 art/Makefile

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-artwork.git