styx
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

moduels support multiple architectures build for 1 module 

SVN revision: 13228
This commit is contained in:
Carsten Haitzler 2005-02-07 15:34:20 +00:00
parent 536f189188
commit af2e5f74d3
13 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
TODO
View File

@ -29,7 +29,6 @@ Current freeze issues are:
ISSUES: 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) * 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 * pager needs to be able to split off each desk in a zone it a different gadget
* gadman gadget menu needs icons :) * gadman gadget menu needs icons :)

10
configure.in
View File

@ -4,10 +4,14 @@ dnl Process this file with autoconf to produce a configure script.
rm -f config.cache rm -f config.cache
AC_INIT(configure.in) 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_INIT_AUTOMAKE(enlightenment, 0.17.0_pre10)
AM_CONFIG_HEADER(config.h) AM_CONFIG_HEADER(config.h)
AC_ISC_POSIX AC_C_BIGENDIAN
AC_PROG_CC AC_PROG_CC
AM_PROG_CC_STDC AM_PROG_CC_STDC
AC_HEADER_STDC AC_HEADER_STDC
@ -15,6 +19,10 @@ AC_C_CONST
AM_ENABLE_SHARED AM_ENABLE_SHARED
AM_PROG_LIBTOOL 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${bindir}" = 'x${exec_prefix}/bin'; then
if test "x${exec_prefix}" = "xNONE"; then if test "x${exec_prefix}" = "xNONE"; then
if test "x${prefix}" = "xNONE"; then if test "x${prefix}" = "xNONE"; then

2
src/bin/e_module.c
View File

@ -87,7 +87,7 @@ e_module_new(char *name)
m->api = &_e_module_api; m->api = &_e_module_api;
if (name[0] != '/') 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); modpath = e_path_find(_e_path_modules, buf);
} }
else else

2
src/modules/battery/Makefile.am
View File

@ -17,7 +17,7 @@ INCLUDES = -I. \
-I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/lib \
-I$(top_srcdir)/src/modules \ -I$(top_srcdir)/src/modules \
@e_cflags@ @e_cflags@
pkgdir = $(libdir)/enlightenment/modules/$(MODULE) pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
pkg_LTLIBRARIES = module.la pkg_LTLIBRARIES = module.la
module_la_SOURCES = e_mod_main.c \ module_la_SOURCES = e_mod_main.c \
e_mod_main.h e_mod_main.h

2
src/modules/clock/Makefile.am
View File

@ -17,7 +17,7 @@ INCLUDES = -I. \
-I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/lib \
-I$(top_srcdir)/src/modules \ -I$(top_srcdir)/src/modules \
@e_cflags@ @e_cflags@
pkgdir = $(libdir)/enlightenment/modules/$(MODULE) pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
pkg_LTLIBRARIES = module.la pkg_LTLIBRARIES = module.la
module_la_SOURCES = e_mod_main.c \ module_la_SOURCES = e_mod_main.c \
e_mod_main.h e_mod_main.h

2
src/modules/dropshadow/Makefile.am
View File

@ -29,7 +29,7 @@ INCLUDES = -I. \
-I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/lib \
-I$(top_srcdir)/src/modules \ -I$(top_srcdir)/src/modules \
@e_cflags@ @e_cflags@
pkgdir = $(libdir)/enlightenment/modules/$(MODULE) pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
pkg_LTLIBRARIES = module.la pkg_LTLIBRARIES = module.la
module_la_SOURCES = e_mod_main.c \ module_la_SOURCES = e_mod_main.c \
e_mod_main.h e_mod_main.h

2
src/modules/flame/Makefile.am
View File

@ -17,7 +17,7 @@ INCLUDES = -I. \
-I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/lib \
-I$(top_srcdir)/src/modules \ -I$(top_srcdir)/src/modules \
@e_cflags@ @e_cflags@
pkgdir = $(libdir)/enlightenment/modules/$(MODULE) pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
pkg_LTLIBRARIES = module.la pkg_LTLIBRARIES = module.la
module_la_SOURCES = e_mod_main.c \ module_la_SOURCES = e_mod_main.c \
e_mod_main.h e_mod_main.h

2
src/modules/ibar/Makefile.am
View File

@ -17,7 +17,7 @@ INCLUDES = -I. \
-I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/lib \
-I$(top_srcdir)/src/modules \ -I$(top_srcdir)/src/modules \
@e_cflags@ @e_cflags@
pkgdir = $(libdir)/enlightenment/modules/$(MODULE) pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
pkg_LTLIBRARIES = module.la pkg_LTLIBRARIES = module.la
module_la_SOURCES = e_mod_main.c \ module_la_SOURCES = e_mod_main.c \
e_mod_main.h e_mod_main.h

2
src/modules/ibox/Makefile.am
View File

@ -17,7 +17,7 @@ INCLUDES = -I. \
-I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/lib \
-I$(top_srcdir)/src/modules \ -I$(top_srcdir)/src/modules \
@e_cflags@ @e_cflags@
pkgdir = $(libdir)/enlightenment/modules/$(MODULE) pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
pkg_LTLIBRARIES = module.la pkg_LTLIBRARIES = module.la
module_la_SOURCES = e_mod_main.c \ module_la_SOURCES = e_mod_main.c \
e_mod_main.h e_mod_main.h

2
src/modules/pager/Makefile.am
View File

@ -17,7 +17,7 @@ INCLUDES = -I. \
-I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/lib \
-I$(top_srcdir)/src/modules \ -I$(top_srcdir)/src/modules \
@e_cflags@ @e_cflags@
pkgdir = $(libdir)/enlightenment/modules/$(MODULE) pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
pkg_LTLIBRARIES = module.la pkg_LTLIBRARIES = module.la
module_la_SOURCES = e_mod_main.c \ module_la_SOURCES = e_mod_main.c \
e_mod_main.h e_mod_main.h

2
src/modules/snow/Makefile.am
View File

@ -20,7 +20,7 @@ INCLUDES = -I. \
-I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/lib \
-I$(top_srcdir)/src/modules \ -I$(top_srcdir)/src/modules \
@e_cflags@ @e_cflags@
pkgdir = $(libdir)/enlightenment/modules/$(MODULE) pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
pkg_LTLIBRARIES = module.la pkg_LTLIBRARIES = module.la
module_la_SOURCES = e_mod_main.c \ module_la_SOURCES = e_mod_main.c \
e_mod_main.h e_mod_main.h

2
src/modules/temperature/Makefile.am
View File

@ -17,7 +17,7 @@ INCLUDES = -I. \
-I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/lib \
-I$(top_srcdir)/src/modules \ -I$(top_srcdir)/src/modules \
@e_cflags@ @e_cflags@
pkgdir = $(libdir)/enlightenment/modules/$(MODULE) pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
pkg_LTLIBRARIES = module.la pkg_LTLIBRARIES = module.la
module_la_SOURCES = e_mod_main.c \ module_la_SOURCES = e_mod_main.c \
e_mod_main.h e_mod_main.h

2
src/modules/test/Makefile.am
View File

@ -15,7 +15,7 @@ INCLUDES = -I. \
-I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/lib \
-I$(top_srcdir)/src/modules \ -I$(top_srcdir)/src/modules \
@e_cflags@ @e_cflags@
pkgdir = $(libdir)/enlightenment/modules/$(MODULE) pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
pkg_LTLIBRARIES = module.la pkg_LTLIBRARIES = module.la
module_la_SOURCES = e_mod_main.c \ module_la_SOURCES = e_mod_main.c \
e_mod_main.h e_mod_main.h