From af2e5f74d3651c169cab100983dfc85a999b7383 Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Mon, 7 Feb 2005 15:34:20 +0000 Subject: [PATCH] moduels support multiple architectures build for 1 module SVN revision: 13228 --- TODO | 1 - configure.in | 10 +++++++++- src/bin/e_module.c | 2 +- src/modules/battery/Makefile.am | 2 +- src/modules/clock/Makefile.am | 2 +- src/modules/dropshadow/Makefile.am | 2 +- src/modules/flame/Makefile.am | 2 +- src/modules/ibar/Makefile.am | 2 +- src/modules/ibox/Makefile.am | 2 +- src/modules/pager/Makefile.am | 2 +- src/modules/snow/Makefile.am | 2 +- src/modules/temperature/Makefile.am | 2 +- src/modules/test/Makefile.am | 2 +- 13 files changed, 20 insertions(+), 13 deletions(-) diff --git a/TODO b/TODO index eb3d95743..8a2b2185a 100644 --- a/TODO +++ b/TODO @@ -29,7 +29,6 @@ Current freeze issues are: ISSUES: -* module needs to handle multiple architectures for modules (eg in ~/.e/e/modules) * ibar, temp and battery modules should only make 1 gadget per container and allow u to enable/disable that gadget on that container (like clock) * pager needs to be able to split off each desk in a zone it a different gadget * gadman gadget menu needs icons :) diff --git a/configure.in b/configure.in index 0cebc7924..62d5474bc 100644 --- a/configure.in +++ b/configure.in @@ -4,10 +4,14 @@ dnl Process this file with autoconf to produce a configure script. rm -f config.cache AC_INIT(configure.in) +AC_CANONICAL_BUILD +AC_CANONICAL_HOST +AC_CANONICAL_TARGET +AC_ISC_POSIX AM_INIT_AUTOMAKE(enlightenment, 0.17.0_pre10) AM_CONFIG_HEADER(config.h) -AC_ISC_POSIX +AC_C_BIGENDIAN AC_PROG_CC AM_PROG_CC_STDC AC_HEADER_STDC @@ -15,6 +19,10 @@ AC_C_CONST AM_ENABLE_SHARED AM_PROG_LIBTOOL +MODULE_ARCH="$target_os-$target_cpu" +AC_SUBST(MODULE_ARCH) +AC_DEFINE_UNQUOTED(MODULE_ARCH, "$MODULE_ARCH", "Module architecture") + if test "x${bindir}" = 'x${exec_prefix}/bin'; then if test "x${exec_prefix}" = "xNONE"; then if test "x${prefix}" = "xNONE"; then diff --git a/src/bin/e_module.c b/src/bin/e_module.c index 2f4072e11..2beccbbe7 100644 --- a/src/bin/e_module.c +++ b/src/bin/e_module.c @@ -87,7 +87,7 @@ e_module_new(char *name) m->api = &_e_module_api; if (name[0] != '/') { - snprintf(buf, sizeof(buf), "%s/module.so", name); + snprintf(buf, sizeof(buf), "%s/%s/module.so", MODULE_ARCH, name); modpath = e_path_find(_e_path_modules, buf); } else diff --git a/src/modules/battery/Makefile.am b/src/modules/battery/Makefile.am index 550606349..968196978 100644 --- a/src/modules/battery/Makefile.am +++ b/src/modules/battery/Makefile.am @@ -17,7 +17,7 @@ INCLUDES = -I. \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/modules \ @e_cflags@ -pkgdir = $(libdir)/enlightenment/modules/$(MODULE) +pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) pkg_LTLIBRARIES = module.la module_la_SOURCES = e_mod_main.c \ e_mod_main.h diff --git a/src/modules/clock/Makefile.am b/src/modules/clock/Makefile.am index e5f057015..2c7544d74 100644 --- a/src/modules/clock/Makefile.am +++ b/src/modules/clock/Makefile.am @@ -17,7 +17,7 @@ INCLUDES = -I. \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/modules \ @e_cflags@ -pkgdir = $(libdir)/enlightenment/modules/$(MODULE) +pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) pkg_LTLIBRARIES = module.la module_la_SOURCES = e_mod_main.c \ e_mod_main.h diff --git a/src/modules/dropshadow/Makefile.am b/src/modules/dropshadow/Makefile.am index 152f1f041..202117551 100644 --- a/src/modules/dropshadow/Makefile.am +++ b/src/modules/dropshadow/Makefile.am @@ -29,7 +29,7 @@ INCLUDES = -I. \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/modules \ @e_cflags@ -pkgdir = $(libdir)/enlightenment/modules/$(MODULE) +pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) pkg_LTLIBRARIES = module.la module_la_SOURCES = e_mod_main.c \ e_mod_main.h diff --git a/src/modules/flame/Makefile.am b/src/modules/flame/Makefile.am index ec14cf9d2..ae0ea6a3e 100644 --- a/src/modules/flame/Makefile.am +++ b/src/modules/flame/Makefile.am @@ -17,7 +17,7 @@ INCLUDES = -I. \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/modules \ @e_cflags@ -pkgdir = $(libdir)/enlightenment/modules/$(MODULE) +pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) pkg_LTLIBRARIES = module.la module_la_SOURCES = e_mod_main.c \ e_mod_main.h diff --git a/src/modules/ibar/Makefile.am b/src/modules/ibar/Makefile.am index 77759517e..3907c0bb2 100644 --- a/src/modules/ibar/Makefile.am +++ b/src/modules/ibar/Makefile.am @@ -17,7 +17,7 @@ INCLUDES = -I. \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/modules \ @e_cflags@ -pkgdir = $(libdir)/enlightenment/modules/$(MODULE) +pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) pkg_LTLIBRARIES = module.la module_la_SOURCES = e_mod_main.c \ e_mod_main.h diff --git a/src/modules/ibox/Makefile.am b/src/modules/ibox/Makefile.am index e92939870..0668505ac 100644 --- a/src/modules/ibox/Makefile.am +++ b/src/modules/ibox/Makefile.am @@ -17,7 +17,7 @@ INCLUDES = -I. \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/modules \ @e_cflags@ -pkgdir = $(libdir)/enlightenment/modules/$(MODULE) +pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) pkg_LTLIBRARIES = module.la module_la_SOURCES = e_mod_main.c \ e_mod_main.h diff --git a/src/modules/pager/Makefile.am b/src/modules/pager/Makefile.am index 8128e73b1..e5f93e82a 100644 --- a/src/modules/pager/Makefile.am +++ b/src/modules/pager/Makefile.am @@ -17,7 +17,7 @@ INCLUDES = -I. \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/modules \ @e_cflags@ -pkgdir = $(libdir)/enlightenment/modules/$(MODULE) +pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) pkg_LTLIBRARIES = module.la module_la_SOURCES = e_mod_main.c \ e_mod_main.h diff --git a/src/modules/snow/Makefile.am b/src/modules/snow/Makefile.am index 1659a0d71..f04d9ded2 100644 --- a/src/modules/snow/Makefile.am +++ b/src/modules/snow/Makefile.am @@ -20,7 +20,7 @@ INCLUDES = -I. \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/modules \ @e_cflags@ -pkgdir = $(libdir)/enlightenment/modules/$(MODULE) +pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) pkg_LTLIBRARIES = module.la module_la_SOURCES = e_mod_main.c \ e_mod_main.h diff --git a/src/modules/temperature/Makefile.am b/src/modules/temperature/Makefile.am index c05f9d558..f2612c7b4 100644 --- a/src/modules/temperature/Makefile.am +++ b/src/modules/temperature/Makefile.am @@ -17,7 +17,7 @@ INCLUDES = -I. \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/modules \ @e_cflags@ -pkgdir = $(libdir)/enlightenment/modules/$(MODULE) +pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) pkg_LTLIBRARIES = module.la module_la_SOURCES = e_mod_main.c \ e_mod_main.h diff --git a/src/modules/test/Makefile.am b/src/modules/test/Makefile.am index 21d917453..de6c19268 100644 --- a/src/modules/test/Makefile.am +++ b/src/modules/test/Makefile.am @@ -15,7 +15,7 @@ INCLUDES = -I. \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/modules \ @e_cflags@ -pkgdir = $(libdir)/enlightenment/modules/$(MODULE) +pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) pkg_LTLIBRARIES = module.la module_la_SOURCES = e_mod_main.c \ e_mod_main.h