Updating branch refs/heads/devel
to f3ca15d45cded50e2e3fc3e4217341c3c9c143e3 (commit)
from 439f0c4c2b5128a19e407b575509f42b354c4066 (commit)
commit f3ca15d45cded50e2e3fc3e4217341c3c9c143e3
Author: Nick Schermer <[email protected]>
Date: Mon Jun 1 00:23:35 2009 +0200
Make a noinst library for the custom xfconf bindings.
common/Makefile.am | 27 ++++++++++++++++++++++++---
common/panel-xfconf.c | 2 +-
2 files changed, 25 insertions(+), 4 deletions(-)
diff --git a/common/Makefile.am b/common/Makefile.am
index be8dd04..a4805de 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -1,9 +1,30 @@
# $Id$
-EXTRA_DIST = \
- panel-dbus.h \
- panel-private.h \
+INCLUDES = \
+ -I$(top_srcdir) \
+ -DG_LOG_DOMAIN=\"libpanel-xfconf\" \
+ -DLIBXFCE4PANEL_COMPILATION \
+ $(PLATFORM_CPPFLAGS)
+
+noinst_LTLIBRARIES = \
+ libpanel-xfconf.la
+
+libpanel_xfconf_la_SOURCES = \
panel-xfconf.c \
panel-xfconf.h
+libpanel_xfconf_la_CFLAGS = \
+ $(XFCONF_CFLAGS)
+
+libpanel_xfconf_la_LDFLAGS = \
+ -no-undefined \
+ $(PLATFORM_LDFLAGS)
+
+libpanel_xfconf_la_LIBADD = \
+ $(XFCONF_LIBS)
+
+EXTRA_DIST = \
+ panel-dbus.h \
+ panel-private.h
+
# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
diff --git a/common/panel-xfconf.c b/common/panel-xfconf.c
index 6cb0679..bcf86a3 100644
--- a/common/panel-xfconf.c
+++ b/common/panel-xfconf.c
@@ -22,7 +22,7 @@
#endif
#include <common/panel-xfconf.h>
-#include <libxfce4panel/libxfce4panel.h>
+#include <libxfce4panel/xfce-panel-macros.h>
typedef struct
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
