[Goodies-commits] r5924 - xfce4-sensors-plugin/trunk/lib

[Fabian Nowak]

Author: timystery
Date: 2008-11-02 21:51:42 +0000 (Sun, 02 Nov 2008)
New Revision: 5924

Modified:
   xfce4-sensors-plugin/trunk/lib/Makefile.am
   xfce4-sensors-plugin/trunk/lib/sensors-interface-common.c
   xfce4-sensors-plugin/trunk/lib/sensors-interface.c
Log:
- modified makefile.am and library files by more libraries and gtk.h before other includes
- one more #ifdef have_libnotify


Modified: xfce4-sensors-plugin/trunk/lib/Makefile.am
===================================================================
--- xfce4-sensors-plugin/trunk/lib/Makefile.am	2008-11-02 20:28:21 UTC (rev 5923)
+++ xfce4-sensors-plugin/trunk/lib/Makefile.am	2008-11-02 21:51:42 UTC (rev 5924)
@@ -1,6 +1,6 @@
 # $Id:$
 
-INCLUDES =														  \
+INCLUDES =														  	\
 	-I$(top_srcdir)/include
 
 plugindir = $(libdir)/xfce4/modules
@@ -22,67 +22,75 @@
 #acpi.h
 endif
 
-libxfce4sensors_la_SOURCES =									   \
+libxfce4sensors_la_SOURCES =										\
 	middlelayer.c													\
 	configuration.c													\
-	sensors-interface-common.c						\
-	sensors-interface.c										\
+	sensors-interface-common.c										\
+	sensors-interface.c												\
 	$(SENSORS_SOURCES)												\
 	$(HDDTEMP_SOURCES)												\
 	$(ACPI_SOURCES)
 
 # configuration.h													\
-# sensors-plugin.h
-# types.h																	\
+# sensors-plugin.h													\
+# types.h															\
 # middlelayer.h
 
-libxfce4sensors_la_CFLAGS = \
+libxfce4sensors_la_CFLAGS = 										\
 	@PLATFORM_CFLAGS@												\
 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"							\
-	@LIBSENSORS_CFLAGS@										\
-	@LIBXFCE4PANEL_CFLAGS@
+	@GTK_CFLAGS@													\
+	@GLIB_CFLAGS@													\
+	@LIBXFCEGUI4_CFLAGS@											\
+	@LIBXFCE4UTIL_CFLAGS@											\
+	@LIBXFCE4PANEL_CFLAGS@											\
+	@LIBSENSORS_CFLAGS@	
 
 if HAVE_LIBNOTIFY
 libxfce4sensors_la_CFLAGS += @LIBNOTIFY_CFLAGS@
 endif
 
-# @GTK_CFLAGS@ \
-# @GLIB_CFLAGS@ \
-#	@LIBXFCE4UTIL_CFLAGS@							\
+# @GTK_CFLAGS@ 														\
+# @GLIB_CFLAGS@ 													\
+#	@LIBXFCE4UTIL_CFLAGS@											\
 #	@LIBXFCEGUI4_CFLAGS@
 
-libxfce4sensors_la_LDFLAGS = \
-	-export-dynamic							\
-	-export-symbols-regex "^[^_].*"					\
+libxfce4sensors_la_LDFLAGS = 										\
+	-export-dynamic													\
+	-export-symbols-regex "^[^_].*"									\
 	-version-info $(LIBXFCE4SENSORS_VERINFO)
 
 #	@PLATFORM_LDFLAGS@
 
-#	-export-dynamic \
-#	-avoid-version \
+#	-export-dynamic 												\
+#	-avoid-version 													\
 #	-module
 
-libxfce4sensors_la_LIBADD = \
-	@LIBSENSORS_LDFLAGS@									\
-	@LIBXFCE4PANEL_LIBS@
+libxfce4sensors_la_LIBADD = 										\
+	@GTK_LIBS@														\
+	@GLIB_LIBS@														\
+	@LIBXFCE4UTIL_LIBS@												\
+	@LIBXFCEGUI4_LIBS@												\
+	@LIBXFCE4PANEL_LIBS@											\
+	@LIBSENSORS_LDFLAGS@
 
 if HAVE_LIBNOTIFY
 libxfce4sensors_la_LIBADD += @LIBNOTIFY_LIBS@
 endif
 
-# @GTK_LIBS@ \
-#	@GLIB_LIBS@ \
-#	@LIBXFCE4UTIL_LIBS@								\
+# @GTK_LIBS@ 														\
+#	@GLIB_LIBS@ 													\
+#	@LIBXFCE4UTIL_LIBS@												\
 #	@LIBXFCEGUI4_LIBS@
 
 #@SOLLIBS@
 
 # -fPIC -shared
 
-#	-DG_LOG_DOMAIN=\"xfce4-sensors-plugin\"						 \
+#	-DG_LOG_DOMAIN=\"xfce4-sensors-plugin\"						 	\
 #	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"
 
-EXTRA_DIST =			\
+EXTRA_DIST =														\
 	helpers.c
 
 DISTCLEANFILES =

Modified: xfce4-sensors-plugin/trunk/lib/sensors-interface-common.c
===================================================================
--- xfce4-sensors-plugin/trunk/lib/sensors-interface-common.c	2008-11-02 20:28:21 UTC (rev 5923)
+++ xfce4-sensors-plugin/trunk/lib/sensors-interface-common.c	2008-11-02 21:51:42 UTC (rev 5924)
@@ -23,6 +23,7 @@
 
 /* Xfce includes */
 // #include <libxfce4panel/xfce-panel-enums.h>
+#include <gtk/gtk.h>
 #include <libxfce4panel/xfce-panel-plugin.h>
 
 /* Local/package includes */

Modified: xfce4-sensors-plugin/trunk/lib/sensors-interface.c
===================================================================
--- xfce4-sensors-plugin/trunk/lib/sensors-interface.c	2008-11-02 20:28:21 UTC (rev 5923)
+++ xfce4-sensors-plugin/trunk/lib/sensors-interface.c	2008-11-02 21:51:42 UTC (rev 5924)
@@ -23,7 +23,9 @@
 #endif
 
 /* Global includes */
+#ifdef HAVE_LIBNOTIFY
 #include <libnotify/notify.h>
+#endif
 /* #include <stdlib.h> */
 
 /* Glib/Gtk includes */