[Xfce4-commits] <xfce4-power-manager:master> Fix a few build issues having to do with the linker in particular.

[Jannis Pohlmann]

Updating branch refs/heads/master
         to 4ceb85e5d9a1c8f18a094f462eb94c703ad1581d (commit)
       from 5fab7afbb7bf25f721ef5ac26ae0b9c726b65cb7 (commit)

commit 4ceb85e5d9a1c8f18a094f462eb94c703ad1581d
Author: Jannis Pohlmann <jannis at xfce.org>
Date:   Wed Sep 1 14:12:45 2010 +0200

    Fix a few build issues having to do with the linker in particular.

 configure.ac.in                              |   18 ++++++++++++++++++
 panel-plugins/brightness/Makefile.am         |   12 ++++++++++--
 panel-plugins/brightness/brightness-plugin.c |    1 +
 src/Makefile.am                              |   18 +++++++++++++++---
 4 files changed, 44 insertions(+), 5 deletions(-)

diff --git a/configure.ac.in b/configure.ac.in
index 0c1802e..1cf592c 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -40,6 +40,11 @@ AC_CHECK_HEADERS([errno.h signal.h stddef.h \
                   unistd.h])
 
 # ===================================================== #
+# 		Check for libm	 			#
+# ===================================================== #
+AC_CHECK_LIB([m], [round])
+
+# ===================================================== #
 # 		Check for i18n support 			#
 # ===================================================== #
 
@@ -202,6 +207,19 @@ AM_CONDITIONAL([ENABLE_XML2PO], [test "x$enable_xml2po" = "xyes"])
 #=======================================================#
 XDT_FEATURE_DEBUG
 
+#=======================================================#
+#              Substitute platform flags                #
+#=======================================================#
+AC_MSG_CHECKING([PLATFORM_CPPFLAGS])
+AC_MSG_RESULT([$PLATFORM_CPPFLAGS])
+AC_SUBST([PLATFORM_CPPFLAGS])
+AC_MSG_CHECKING([PLATFORM_CFLAGS])
+AC_MSG_RESULT([$PLATFORM_CFLAGS])
+AC_SUBST([PLATFORM_CFLAGS])
+AC_MSG_CHECKING([PLATFORM_LDFLAGS])
+AC_MSG_RESULT([$PLATFORM_LDFLAGS])
+AC_SUBST([PLATFORM_LDFLAGS])
+
 AC_OUTPUT([
 Makefile
 libdbus/Makefile
diff --git a/panel-plugins/brightness/Makefile.am b/panel-plugins/brightness/Makefile.am
index c849096..11597a8 100644
--- a/panel-plugins/brightness/Makefile.am
+++ b/panel-plugins/brightness/Makefile.am
@@ -14,7 +14,14 @@ xfce4_brightness_plugin_CFLAGS =		\
 	$(LIBXFCE4UTIL_CFLAGS)        		\
 	$(LIBXFCE4UI_CFLAGS)			\
 	$(GTK_CFLAGS)			      	\
-	$(GLIB_CFLAGS)
+	$(GLIB_CFLAGS)				\
+	$(XRANDR_CFLAGS)			\
+	$(PLATFORM_CPPFLAGS)			\
+	$(PLATFORM_CFLAGS)
+
+xfce4_brightness_plugin_LDFLAGS =		\
+	-no-undefined				\
+	$(PLATFORM_LDFLAGS)
 
 xfce4_brightness_plugin_LDADD =			\
 	$(top_builddir)/common/libxfpmcommon.la \
@@ -22,7 +29,8 @@ xfce4_brightness_plugin_LDADD =			\
 	$(LIBXFCE4UI_LIBS)			\
 	$(LIBXFCE4UTIL_LIBS)			\
 	$(GTK_LIBS)   				\
-	$(GLIB_LIBS)
+	$(GLIB_LIBS)				\
+	$(XRANDR_LIBS)
 
 if ENABLE_HAL
 
diff --git a/panel-plugins/brightness/brightness-plugin.c b/panel-plugins/brightness/brightness-plugin.c
index d0ffccd..ec9103e 100644
--- a/panel-plugins/brightness/brightness-plugin.c
+++ b/panel-plugins/brightness/brightness-plugin.c
@@ -29,6 +29,7 @@
 #include <gtk/gtk.h>
 #include <glib.h>
 
+#include <libxfce4panel/libxfce4panel.h>
 #include <libxfce4panel/xfce-panel-plugin.h>
 
 #include "brightness-button.h"
diff --git a/src/Makefile.am b/src/Makefile.am
index 8f6a505..3c42142 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -55,7 +55,13 @@ xfce4_power_manager_CFLAGS =                    \
 	$(XFCONF_CFLAGS)                        \
 	$(LIBNOTIFY_CFLAGS)                     \
 	$(XRANDR_CFLAGS)			\
-	$(DPMS_CFLAGS)                  
+	$(DPMS_CFLAGS)           		\
+	$(PLATFORM_CPPFLAGS)			\
+	$(PLATFORM_CFLAGS)
+
+xfce4_power_manager_LDFLAGS =			\
+	-no-undefined				\
+	$(PLATFORM_LDFLAGS)
 
 xfce4_power_manager_LDADD =                     \
 	$(top_builddir)/common/libxfpmcommon.la \
@@ -82,7 +88,13 @@ xfce4_power_information_CFLAGS =		\
 	-DG_LOG_DOMAIN=\"xfce4-power-information\"\
 	$(GOBJECT_CFLAGS)                       \
 	$(DBUS_GLIB_CFLAGS)                     \
-	$(LIBXFCE4UI_CFLAGS)
+	$(LIBXFCE4UI_CFLAGS)			\
+	$(PLATFORM_CPPFLAGS)			\
+	$(PLATFORM_CFLAGS)
+
+xfce4_power_information_LDFLAGS =		\
+	-no-undefined				\
+	$(PLATFORM_LDFLAGS)
 
 xfce4_power_information_LDADD =			\
 	$(GOBJECT_LIBS)                         \
@@ -164,4 +176,4 @@ EXTRA_DIST =                                    \
 
 DISTCLEANFILES =                                \
         $(BUILT_SOURCES)                        \
-        xfce4-power-manager.desktop
\ No newline at end of file
+        xfce4-power-manager.desktop