Re-check local modules so refresh them when linking into lxpanel binary
authorAndriy Grytsenko <andrej@rep.kiev.ua>
Mon, 15 Jun 2015 11:53:24 +0000 (14:53 +0300)
committerAndriy Grytsenko <andrej@rep.kiev.ua>
Mon, 15 Jun 2015 11:53:24 +0000 (14:53 +0300)
plugins/thermal/thermal.c
src/Makefile.am

index 27204fb..81eb193 100644 (file)
@@ -428,6 +428,7 @@ remove_all_sensors(thermal *th)
 static void
 check_sensors( thermal *th )
 {
+    // FIXME: scan in opposite order
     find_sensors(th, PROC_THERMAL_DIRECTORY, NULL, proc_get_temperature, proc_get_critical);
     find_sensors(th, SYSFS_THERMAL_DIRECTORY, SYSFS_THERMAL_SUBDIR_PREFIX, sysfs_get_temperature, sysfs_get_critical);
     if (th->numsensors == 0)
@@ -563,9 +564,9 @@ static GtkWidget *config(LXPanel *panel, GtkWidget *p)
             _("Normal color"), &th->str_cl_normal, CONF_TYPE_STR,
             _("Warning1 color"), &th->str_cl_warning1, CONF_TYPE_STR,
             _("Warning2 color"), &th->str_cl_warning2, CONF_TYPE_STR,
-            _("Automatic sensor location"), &th->auto_sensor, CONF_TYPE_BOOL,
-            _("Sensor"), &th->sensor, CONF_TYPE_STR,
-            _("Automatic temperature levels"), &th->not_custom_levels, CONF_TYPE_BOOL,
+            _("Automatic sensor location"), &th->auto_sensor, CONF_TYPE_BOOL, // FIXME: if off, disable next one
+            _("Sensor"), &th->sensor, CONF_TYPE_STR, // FIXME: create a list to select instead
+            _("Automatic temperature levels"), &th->not_custom_levels, CONF_TYPE_BOOL, // FIXME: if off, disable two below
             _("Warning1 temperature"), &th->warning1, CONF_TYPE_INT,
             _("Warning2 temperature"), &th->warning2, CONF_TYPE_INT,
             NULL);
index 3ee0a94..3f6a5c9 100644 (file)
@@ -60,7 +60,6 @@ if BUILD_PLUGIN_LOADER
 DYNAMIC_FLAGS = -export-dynamic
 endif
 lxpanel_LDFLAGS = $(DYNAMIC_FLAGS)
-lxpanel_DEPENDENCIES_EXTRA = $(BUILTIN_PLUGINS)
 
 lxpanel_LDADD = \
                liblxpanel.la \
@@ -80,5 +79,8 @@ EXTRA_DIST = \
        gtk-compat.h \
        private.h
 
-$(top_builddir)/plugins/libbuiltin_plugins.a: $(lxpanel_include_HEADERS)
-       cd $(top_builddir)/plugins && $(MAKE) libbuiltin_plugins.a
+$(top_builddir)/plugins/libbuiltin_plugins.a: $(lxpanel_include_HEADERS) builtin-plugins-hook
+
+# re-check local modules so it is refreshed for lxpanel binary
+builtin-plugins-hook:
+       @cd $(top_builddir)/plugins && $(MAKE) libbuiltin_plugins.a