projects
/
ruby-ecore.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b7fcd42
)
Link to the correct Ruby shared object.
author
Tilman Sauerbeck
<tilman@code-monkey.de>
Mon, 18 Oct 2004 20:23:32 +0000
(20:23 +0000)
committer
Tilman Sauerbeck
<tilman@code-monkey.de>
Mon, 18 Oct 2004 20:23:32 +0000
(20:23 +0000)
m4/ac_ruby_ext.m4
patch
|
blob
|
history
src/ecore/Makefile.am
patch
|
blob
|
history
src/ecore_evas/Makefile.am
patch
|
blob
|
history
src/ecore_job/Makefile.am
patch
|
blob
|
history
src/ecore_x/Makefile.am
patch
|
blob
|
history
diff --git
a/m4/ac_ruby_ext.m4
b/m4/ac_ruby_ext.m4
index 90a3383846ac8a692e255c04b5e614d7bf6e3891..da811165b43b810864e444a6d2fc91cd5878fee6 100644
(file)
--- a/
m4/ac_ruby_ext.m4
+++ b/
m4/ac_ruby_ext.m4
@@
-40,6
+40,11
@@
AC_DEFUN([AC_RUBY_EXT], [
AC_MSG_ERROR(Ruby site extension path not found)
fi
AC_MSG_ERROR(Ruby site extension path not found)
fi
+ AC_MSG_CHECKING(for Ruby shared library)
+ RUBYLIB=`($rubybin -rmkmf -e 'print Config::CONFIG[["LIBRUBYARG_SHARED"]]') 2> /dev/null`
+ AC_MSG_RESULT([$RUBYLIB])
+
+ AC_SUBST(RUBYLIB)
AC_SUBST(RUBYLIBDIR)
AC_SUBST(RUBYDIR)
AC_SUBST(RUBYSITEDIR)
AC_SUBST(RUBYLIBDIR)
AC_SUBST(RUBYDIR)
AC_SUBST(RUBYSITEDIR)
diff --git
a/src/ecore/Makefile.am
b/src/ecore/Makefile.am
index 78a07906e74bbf9b9a6c59cd0b629d00759dd32c..be693deac4a9bce2688bcf5ed1c6f664a121278d 100644
(file)
--- a/
src/ecore/Makefile.am
+++ b/
src/ecore/Makefile.am
@@
-1,4
+1,4
@@
-## $Id: Makefile.am 1
09 2004-09-01 20:33:15
Z tilman $
+## $Id: Makefile.am 1
20 2004-10-18 20:23:32
Z tilman $
AM_CFLAGS = $(ECORE_CFLAGS)
INCLUDES = -I$(RUBYDIR)
AM_CFLAGS = $(ECORE_CFLAGS)
INCLUDES = -I$(RUBYDIR)
@@
-12,5
+12,5
@@
ecore_la_SOURCES = rb_ecore.c rb_ecore.h \
rb_event_handler.c rb_event_handler.h \
rb_fd_handler.c rb_fd_handler.h
rb_event_handler.c rb_event_handler.h \
rb_fd_handler.c rb_fd_handler.h
-ecore_la_LIBADD = -L$(RUBYLIBDIR)
-lruby
$(ECORE_LIBS)
+ecore_la_LIBADD = -L$(RUBYLIBDIR)
$(RUBYLIB)
$(ECORE_LIBS)
ecore_la_LDFLAGS = -module -avoid-version
ecore_la_LDFLAGS = -module -avoid-version
diff --git
a/src/ecore_evas/Makefile.am
b/src/ecore_evas/Makefile.am
index 83c84b0d95ff0a4dc3f3d4b8d57f88914f6145ce..9818ce877bb68fa0114f3402dc43db57c2c0c8f8 100644
(file)
--- a/
src/ecore_evas/Makefile.am
+++ b/
src/ecore_evas/Makefile.am
@@
-1,4
+1,4
@@
-## $Id: Makefile.am
72 2004-08-16 18:10:27
Z tilman $
+## $Id: Makefile.am
120 2004-10-18 20:23:32
Z tilman $
AM_CFLAGS = $(ECORE_CFLAGS) $(EVAS_CFLAGS)
INCLUDES = -I$(RUBYDIR) -I$(RUBYSITEDIR)
AM_CFLAGS = $(ECORE_CFLAGS) $(EVAS_CFLAGS)
INCLUDES = -I$(RUBYDIR) -I$(RUBYSITEDIR)
@@
-12,7
+12,7
@@
ecore_evas_la_SOURCES = rb_ecore_evas_main.c rb_ecore_evas_main.h \
rb_gl_x11.c rb_gl_x11.h \
rb_fb.c rb_fb.h
rb_gl_x11.c rb_gl_x11.h \
rb_fb.c rb_fb.h
-ecore_evas_la_LIBADD = -L$(RUBYLIBDIR)
-lruby
$(ECORE_LIBS) $(EVAS_LIBS)
+ecore_evas_la_LIBADD = -L$(RUBYLIBDIR)
$(RUBYLIB)
$(ECORE_LIBS) $(EVAS_LIBS)
ecore_evas_la_LDFLAGS = -module -avoid-version
pkgincludedir = $(RUBYSITEDIR)/ecore
ecore_evas_la_LDFLAGS = -module -avoid-version
pkgincludedir = $(RUBYSITEDIR)/ecore
diff --git
a/src/ecore_job/Makefile.am
b/src/ecore_job/Makefile.am
index 30a0379bbd9d0a301a5058c27811330445bac431..1c31c3c915c19588669b91a61b58c1a7dcfe1b17 100644
(file)
--- a/
src/ecore_job/Makefile.am
+++ b/
src/ecore_job/Makefile.am
@@
-1,4
+1,4
@@
-## $Id: Makefile.am
72 2004-08-16 18:10:27
Z tilman $
+## $Id: Makefile.am
120 2004-10-18 20:23:32
Z tilman $
AM_CFLAGS = $(ECORE_CFLAGS)
INCLUDES = -I$(RUBYDIR)
AM_CFLAGS = $(ECORE_CFLAGS)
INCLUDES = -I$(RUBYDIR)
@@
-9,5
+9,5
@@
extdir = $(RUBYSITEDIR)
ecore_job_la_SOURCES = rb_ecore_job.c rb_ecore_job.h \
rb_job.c rb_job.h
ecore_job_la_SOURCES = rb_ecore_job.c rb_ecore_job.h \
rb_job.c rb_job.h
-ecore_job_la_LIBADD = -L$(RUBYLIBDIR)
-lruby
$(ECORE_LIBS)
+ecore_job_la_LIBADD = -L$(RUBYLIBDIR)
$(RUBYLIB)
$(ECORE_LIBS)
ecore_job_la_LDFLAGS = -module -avoid-version
ecore_job_la_LDFLAGS = -module -avoid-version
diff --git
a/src/ecore_x/Makefile.am
b/src/ecore_x/Makefile.am
index 064506df2f17e0787ad09bf5b369c6edf365fb50..71b5eec7acc9f9a2bda740dd96c69e6e2ba56e71 100644
(file)
--- a/
src/ecore_x/Makefile.am
+++ b/
src/ecore_x/Makefile.am
@@
-1,4
+1,4
@@
-## $Id: Makefile.am
98 2004-08-26 13:12:55
Z tilman $
+## $Id: Makefile.am
120 2004-10-18 20:23:32
Z tilman $
AM_CFLAGS = $(ECORE_CFLAGS)
INCLUDES = -I$(RUBYDIR) -I$(RUBYSITEDIR)
AM_CFLAGS = $(ECORE_CFLAGS)
INCLUDES = -I$(RUBYDIR) -I$(RUBYSITEDIR)
@@
-10,7
+10,7
@@
ecore_x_la_SOURCES = rb_ecore_x.c rb_ecore_x.h \
rb_window.c rb_window.h \
rb_cursor.c rb_cursor.h
rb_window.c rb_window.h \
rb_cursor.c rb_cursor.h
-ecore_x_la_LIBADD = -L$(RUBYLIBDIR)
-lruby
$(ECORE_LIBS)
+ecore_x_la_LIBADD = -L$(RUBYLIBDIR)
$(RUBYLIB)
$(ECORE_LIBS)
ecore_x_la_LDFLAGS = -module -avoid-version
pkgincludedir = $(RUBYSITEDIR)/ecore
ecore_x_la_LDFLAGS = -module -avoid-version
pkgincludedir = $(RUBYSITEDIR)/ecore