From 92414f5af0a470b0f880b12dfae001e250bcbfa1 Mon Sep 17 00:00:00 2001
From: Pascal Terjan <pterjan@linuxfr.org>
Date: Thu, 15 Nov 2007 12:27:40 +0000
Subject: [PATCH] * Use autotools for Ruby bindings

---
 ruby/Makefile.am                | 33 ++++++++++-----------------------
 ruby/caca/extconf.rb            |  5 -----
 ruby/{cucul => }/cucul-canvas.c |  0
 ruby/{cucul => }/cucul-canvas.h |  0
 ruby/{cucul => }/cucul.c        |  0
 ruby/cucul/extconf.rb           |  5 -----
 ruby/{cucul => }/t/tc_frame.rb  |  0
 ruby/{cucul/test.rb => test}    |  2 ++
 8 files changed, 12 insertions(+), 33 deletions(-)
 delete mode 100644 ruby/caca/extconf.rb
 rename ruby/{cucul => }/cucul-canvas.c (100%)
 rename ruby/{cucul => }/cucul-canvas.h (100%)
 rename ruby/{cucul => }/cucul.c (100%)
 delete mode 100644 ruby/cucul/extconf.rb
 rename ruby/{cucul => }/t/tc_frame.rb (100%)
 rename ruby/{cucul/test.rb => test} (71%)
 mode change 100644 => 100755

diff --git a/ruby/Makefile.am b/ruby/Makefile.am
index 8fa70b7..66c2c01 100644
--- a/ruby/Makefile.am
+++ b/ruby/Makefile.am
@@ -1,30 +1,17 @@
 # $Id: $
+rubylibdir=$(RUBY_SITEARCHDIR)
 
 if USE_RUBY
-noinst_DATA = cucul/cucul.so caca/caca.so
+rubylib_LTLIBRARIES = cucul.la
 endif
 
-EXTRA_DIST = cucul/extconf.rb \
-             cucul/cucul.c \
-             cucul/cucul-canvas.c \
-             cucul/cucul-canvas.h \
-             cucul/test.rb \
-             cucul/t/tc_frame.rb \
-             caca/extconf.rb
+cucul_la_CPPFLAGS = -I$(top_srcdir)/cucul -I$(RUBY_ARCHDIR)
+cucul_la_SOURCES = cucul.c cucul-canvas.c
+cucul_la_LDFLAGS = -module -avoid-version -shared -L$(RUBY_LIBDIR) -l$(RUBY_SO_NAME)
+cucul_la_LIBADD = ../cucul/libcucul.la
 
-DISTCLEANFILES = cucul/Makefile caca/Makefile
+EXTRA_DIST = cucul-canvas.h \
+	     test.rb \
+             t/tc_frame.rb
 
-cucul/cucul.so:
-	ruby -C cucul extconf.rb
-	make -C cucul
-
-caca/caca.so: cucul/cucul.so
-	ruby -C caca extconf.rb
-	make -C caca
-
-clean-local:
-	[ ! -f cucul/Makefile ] || make -C cucul clean
-	[ ! -f caca/Makefile ] || make -C caca clean
-
-distclean-local:
-	rm -f cucul/Makefile caca/Makefile
+CFLAGS+=-Wno-strict-prototypes -Wno-missing-prototypes
diff --git a/ruby/caca/extconf.rb b/ruby/caca/extconf.rb
deleted file mode 100644
index 3996818..0000000
--- a/ruby/caca/extconf.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-require 'mkmf'
-
-pkg_config("caca")
-$CFLAGS += " -Wall"
-create_makefile("caca")
diff --git a/ruby/cucul/cucul-canvas.c b/ruby/cucul-canvas.c
similarity index 100%
rename from ruby/cucul/cucul-canvas.c
rename to ruby/cucul-canvas.c
diff --git a/ruby/cucul/cucul-canvas.h b/ruby/cucul-canvas.h
similarity index 100%
rename from ruby/cucul/cucul-canvas.h
rename to ruby/cucul-canvas.h
diff --git a/ruby/cucul/cucul.c b/ruby/cucul.c
similarity index 100%
rename from ruby/cucul/cucul.c
rename to ruby/cucul.c
diff --git a/ruby/cucul/extconf.rb b/ruby/cucul/extconf.rb
deleted file mode 100644
index 3e7f67a..0000000
--- a/ruby/cucul/extconf.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-require 'mkmf'
-
-pkg_config("cucul")
-$CFLAGS += " -Wall"
-create_makefile("cucul")
diff --git a/ruby/cucul/t/tc_frame.rb b/ruby/t/tc_frame.rb
similarity index 100%
rename from ruby/cucul/t/tc_frame.rb
rename to ruby/t/tc_frame.rb
diff --git a/ruby/cucul/test.rb b/ruby/test
old mode 100644
new mode 100755
similarity index 71%
rename from ruby/cucul/test.rb
rename to ruby/test
index 713bfae..bd50a74
--- a/ruby/cucul/test.rb
+++ b/ruby/test
@@ -1,3 +1,5 @@
+#!/usr/bin/ruby -I.libs
+
 require 'test/unit'
 Dir.glob("t/tc*.rb").each{ |t|
 	require t