[gnome-settings-daemon] wacom: Don't clash with a potential libwacom
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-settings-daemon] wacom: Don't clash with a potential libwacom
- Date: Fri, 9 Dec 2011 00:45:39 +0000 (UTC)
commit 68e3eb16206a6294eb2b5352b708737fc28293a5
Author: Bastien Nocera <hadess hadess net>
Date: Tue Dec 6 11:23:43 2011 +0000
wacom: Don't clash with a potential libwacom
Did I say "potential"?
http://cgit.freedesktop.org/~whot/libwacom/
plugins/wacom/Makefile.am | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/plugins/wacom/Makefile.am b/plugins/wacom/Makefile.am
index 60f62e3..6ead3fa 100644
--- a/plugins/wacom/Makefile.am
+++ b/plugins/wacom/Makefile.am
@@ -1,8 +1,8 @@
plugin_name = wacom
-plugin_LTLIBRARIES = libwacom.la
+plugin_LTLIBRARIES = libgsdwacom.la
-libwacom_la_SOURCES = \
+libgsdwacom_la_SOURCES = \
gsd-wacom-plugin.h \
gsd-wacom-plugin.c \
gsd-wacom-manager.h \
@@ -10,7 +10,7 @@ libwacom_la_SOURCES = \
gsd-wacom-device.c \
gsd-wacom-device.h
-libwacom_la_CPPFLAGS = \
+libgsdwacom_la_CPPFLAGS = \
-I$(top_srcdir)/gnome-settings-daemon \
-I$(top_srcdir)/plugins/common/ \
-I$(top_srcdir)/data/ \
@@ -18,15 +18,15 @@ libwacom_la_CPPFLAGS = \
-DLIBEXECDIR=\""$(libexecdir)"\" \
$(AM_CPPFLAGS)
-libwacom_la_CFLAGS = \
+libgsdwacom_la_CFLAGS = \
$(PLUGIN_CFLAGS) \
$(SETTINGS_PLUGIN_CFLAGS) \
$(AM_CFLAGS)
-libwacom_la_LDFLAGS = \
+libgsdwacom_la_LDFLAGS = \
$(GSD_PLUGIN_LDFLAGS)
-libwacom_la_LIBADD = \
+libgsdwacom_la_LIBADD = \
$(top_builddir)/plugins/common/libcommon.la \
$(SETTINGS_PLUGIN_LIBS) \
$(XINPUT_LIBS)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]