[Xfce4-commits] <xfce4-sensors-plugin:master> remove libxfce4util from the configuration as it is handled by ui or panel anyway

[Fabian]

Updating branch refs/heads/master
         to 8c058f5c4f28a33ee6c76aefec34f59ac1c5a619 (commit)
       from 6df0bc03dfdad6cbb096958d6fad132da80d03bd (commit)

commit 8c058f5c4f28a33ee6c76aefec34f59ac1c5a619
Author: Fabian <timystery at arcor.de>
Date:   Mon May 2 22:31:18 2011 +0200

    remove libxfce4util from the configuration as it is handled by ui or panel anyway

 configure.in.in |    5 +----
 lib/Makefile.am |   34 +---------------------------------
 src/Makefile.am |    2 --
 3 files changed, 2 insertions(+), 39 deletions(-)

diff --git a/configure.in.in b/configure.in.in
index a87bcdb..3bd6121 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -249,9 +249,6 @@ AC_SUBST([NVIDIA_LIBS])
 fi
 
 
-
-
-
 AM_CONDITIONAL([HAVE_ACPI], [test x$enable_procacpi = x"yes"])
 AM_CONDITIONAL([HAVE_SYSFS_ACPI], [test x$enable_sysfsacpi = x"yes"])
 AM_CONDITIONAL([HAVE_NVIDIA], [test x$enable_xnvctrl = x"yes"])
@@ -345,7 +342,7 @@ XDT_CHECK_OPTIONAL_PACKAGE([LIBNOTIFY],
 dnl **************************************
 dnl *** Check for Xfce packages ***
 dnl **************************************
-XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.4.0])
+dnl XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.4.0])
 XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.6.0])
 
 dnl configure the panel plugin
diff --git a/lib/Makefile.am b/lib/Makefile.am
index aec2224..25febc7 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,5 +1,3 @@
-# $Id$
-
 INCLUDES =														  	\
 	-I$(top_srcdir)/include
 
@@ -38,16 +36,10 @@ libxfce4sensors_la_SOURCES =										\
 	$(ACPI_SOURCES) \
 	$(NVIDIA_SOURCES)
 
-# configuration.h													\
-# sensors-plugin.h													\
-# types.h															\
-# middlelayer.h
-
 libxfce4sensors_la_CFLAGS = 										\
 	@PLATFORM_CFLAGS@												\
 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"							\
 	@LIBXFCE4UI_CFLAGS@											\
-	@LIBXFCE4UTIL_CFLAGS@											\
 	@LIBXFCE4PANEL_CFLAGS@										\
 	@LIBSENSORS_CFLAGS@
 
@@ -59,11 +51,6 @@ if HAVE_LIBNOTIFY
 libxfce4sensors_la_CFLAGS += @LIBNOTIFY_CFLAGS@
 endif
 
-# @GTK_CFLAGS@ 														
-# @GLIB_CFLAGS@ 													
-#	@LIBXFCE4UTIL_CFLAGS@											
-#	@LIBXFCEGUI4_CFLAGS@
-
 libxfce4sensors_la_LDFLAGS = 										\
 	-export-dynamic													\
 	-export-symbols-regex "^[^_].*"									\
@@ -71,20 +58,12 @@ libxfce4sensors_la_LDFLAGS = 										\
 
 #	@PLATFORM_LDFLAGS@
 
-#	-export-dynamic 												\
-#	-avoid-version 													\
-#	-module
-
 libxfce4sensors_la_LIBADD = 										\
-		@LIBXFCE4UTIL_LIBS@												\
-	@LIBXFCE4UI_LIBS@												\
+	@LIBXFCE4UI_LIBS@											\
 	@LIBXFCE4PANEL_LIBS@											\
 	@LIBSENSORS_LDFLAGS@											\
 	@LIBM@
 
-#@GTK_LIBS@														
-#@GLIB_LIBS@														
-
 if HAVE_NVIDIA
 libxfce4sensors_la_LIBADD += @NVIDIA_LIBS@
 endif
@@ -93,17 +72,6 @@ if HAVE_LIBNOTIFY
 libxfce4sensors_la_LIBADD += @LIBNOTIFY_LIBS@
 endif
 
-# @GTK_LIBS@ 														\
-#	@GLIB_LIBS@ 													\
-#	@LIBXFCEGUI4_LIBS@
-
-#@SOLLIBS@
-
-# -fPIC -shared
-
-#	-DG_LOG_DOMAIN=\"xfce4-sensors-plugin\"						 	\
-#	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"
-
 EXTRA_DIST =														\
 	helpers.c
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 1ed0c44..e259fe1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -26,7 +26,6 @@ xfce4_sensors_CFLAGS = \
 	@PLATFORM_CFLAGS@ \
 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
 	@LIBSENSORS_CFLAGS@	\
-	@LIBXFCE4UTIL_CFLAGS@ \
 	@LIBXFCE4UI_CFLAGS@ \
 	@LIBXFCE4PANEL_CFLAGS@
 
@@ -43,7 +42,6 @@ xfce4_sensors_LDADD = \
 	$(top_builddir)/lib/libxfce4sensors.la \
 	@LIBSENSORS_LDFLAGS@ \
 	@LIBXFCE4UI_LIBS@	\
-	@LIBXFCE4UTIL_LIBS@	\
 	@LIBM@
 
 # @GTK_LIBS@ \