[gnome-control-center] wacom: Make it easier to copy/paste gsd files
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-control-center] wacom: Make it easier to copy/paste gsd files
- Date: Wed, 25 Jan 2012 19:13:33 +0000 (UTC)
commit 1c9a29f5c0fe27a907aae2b37341d3dd3f156544
Author: Bastien Nocera <hadess hadess net>
Date: Wed Jan 25 19:01:46 2012 +0000
wacom: Make it easier to copy/paste gsd files
panels/wacom/Makefile.am | 6 ++++--
panels/wacom/gsd-enums.h | 7 +++++++
2 files changed, 11 insertions(+), 2 deletions(-)
---
diff --git a/panels/wacom/Makefile.am b/panels/wacom/Makefile.am
index 637b608..660ba90 100644
--- a/panels/wacom/Makefile.am
+++ b/panels/wacom/Makefile.am
@@ -30,7 +30,8 @@ libwacom_properties_la_SOURCES = \
gsd-input-helper.c \
gsd-input-helper.h \
cc-wacom-nav-button.c \
- cc-wacom-nav-button.h
+ cc-wacom-nav-button.h \
+ gsd-enums.h
libwacom_properties_la_LIBADD = $(PANEL_LIBS) $(WACOM_PANEL_LIBS) $(builddir)/calibrator/libwacom-calibrator.la
libwacom_properties_la_LDFLAGS = $(PANEL_LDFLAGS)
@@ -48,7 +49,8 @@ test_wacom_SOURCES = \
gsd-wacom-device.c \
gsd-wacom-device.h \
gsd-input-helper.c \
- gsd-input-helper.h
+ gsd-input-helper.h \
+ gsd-enums.h
test_wacom_CPPFLAGS = $(INCLUDES)
test_wacom_LDADD = $(PANEL_LIBS) $(WACOM_PANEL_LIBS) $(builddir)/calibrator/libwacom-calibrator.la
diff --git a/panels/wacom/gsd-enums.h b/panels/wacom/gsd-enums.h
new file mode 100644
index 0000000..9cfa48f
--- /dev/null
+++ b/panels/wacom/gsd-enums.h
@@ -0,0 +1,7 @@
+/* We copy gsd-wacom-device from gnome-settings-daemon.
+ * It include "gsd-enums.h" because the include directory
+ * is known. As gnome-settings-daemon's pkg-config file
+ * prefixes this, we need a little help to avoid this
+ * one line difference */
+
+#include <gnome-settings-daemon/gsd-enums.h>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]