aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGustavo Sverzut Barbieri <barbieri@gmail.com>2008-12-08 01:39:33 +0000
committerGustavo Sverzut Barbieri <barbieri@gmail.com>2008-12-08 01:39:33 +0000
commitebcb9f85a745a4ccd0cf441601da6e2900128b64 (patch)
tree63ad1a0da92a9b70674bf88e74e122de39596c1c
parent81c91f034a58d14b854e8529f5163ff63754baf8 (diff)
downloadenlightenment-ebcb9f85a745a4ccd0cf441601da6e2900128b64.tar.gz
enlightenment-ebcb9f85a745a4ccd0cf441601da6e2900128b64.tar.xz
enlightenment-ebcb9f85a745a4ccd0cf441601da6e2900128b64.zip
build infra improvements.
* configure.ac: - require C99 compiler; - disable F77 and CXX checks; - per-binary (program) flags, reduce linkage; - every module can be optionally compiled; * src/bin: - Makefile.am: per-binary libs, reduce linkage; - just add LIBS to LDADD and LIBADD, not LDFLAGS! - e_sys_main.c: rewrite using proper eina, avoid linking with evas. * src/modules: - just add LIBS to LDADD and LIBADD, not LDFLAGS! - every module can be optionally compiled; SVN revision: 38009
-rw-r--r--configure.ac294
-rw-r--r--src/bin/Makefile.am21
-rw-r--r--src/bin/e_sys_main.c20
-rw-r--r--src/modules/Makefile.am250
-rw-r--r--src/modules/battery/Makefile.am2
-rw-r--r--src/modules/mixer/Makefile.am2
-rw-r--r--src/modules/temperature/Makefile.am2
7 files changed, 475 insertions, 116 deletions
diff --git a/configure.ac b/configure.ac
index ec291c12e..bd92d3088 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,10 @@
# get rid of that stupid cache mechanism
rm -f config.cache
+define([AC_LIBTOOL_LANG_CXX_CONFIG], [:])
+define([AC_LIBTOOL_LANG_GCJ_CONFIG], [:])
+define([AC_LIBTOOL_LANG_F77_CONFIG], [:])
+
AC_INIT(enlightenment, 0.16.999.050, enlightenment-devel@lists.sourceforge.net)
AC_PREREQ(2.52)
AC_CONFIG_SRCDIR(configure.ac)
@@ -12,10 +16,8 @@ AM_INIT_AUTOMAKE(1.6 dist-bzip2)
AM_CONFIG_HEADER(config.h)
AC_C_BIGENDIAN
-AC_PROG_CC
-AM_PROG_CC_STDC
+AC_PROG_CC_C99
AM_PROG_CC_C_O
-AC_HEADER_STDC
AC_C_CONST
AM_ENABLE_SHARED
AM_PROG_LIBTOOL
@@ -36,7 +38,7 @@ if test "x$res" = "xno"; then
fnmatch_libs="-lfnmatch"
fi
fi
-
+
AC_SUBST(fnmatch_libs)
have_pam=no
@@ -55,31 +57,7 @@ if test "x$want_pam" != "xno" ; then
fi
fi
-# Setting have_valgrind to "no" seems pointless, but we just need to
-# put something in as the 4th parameter, so configure doesn't abort
-# when valgrind.pc isn't found.
-#have_valgrind="no"
-#PKG_CHECK_MODULES(VALGRIND, valgrind >= 2.4.0, have_valgrind=yes, have_valgrind=no)
-#AC_ARG_ENABLE(valgrind,
-# [ --enable-valgrind enable valgrind support], [
-# if test x"$enableval" = x"yes" ; then
-# AC_MSG_RESULT(yes)
-# have_valgrind="yes"
-# else
-# AC_MSG_RESULT(no)
-# have_valgrind="no"
-# VALGRIND_CFLAGS=""
-# VALGRIND_LIBS=""
-# fi
-# ], [
-# have_valgrind=$have_valgrind
-# ]
-#)
-
-#if test x$have_valgrind = "xyes"; then
-# AC_DEFINE(HAVE_VALGRIND, 1, [Valgrind support])
-#fi
-
+dnl AC_E_CHECK_PKG(VALGRIND, [valgrind >= 2.4.0], [], [:])
AC_SUBST(VALGRIND_CFLAGS)
AC_SUBST(VALGRIND_LIBS)
@@ -190,6 +168,70 @@ if test "[${e_cv_enable_files}]" = yes; then
fi
AC_MSG_RESULT([$e_cv_enable_files])
+# explicit libs for each binary to reduce linkage requirements
+PKG_CHECK_MODULES(E_REMOTE, [
+ ecore
+ ecore-ipc
+ eet >= 1.0.1
+ eina-0
+])
+
+PKG_CHECK_MODULES(E_IMC, [
+ ecore-file
+ eet >= 1.0.1
+ eina-0
+])
+
+PKG_CHECK_MODULES(E_THUMB, [
+ evas
+ ecore
+ ecore-evas
+ edje
+ ecore-file
+ ecore-ipc
+ eet >= 1.0.1
+ efreet
+])
+
+PKG_CHECK_MODULES(E_FM, [
+ ecore
+ ecore-file
+ ecore-ipc
+ eet >= 1.0.1
+ efreet
+ edbus
+ ehal
+ eina-0
+])
+
+PKG_CHECK_MODULES(E_FM_OP, [
+ ecore
+ ecore-file
+ eina-0
+])
+
+PKG_CHECK_MODULES(E_FM_OPEN, [
+ ecore
+ ecore-ipc
+ eet >= 1.0.1
+ eina-0
+])
+
+PKG_CHECK_MODULES(E_SYS, [
+ eina-0
+])
+
+PKG_CHECK_MODULES(E_INIT, [
+ evas
+ ecore
+ ecore-file
+ ecore-evas
+ edje
+ ecore-ipc
+ eet >= 1.0.1
+ eina-0
+])
+
PKG_CHECK_MODULES(E, [
evas
ecore
@@ -209,50 +251,7 @@ PKG_CHECK_MODULES(E, [
])
requirements_e="evas ecore ecore-x ecore-evas ecore-con ecore-ipc ecore-job ecore-file eet edje efreet efreet-mime eina-0 edbus ehal"
-PKG_CHECK_MODULES(ECORE_IMF, [
- ecore-imf
- ecore-imf-evas
-], [
- have_ecore_imf="yes"
- AC_DEFINE(HAVE_ECORE_IMF, 1, [Ecore IMF support])
-], [ have_ecore_imf="no" ]
-)
-
-PKG_CHECK_MODULES(ECORE_TXT, [
- ecore-txt
-], [
- have_temp="yes"
-], [ have_temp="no"])
-
-AM_CONDITIONAL(HAVE_TEMPERATURE, test x$have_temp = "xyes")
-if test x$have_temp = "xyes"; then
- PKG_CHECK_MODULES(TEMPERATURE, [
- ecore
- ecore-file
- ])
-fi
-
-PKG_CHECK_MODULES(BATTERY, [
- ecore
- ecore-file
- ecore-con
-])
-
-PKG_CHECK_MODULES(EXCHANGE,
- [exchange],
- [
- HAVE_EXCHANGE=yes
- AC_SUBST(EXCHANGE_LIBS)
- AC_SUBST(EXCHANGE_CFLAGS)
- ],
- [
- HAVE_EXCHANGE=no
- ])
-AM_CONDITIONAL(HAVE_EXCHANGE, test x$HAVE_EXCHANGE = xyes)
-AC_SUBST(HAVE_EXCHANGE)
-if test x$HAVE_EXCHANGE = xyes; then
- AC_DEFINE_UNQUOTED(HAVE_EXCHANGE, 1, Package exchange found.)
-fi
+AC_E_CHECK_PKG(ECORE_IMF, [ecore-imf ecore-imf-evas], [], [:])
e_libs=$E_LIBS" "$LIBINTL" "$fnmatch_libs" "$ECORE_IMF_LIBS
@@ -305,23 +304,40 @@ AC_SUBST(eet_eet)
AC_DEFINE(E_INTERNAL, 1, "This define can be used to wrap internal E stuff, as config.h isn't exported")
+AM_CONDITIONAL(HAVE_BATTERY, false)
+define([CHECK_MODULE_BATTERY],
+[
+ AC_E_CHECK_PKG(BATTERY, [ecore ecore-file ecore-con],
+ [], [BATTERY=false])
+])
+
+AM_CONDITIONAL(HAVE_TEMPERATURE, false)
+define([CHECK_MODULE_TEMPERATURE],
+[
+ AC_E_CHECK_PKG(ECORE_TXT, [ecore-txt], [], [TEMPERATURE=false])
+ AC_E_CHECK_PKG(TEMPERATURE, [ecore ecore-file], [], [TEMPERATURE=false])
+])
-dnl Check for Alsa
-AC_ARG_ENABLE(alsa, AS_HELP_STRING([--enable-alsa],
- [enable support for alsa(default=autodetect)]),
- [ enable_alsa=$enableval ], [ enable_alsa=default ])
+AM_CONDITIONAL(HAVE_EXCHANGE, false)
+define([CHECK_MODULE_CONF_THEME],
+[
+ AC_E_CHECK_PKG(EXCHANGE, [exchange], [], [:])
+])
AM_CONDITIONAL(HAVE_ALSA, false)
-if test "x$enable_alsa" = "xdefault" || test "x$enable_alsa" = "xyes"; then
- PKG_CHECK_MODULES(ALSA, [alsa >= 1.0.8],
+define([CHECK_MODULE_MIXER],
+[
+if test "x$enable_alsa" = "x" || test "x$enable_alsa" = "xdefault" || test "x$enable_alsa" = "xyes"; then
+ AC_E_CHECK_PKG(ALSA, [alsa >= 1.0.8],
[ SOUND_CFLAGS="$ALSA_CFLAGS -DHAVE_ALSA $SOUND_CFLAGS"
- SOUND_LDFLAGS="$ALSA_LIBS $SOUND_LDFLAGS"
- AM_CONDITIONAL(HAVE_ALSA, true)
- have_alsa=yes ],
- [ if test "x$enable_alsa" = "xyes"; then
- AC_MSG_ERROR([alsa library >= 1.0.8 not found])
- fi
- ])
+ SOUND_LIBS="$ALSA_LIBS $SOUND_LDFLAGS"
+ ],
+ [ if test "x$enable_alsa" = "xyes"; then
+ AC_MSG_ERROR([alsa library >= 1.0.8 not found])
+ else
+ AC_MSG_WARN([alsa library development files not present. no alsa support.])
+ fi
+ ])
else
have_alsa=no
fi
@@ -331,9 +347,70 @@ if test "$have_alsa" = "yes"; then
else
have_alsa=no
fi
+])
AC_SUBST(SOUND_CFLAGS)
-AC_SUBST(SOUND_LDFLAGS)
+AC_SUBST(SOUND_LIBS)
+
+AC_E_OPTIONAL_MODULE([ibar], true)
+AC_E_OPTIONAL_MODULE([ibar], true)
+AC_E_OPTIONAL_MODULE([dropshadow], true)
+AC_E_OPTIONAL_MODULE([clock], true)
+AC_E_OPTIONAL_MODULE([pager], true)
+AC_E_OPTIONAL_MODULE([battery], true, [CHECK_MODULE_BATTERY])
+AC_E_OPTIONAL_MODULE([temperature], true, [CHECK_MODULE_TEMPERATURE])
+AC_E_OPTIONAL_MODULE([cpufreq], true)
+AC_E_OPTIONAL_MODULE([ibox], true)
+AC_E_OPTIONAL_MODULE([start], true)
+AC_E_OPTIONAL_MODULE([exebuf], true)
+AC_E_OPTIONAL_MODULE([winlist], true)
+AC_E_OPTIONAL_MODULE([fileman], true)
+AC_E_OPTIONAL_MODULE([wizard], true)
+AC_E_OPTIONAL_MODULE([conf], true)
+AC_E_OPTIONAL_MODULE([conf_wallpaper], true)
+AC_E_OPTIONAL_MODULE([conf_theme], true, [CHECK_MODULE_CONF_THEME])
+AC_E_OPTIONAL_MODULE([conf_colors], true)
+AC_E_OPTIONAL_MODULE([conf_fonts], true)
+AC_E_OPTIONAL_MODULE([conf_borders], true)
+AC_E_OPTIONAL_MODULE([conf_icon_theme], true)
+AC_E_OPTIONAL_MODULE([conf_mouse_cursor], true)
+AC_E_OPTIONAL_MODULE([conf_transitions], true)
+AC_E_OPTIONAL_MODULE([conf_startup], true)
+AC_E_OPTIONAL_MODULE([conf_intl], true)
+AC_E_OPTIONAL_MODULE([conf_imc], true)
+AC_E_OPTIONAL_MODULE([conf_profiles], true)
+AC_E_OPTIONAL_MODULE([msgbus_lang], true)
+AC_E_OPTIONAL_MODULE([conf_engine], true)
+AC_E_OPTIONAL_MODULE([conf_applications], true)
+AC_E_OPTIONAL_MODULE([conf_desks], true)
+AC_E_OPTIONAL_MODULE([conf_desk], true)
+AC_E_OPTIONAL_MODULE([conf_display], true)
+AC_E_OPTIONAL_MODULE([conf_desklock], true)
+AC_E_OPTIONAL_MODULE([conf_screensaver], true)
+AC_E_OPTIONAL_MODULE([conf_dpms], true)
+AC_E_OPTIONAL_MODULE([conf_shelves], true)
+AC_E_OPTIONAL_MODULE([conf_keybindings], true)
+AC_E_OPTIONAL_MODULE([conf_mousebindings], true)
+AC_E_OPTIONAL_MODULE([conf_mouse], true)
+AC_E_OPTIONAL_MODULE([conf_window_display], true)
+AC_E_OPTIONAL_MODULE([conf_window_focus], true)
+AC_E_OPTIONAL_MODULE([conf_window_remembers], true)
+AC_E_OPTIONAL_MODULE([conf_window_manipulation], true)
+AC_E_OPTIONAL_MODULE([conf_menus], true)
+AC_E_OPTIONAL_MODULE([conf_clientlist], true)
+AC_E_OPTIONAL_MODULE([conf_dialogs], true)
+AC_E_OPTIONAL_MODULE([conf_performance], true)
+AC_E_OPTIONAL_MODULE([conf_winlist], true)
+AC_E_OPTIONAL_MODULE([conf_exebuf], true)
+AC_E_OPTIONAL_MODULE([conf_paths], true)
+AC_E_OPTIONAL_MODULE([conf_mime], true)
+AC_E_OPTIONAL_MODULE([conf_interaction], true)
+AC_E_OPTIONAL_MODULE([conf_scale], true)
+AC_E_OPTIONAL_MODULE([gadman], true)
+AC_E_OPTIONAL_MODULE([mixer], true, [CHECK_MODULE_MIXER])
+AC_E_OPTIONAL_MODULE([connman], true)
+AC_E_OPTIONAL_MODULE([illume], true)
+AC_E_OPTIONAL_MODULE([syscon], true)
AC_OUTPUT([
Makefile
@@ -482,3 +559,46 @@ config/netbook/Makefile
config/illume/Makefile
po/Makefile.in
])
+
+# report
+txt_strip() {
+ echo "[$]@" | sed -e 's/^[[ \t]]*\([[^ \t]]*\)[[ \t]]*$/\1/g'
+}
+
+MODS=""
+for mod in $OPTIONAL_MODULES; do
+ MODS="$MODS ${COLOR_HGREEN}+$mod${COLOR_END}"
+done
+MODS=$(txt_strip $MODS)
+
+UNUSED_MODS=""
+for mod in $UNUSED_OPTIONAL_MODULES; do
+ UNUSED_MODS="$UNUSED_MODS ${COLOR_HRED}-$mod${COLOR_END}"
+done
+UNUSED_MODS=$(txt_strip $UNUSED_MODS)
+
+cat << SUMMARY_EOF
+
+Summary:
+ * project.........: $PACKAGE $VERSION
+ * prefix..........: $(txt_strip $prefix)
+ * CFLAGS..........: $(txt_strip $CFLAGS)
+ * LDFLAGS.........: $(txt_strip $LDFLAGS)
+
+SUMMARY_EOF
+
+if test "x$MODS" != "x"; then
+ echo -e " * enabled modules.: $MODS"
+fi
+
+if test "x$UNUSED_MODS" != "x"; then
+ echo -e " * disabled modules: $UNUSED_MODS"
+fi
+
+cat << HINT_EOF
+
+now type:
+
+ make all install
+
+HINT_EOF
diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index faef19223..d8e17582f 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -307,14 +307,15 @@ enlightenment_SOURCES = \
e_main.c \
$(enlightenment_src)
-enlightenment_LDFLAGS = -export-dynamic @e_libs@ @x_libs@ @dlopen_libs@ @cf_libs@ @VALGRIND_LIBS@
+enlightenment_LDFLAGS = -export-dynamic
+enlightenment_LDADD = @e_libs@ @x_libs@ @dlopen_libs@ @cf_libs@ @VALGRIND_LIBS@
enlightenment_remote_SOURCES = \
e.h \
e_ipc_codec.c \
e_remote_main.c
-enlightenment_remote_LDFLAGS = @e_libs@
+enlightenment_remote_LDADD = @E_REMOTE_LIBS@
enlightenment_imc_SOURCES = \
e.h \
@@ -323,19 +324,19 @@ e_config_data.c \
e_imc_main.c
# $(enlightenment_src)
-enlightenment_imc_LDFLAGS = @e_libs@ @dlopen_libs@
+enlightenment_imc_LDADD = @E_IMC_LIBS@
enlightenment_start_SOURCES = \
e_start_main.c
-enlightenment_start_LDFLAGS = @dlopen_libs@
+enlightenment_start_LDADD = @dlopen_libs@
enlightenment_thumb_SOURCES = \
e_thumb_main.c \
e_user.c \
e_sha1.c
-enlightenment_thumb_LDFLAGS = @e_libs@
+enlightenment_thumb_LDADD = @E_THUMB_LIBS@
enlightenment_fm_SOURCES = \
e_fm_main.c \
@@ -343,32 +344,32 @@ e_user.c \
e_sha1.c \
e_prefix.c
-enlightenment_fm_LDFLAGS = @e_libs@ @dlopen_libs@
+enlightenment_fm_LDADD = @E_FM_LIBS@
enlightenment_fm_CFLAGS = $(INCLUDES)
enlightenment_fm_op_SOURCES = \
e_fm_op.c
-enlightenment_fm_op_LDFLAGS = @e_libs@
+enlightenment_fm_op_LDADD = @E_FM_OP_LIBS@
enlightenment_fm_op_CFLAGS = $(INCLUDES)
enlightenment_fm_open_SOURCES = \
e_fm_open.c \
e_ipc_codec.c
-enlightenment_fm_open_LDFLAGS = @e_libs@
+enlightenment_fm_open_LDADD = @E_FM_OPEN_LIBS@
enlightenment_fm_open_CFLAGS = $(INCLUDES)
enlightenment_sys_SOURCES = \
e_sys_main.c
-enlightenment_sys_LDFLAGS = @e_libs@
+enlightenment_sys_LDADD = @E_SYS_LIBS@
enlightenment_init_SOURCES = \
e_init_main.c \
e_xinerama.c
-enlightenment_init_LDFLAGS = @e_libs@
+enlightenment_init_LDADD = @E_INIT_LIBS@
setuid_root_mode = a=rx,u+xs
install-exec-hook:
diff --git a/src/bin/e_sys_main.c b/src/bin/e_sys_main.c
index 6ecbd1450..f195ec3b8 100644
--- a/src/bin/e_sys_main.c
+++ b/src/bin/e_sys_main.c
@@ -15,7 +15,7 @@
#ifdef HAVE_ALLOCA_H
#include <alloca.h>
#endif
-#include <Evas.h>
+#include <Eina.h>
/* local subsystem functions */
static int auth_action_ok(char *a, uid_t uid, gid_t gid, gid_t *gl, int gn, gid_t egid);
@@ -23,7 +23,7 @@ static int auth_etc_enlightenment_sysactions(char *a, char *u, char **g);
static char *get_word(char *s, char *d);
/* local subsystem globals */
-Evas_Hash *actions = NULL;
+static Eina_Hash *actions;
/* externally accessible functions */
int
@@ -78,7 +78,8 @@ main(int argc, char **argv)
exit(7);
}
- evas_init();
+ eina_init();
+ actions = eina_hash_string_superfast_new(NULL);
if (!auth_action_ok(action, uid, gid, gl, gn, egid))
{
@@ -87,15 +88,16 @@ main(int argc, char **argv)
}
/* we can add more levels of auth here */
- cmd = evas_hash_find(actions, action);
+ cmd = eina_hash_find(actions, action);
if (!cmd)
{
printf("ERROR: UNDEFINED ACTION: %s\n", action);
exit(20);
}
if (!test) return system(cmd);
-
- evas_shutdown();
+
+ eina_hash_free(actions);
+ eina_shutdown();
return 0;
}
@@ -217,13 +219,13 @@ auth_etc_enlightenment_sysactions(char *a, char *u, char **g)
else if (!strcmp(id, "action:"))
{
while ((*pp) && (isspace(*pp))) pp++;
- s = evas_hash_find(actions, ugname);
+ s = eina_hash_find(actions, ugname);
if (s)
{
- actions = evas_hash_del(actions, ugname, s);
+ eina_hash_del(actions, ugname, s);
free(s);
}
- actions = evas_hash_add(actions, ugname, strdup(pp));
+ eina_hash_add(actions, ugname, strdup(pp));
continue;
}
else if (id[0] == 0)
diff --git a/src/modules/Makefile.am b/src/modules/Makefile.am
index d4c1b6c3e..67fe0e47b 100644
--- a/src/modules/Makefile.am
+++ b/src/modules/Makefile.am
@@ -1,10 +1,249 @@
MAINTAINERCLEANFILES = Makefile.in
-SUBDIRS = \
+
+SUBDIRS =
+
+if USE_MODULE_IBAR
+SUBDIRS += ibar
+endif
+
+if USE_MODULE_DROPSHADOW
+SUBDIRS += dropshadow
+endif
+
+if USE_MODULE_CLOCK
+SUBDIRS += clock
+endif
+
+if USE_MODULE_PAGER
+SUBDIRS += pager
+endif
+
+if USE_MODULE_BATTERY
+SUBDIRS += battery
+endif
+
+if USE_MODULE_TEMPERATURE
+SUBDIRS += temperature
+endif
+
+if USE_MODULE_CPUFREQ
+SUBDIRS += cpufreq
+endif
+
+if USE_MODULE_IBOX
+SUBDIRS += ibox
+endif
+
+if USE_MODULE_START
+SUBDIRS += start
+endif
+
+if USE_MODULE_EXEBUF
+SUBDIRS += exebuf
+endif
+
+if USE_MODULE_WINLIST
+SUBDIRS += winlist
+endif
+
+if USE_MODULE_FILEMAN
+SUBDIRS += fileman
+endif
+
+if USE_MODULE_WIZARD
+SUBDIRS += wizard
+endif
+
+if USE_MODULE_CONF
+SUBDIRS += conf
+endif
+
+if USE_MODULE_CONF_WALLPAPER
+SUBDIRS += conf_wallpaper
+endif
+
+if USE_MODULE_CONF_THEME
+SUBDIRS += conf_theme
+endif
+
+if USE_MODULE_CONF_COLORS
+SUBDIRS += conf_colors
+endif
+
+if USE_MODULE_CONF_FONTS
+SUBDIRS += conf_fonts
+endif
+
+if USE_MODULE_CONF_BORDERS
+SUBDIRS += conf_borders
+endif
+
+if USE_MODULE_CONF_ICON_THEME
+SUBDIRS += conf_icon_theme
+endif
+
+if USE_MODULE_CONF_MOUSE_CURSOR
+SUBDIRS += conf_mouse_cursor
+endif
+
+if USE_MODULE_CONF_TRANSITIONS
+SUBDIRS += conf_transitions
+endif
+
+if USE_MODULE_CONF_STARTUP
+SUBDIRS += conf_startup
+endif
+
+if USE_MODULE_CONF_INTL
+SUBDIRS += conf_intl
+endif
+
+if USE_MODULE_CONF_IMC
+SUBDIRS += conf_imc
+endif
+
+if USE_MODULE_CONF_PROFILES
+SUBDIRS += conf_profiles
+endif
+
+if USE_MODULE_MSGBUS_LANG
+SUBDIRS += msgbus_lang
+endif
+
+if USE_MODULE_CONF_ENGINE
+SUBDIRS += conf_engine
+endif
+
+if USE_MODULE_CONF_APPLICATIONS
+SUBDIRS += conf_applications
+endif
+
+if USE_MODULE_CONF_DESKS
+SUBDIRS += conf_desks
+endif
+
+if USE_MODULE_CONF_DESK
+SUBDIRS += conf_desk
+endif
+
+if USE_MODULE_CONF_DISPLAY
+SUBDIRS += conf_display
+endif
+
+if USE_MODULE_CONF_DESKLOCK
+SUBDIRS += conf_desklock
+endif
+
+if USE_MODULE_CONF_SCREENSAVER
+SUBDIRS += conf_screensaver
+endif
+
+if USE_MODULE_CONF_DPMS
+SUBDIRS += conf_dpms
+endif
+
+if USE_MODULE_CONF_SHELVES
+SUBDIRS += conf_shelves
+endif
+
+if USE_MODULE_CONF_KEYBINDINGS
+SUBDIRS += conf_keybindings
+endif
+
+if USE_MODULE_CONF_MOUSEBINDINGS
+SUBDIRS += conf_mousebindings
+endif
+
+if USE_MODULE_CONF_MOUSE
+SUBDIRS += conf_mouse
+endif
+
+if USE_MODULE_CONF_WINDOW_DISPLAY
+SUBDIRS += conf_window_display
+endif
+
+if USE_MODULE_CONF_WINDOW_FOCUS
+SUBDIRS += conf_window_focus
+endif
+
+if USE_MODULE_CONF_WINDOW_REMEMBERS
+SUBDIRS += conf_window_remembers
+endif
+
+if USE_MODULE_CONF_WINDOW_MANIPULATION
+SUBDIRS += conf_window_manipulation
+endif
+
+if USE_MODULE_CONF_MENUS
+SUBDIRS += conf_menus
+endif
+
+if USE_MODULE_CONF_CLIENTLIST
+SUBDIRS += conf_clientlist
+endif
+
+if USE_MODULE_CONF_DIALOGS
+SUBDIRS += conf_dialogs
+endif
+
+if USE_MODULE_CONF_PERFORMANCE
+SUBDIRS += conf_performance
+endif
+
+if USE_MODULE_CONF_WINLIST
+SUBDIRS += conf_winlist
+endif
+
+if USE_MODULE_CONF_EXEBUF
+SUBDIRS += conf_exebuf
+endif
+
+if USE_MODULE_CONF_PATHS
+SUBDIRS += conf_paths
+endif
+
+if USE_MODULE_CONF_MIME
+SUBDIRS += conf_mime
+endif
+
+if USE_MODULE_CONF_INTERACTION
+SUBDIRS += conf_interaction
+endif
+
+if USE_MODULE_CONF_SCALE
+SUBDIRS += conf_scale
+endif
+
+if USE_MODULE_GADMAN
+SUBDIRS += gadman
+endif
+
+if USE_MODULE_MIXER
+SUBDIRS += mixer
+endif
+
+if USE_MODULE_CONNMAN
+SUBDIRS += connman
+endif
+
+if USE_MODULE_ILLUME
+SUBDIRS += illume
+endif
+
+if USE_MODULE_SYSCON
+SUBDIRS += syscon
+endif
+
+
+
+
+DIST_SUBDIRS = \
ibar \
dropshadow \
clock \
pager \
battery \
+temperature \
cpufreq \
ibox \
start \
@@ -24,8 +263,8 @@ conf_transitions \
conf_startup \
conf_intl \
conf_imc \
-msgbus_lang \
conf_profiles \
+msgbus_lang \
conf_engine \
conf_applications \
conf_desks \
@@ -40,6 +279,7 @@ conf_mousebindings \
conf_mouse \
conf_window_display \
conf_window_focus \
+conf_window_remembers \
conf_window_manipulation \
conf_menus \
conf_clientlist \
@@ -50,14 +290,10 @@ conf_exebuf \
conf_paths \
conf_mime \
conf_interaction \
+conf_scale \
gadman \
mixer \
-conf_window_remembers \
-conf_scale \
connman \
illume \
syscon
-if HAVE_TEMPERATURE
-SUBDIRS += temperature
-endif
diff --git a/src/modules/battery/Makefile.am b/src/modules/battery/Makefile.am
index fff080c0d..a29f2ee0d 100644
--- a/src/modules/battery/Makefile.am
+++ b/src/modules/battery/Makefile.am
@@ -30,7 +30,7 @@ batgetdir = $(pkgdir)
batget_PROGRAMS = batget
batget_SOURCES = batget.c
-batget_LDFLAGS = @BATTERY_LIBS@
+batget_LDADD = @BATTERY_LIBS@
uninstall:
diff --git a/src/modules/mixer/Makefile.am b/src/modules/mixer/Makefile.am
index cb550e7ae..31651e888 100644
--- a/src/modules/mixer/Makefile.am
+++ b/src/modules/mixer/Makefile.am
@@ -31,7 +31,7 @@ else
module_la_SOURCES += sys_dummy.c
endif
-module_la_LIBADD = @SOUND_LDFLAGS@ @e_libs@ @dlopen_libs@
+module_la_LIBADD = @SOUND_LIBS@ @e_libs@ @dlopen_libs@
module_la_LDFLAGS = -module -avoid-version
module_la_DEPENDENCIES = $(top_builddir)/config.h
diff --git a/src/modules/temperature/Makefile.am b/src/modules/temperature/Makefile.am
index 4cb65fa4a..494fe9c31 100644
--- a/src/modules/temperature/Makefile.am
+++ b/src/modules/temperature/Makefile.am
@@ -29,7 +29,7 @@ tempgetdir = $(pkgdir)
tempget_PROGRAMS = tempget
tempget_SOURCES = tempget.c
-tempget_LDFLAGS = @TEMPERATURE_LIBS@
+tempget_LDADD = @TEMPERATURE_LIBS@
uninstall:
rm -rf $(DESTDIR)$(libdir)/enlightenment/modules/$(MODULE)