GNOME.org
 

gpointing-device-settings r100 - in trunk: . modules modules/common modules/gnome-settings-daemon-plugins

Author: hiikezoe
Date: Tue Mar  3 03:36:43 2009
New Revision: 100
URL: http://svn.gnome.org/viewvc/gpointing-device-settings?rev=100&view=rev

Log:
sort in modules directory.

Added:
   trunk/modules/common/
   trunk/modules/common/Makefile.am
   trunk/modules/common/gpds-touchpad-definitions.h
      - copied, changed from r99, /trunk/modules/gpds-touchpad-definitions.h
   trunk/modules/common/gpds-touchpad-xinput.c
      - copied, changed from r99, /trunk/modules/gpds-touchpad-xinput.c
   trunk/modules/common/gpds-touchpad-xinput.h
      - copied, changed from r99, /trunk/modules/gpds-touchpad-xinput.h
   trunk/modules/common/gpds-trackpoint-definitions.h
      - copied, changed from r99, /trunk/modules/gpds-trackpoint-definitions.h
   trunk/modules/common/gpds-trackpoint-xinput.c
      - copied, changed from r99, /trunk/modules/gpds-trackpoint-xinput.c
   trunk/modules/common/gpds-trackpoint-xinput.h
      - copied, changed from r99, /trunk/modules/gpds-trackpoint-xinput.h
   trunk/modules/gnome-settings-daemon-plugins/
   trunk/modules/gnome-settings-daemon-plugins/Makefile.am
      - copied, changed from r99, /trunk/modules/Makefile.am
   trunk/modules/gnome-settings-daemon-plugins/gnome-settings-plugin.h
      - copied, changed from r99, /trunk/modules/gnome-settings-plugin.h
   trunk/modules/gnome-settings-daemon-plugins/gsd-touchpad-manager.c
      - copied, changed from r99, /trunk/modules/gsd-touchpad-manager.c
   trunk/modules/gnome-settings-daemon-plugins/gsd-touchpad-manager.h
      - copied, changed from r99, /trunk/modules/gsd-touchpad-manager.h
   trunk/modules/gnome-settings-daemon-plugins/gsd-touchpad-plugin.c
      - copied, changed from r99, /trunk/modules/gsd-touchpad-plugin.c
   trunk/modules/gnome-settings-daemon-plugins/gsd-trackpoint-manager.c
      - copied, changed from r99, /trunk/modules/gsd-trackpoint-manager.c
   trunk/modules/gnome-settings-daemon-plugins/gsd-trackpoint-manager.h
      - copied, changed from r99, /trunk/modules/gsd-trackpoint-manager.h
   trunk/modules/gnome-settings-daemon-plugins/gsd-trackpoint-plugin.c
      - copied, changed from r99, /trunk/modules/gsd-trackpoint-plugin.c
   trunk/modules/gnome-settings-daemon-plugins/touchpad.gnome-settings-plugin.in
      - copied, changed from r99, /trunk/modules/touchpad.gnome-settings-plugin.in
   trunk/modules/gnome-settings-daemon-plugins/trackpoint.gnome-settings-plugin.in
      - copied, changed from r99, /trunk/modules/trackpoint.gnome-settings-plugin.in
Removed:
   trunk/modules/gnome-settings-plugin.h
   trunk/modules/gpds-touchpad-definitions.h
   trunk/modules/gpds-touchpad-xinput.c
   trunk/modules/gpds-touchpad-xinput.h
   trunk/modules/gpds-trackpoint-definitions.h
   trunk/modules/gpds-trackpoint-xinput.c
   trunk/modules/gpds-trackpoint-xinput.h
   trunk/modules/gsd-touchpad-manager.c
   trunk/modules/gsd-touchpad-manager.h
   trunk/modules/gsd-touchpad-plugin.c
   trunk/modules/gsd-trackpoint-manager.c
   trunk/modules/gsd-trackpoint-manager.h
   trunk/modules/gsd-trackpoint-plugin.c
   trunk/modules/touchpad.gnome-settings-plugin.in
   trunk/modules/trackpoint.gnome-settings-plugin.in
Modified:
   trunk/.gitignore
   trunk/configure.ac
   trunk/modules/Makefile.am

Modified: trunk/.gitignore
==============================================================================
--- trunk/.gitignore	(original)
+++ trunk/.gitignore	Tue Mar  3 03:36:43 2009
@@ -33,5 +33,5 @@
 po/stamp-it
 po/.intltool-merge-cache
 src/gpointing-device-settings
-modules/touchpad.gnome-settings-plugin
-modules/trackpoint.gnome-settings-plugin
+modules/gnome-settings-daemon-plugins/touchpad.gnome-settings-plugin
+modules/gnome-settings-daemon-plugins/trackpoint.gnome-settings-plugin

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Tue Mar  3 03:36:43 2009
@@ -153,6 +153,8 @@
 Makefile
 src/Makefile
 modules/Makefile
+modules/common/Makefile
+modules/gnome-settings-daemon-plugins/Makefile
 data/Makefile
 data/trackpoint.ui
 data/touchpad.ui

Modified: trunk/modules/Makefile.am
==============================================================================
--- trunk/modules/Makefile.am	(original)
+++ trunk/modules/Makefile.am	Tue Mar  3 03:36:43 2009
@@ -1,9 +1,10 @@
- GSD_INTLTOOL_PLUGIN_RULE@
+SUBDIRS = common gnome-settings-daemon-plugins
 
-INCLUDES = 			\
-	 -I$(top_builddir)	\
-	 -I$(top_srcdir)	\
-	 -I$(top_srcdir)/src
+INCLUDES = 			        \
+	 -I$(top_builddir)	        \
+	 -I$(top_srcdir)	        \
+	 -I$(top_srcdir)/src            \
+	 -I$(top_srcdir)/modules/common
 
 AM_CFLAGS =			\
 	$(GPDS_CFLAGS)		\
@@ -25,61 +26,12 @@
 	$(GCONF2_LIBS)			\
 	$(GNOME_SETTINGS_DAEMON_LIBS)
 
-trackpoint_common_SOURCES =             \
-        gpds-trackpoint-xinput.c        \
-        gpds-trackpoint-xinput.h        \
-	gpds-trackpoint-definitions.h
-
 trackpoint_la_SOURCES = 		\
-	gpds-trackpoint-ui.c		\
-        $(trackpoint_common_SOURCES)
-
-touchpad_common_SOURCES =               \
-        gpds-touchpad-xinput.c          \
-        gpds-touchpad-xinput.h          \
-	gpds-touchpad-definitions.h
-        
-touchpad_la_SOURCES = 			\
-	gpds-touchpad-ui.c		\
-        $(touchpad_common_SOURCES)
+	gpds-trackpoint-ui.c
 
-# plugins for gnome-settings-daemon
-gsd_plugin_LTLIBRARIES =	\
-	libtrackpoint.la	\
-	libtouchpad.la
-
-gsd_plugin_CFLAGS =					\
-	$(AM_CFLAGS)					\
-	$(GNOME_SETTINGS_DAEMON_CFLAGS)			\
-	-DGNOME_SETTINGS_LOCALEDIR=\""$(localedir)"\"
-
-libtrackpoint_la_CFLAGS = $(gsd_plugin_CFLAGS)
-libtrackpoint_la_SOURCES = 		\
-	gsd-trackpoint-plugin.c		\
-	gsd-trackpoint-manager.h	\
-	gsd-trackpoint-manager.c        \
-        $(trackpoint_common_SOURCES)
-
-libtouchpad_la_CFLAGS = $(gsd_plugin_CFLAGS)
-libtouchpad_la_SOURCES = 		\
-	gsd-touchpad-plugin.c		\
-	gsd-touchpad-manager.h		\
-	gsd-touchpad-manager.c          \
-        $(touchpad_common_SOURCES)
-
-gsd_plugin_in_files =	 			\
-	trackpoint.gnome-settings-plugin.in	\
-	touchpad.gnome-settings-plugin.in
-
-gsd_plugin_DATA = $(gsd_plugin_in_files:.gnome-settings-plugin.in=.gnome-settings-plugin)
-
-EXTRA_DIST = 			\
-	$(gsd_plugin_in_files)	\
-	gnome-settings-plugin.h
+trackpoint_la_LIBADD = $(top_builddir)/modules/common/libtrackpoint_common.la
 
-CLEANFILES = 			\
-	$(gsd_plugin_DATA)
-
-DISTCLEANFILES =		\
-	$(gsd_plugin_DATA)
+touchpad_la_SOURCES = 			\
+	gpds-touchpad-ui.c
 
+touchpad_la_LIBADD = $(top_builddir)/modules/common/libtouchpad_common.la

Added: trunk/modules/common/Makefile.am
==============================================================================
--- (empty file)
+++ trunk/modules/common/Makefile.am	Tue Mar  3 03:36:43 2009
@@ -0,0 +1,30 @@
+INCLUDES = 			\
+	 -I$(top_builddir)	\
+	 -I$(top_srcdir)	\
+	 -I$(top_srcdir)/src
+
+AM_CFLAGS =			\
+	$(GPDS_CFLAGS)		\
+	$(GCONF2_CFLAGS)	\
+	$(COVERAGE_CFLAGS)
+
+noinst_LTLIBRARIES =            \
+        libtrackpoint_common.la \
+        libtouchpad_common.la
+
+LIBADD =				\
+	$(top_builddir)/src/libgpds.la	\
+	$(GTK_LIBS)			\
+	$(GCONF2_LIBS)			\
+	$(GNOME_SETTINGS_DAEMON_LIBS)
+
+libtrackpoint_common_la_SOURCES =       \
+        gpds-trackpoint-xinput.c        \
+        gpds-trackpoint-xinput.h        \
+	gpds-trackpoint-definitions.h
+
+libtouchpad_common_la_SOURCES =         \
+        gpds-touchpad-xinput.c          \
+        gpds-touchpad-xinput.h          \
+	gpds-touchpad-definitions.h
+        

Copied: trunk/modules/common/gpds-touchpad-definitions.h (from r99, /trunk/modules/gpds-touchpad-definitions.h)
==============================================================================

Copied: trunk/modules/common/gpds-touchpad-xinput.c (from r99, /trunk/modules/gpds-touchpad-xinput.c)
==============================================================================
--- /trunk/modules/gpds-touchpad-xinput.c	(original)
+++ trunk/modules/common/gpds-touchpad-xinput.c	Tue Mar  3 03:36:43 2009
@@ -21,13 +21,11 @@
 #include "config.h"
 #endif /* HAVE_CONFIG_H */
 
-#include "gsd-trackpoint-manager.h"
+#include "gpds-touchpad-xinput.h"
 #include <glib/gi18n.h>
 #include <gconf/gconf-client.h>
 #include <gpds-xinput.h>
 
-#include "gpds-touchpad-xinput.h"
-
 static GpdsTouchpadXInputProperty properties[] = {
     {GPDS_TOUCHPAD_EDGES,                      "Synaptics Edges", 32, 4},
     {GPDS_TOUCHPAD_FINGER,                     "Synaptics Finger", 32, 3},

Copied: trunk/modules/common/gpds-touchpad-xinput.h (from r99, /trunk/modules/gpds-touchpad-xinput.h)
==============================================================================
--- /trunk/modules/gpds-touchpad-xinput.h	(original)
+++ trunk/modules/common/gpds-touchpad-xinput.h	Tue Mar  3 03:36:43 2009
@@ -20,6 +20,8 @@
 #ifndef __GPDS_TOUCHPAD_XINPUT_H__
 #define __GPDS_TOUCHPAD_XINPUT_H__
 
+#include <glib.h>
+
 typedef enum {
     GPDS_TOUCHPAD_EDGES,
     GPDS_TOUCHPAD_FINGER,

Copied: trunk/modules/common/gpds-trackpoint-definitions.h (from r99, /trunk/modules/gpds-trackpoint-definitions.h)
==============================================================================

Copied: trunk/modules/common/gpds-trackpoint-xinput.c (from r99, /trunk/modules/gpds-trackpoint-xinput.c)
==============================================================================
--- /trunk/modules/gpds-trackpoint-xinput.c	(original)
+++ trunk/modules/common/gpds-trackpoint-xinput.c	Tue Mar  3 03:36:43 2009
@@ -21,13 +21,11 @@
 #include "config.h"
 #endif /* HAVE_CONFIG_H */
 
-#include "gsd-trackpoint-manager.h"
+#include "gpds-trackpoint-xinput.h"
 #include <glib/gi18n.h>
 #include <gconf/gconf-client.h>
 #include <gpds-xinput.h>
 
-#include "gpds-trackpoint-xinput.h"
-
 static GpdsTrackPointXInputProperty properties[] = {
     {GPDS_TRACK_POINT_MIDDLE_BUTTON_EMULATION, "Evdev Middle Button Emulation", 8, 1},
     {GPDS_TRACK_POINT_MIDDLE_BUTTON_TIMEOUT, "Evdev Middle Button Timeout", 32, 1},

Copied: trunk/modules/common/gpds-trackpoint-xinput.h (from r99, /trunk/modules/gpds-trackpoint-xinput.h)
==============================================================================
--- /trunk/modules/gpds-trackpoint-xinput.h	(original)
+++ trunk/modules/common/gpds-trackpoint-xinput.h	Tue Mar  3 03:36:43 2009
@@ -20,6 +20,8 @@
 #ifndef __GPDS_TRACK_POINT_XINPUT_H__
 #define __GPDS_TRACK_POINT_XINPUT_H__
 
+#include <glib.h>
+
 typedef enum {
     GPDS_TRACK_POINT_MIDDLE_BUTTON_EMULATION,
     GPDS_TRACK_POINT_MIDDLE_BUTTON_TIMEOUT,

Copied: trunk/modules/gnome-settings-daemon-plugins/Makefile.am (from r99, /trunk/modules/Makefile.am)
==============================================================================
--- /trunk/modules/Makefile.am	(original)
+++ trunk/modules/gnome-settings-daemon-plugins/Makefile.am	Tue Mar  3 03:36:43 2009
@@ -1,9 +1,10 @@
 @GSD_INTLTOOL_PLUGIN_RULE@
 
-INCLUDES = 			\
-	 -I$(top_builddir)	\
-	 -I$(top_srcdir)	\
-	 -I$(top_srcdir)/src
+INCLUDES = 			        \
+	 -I$(top_builddir)	        \
+	 -I$(top_srcdir)	        \
+	 -I$(top_srcdir)/src            \
+	 -I$(top_srcdir)/modules/common
 
 AM_CFLAGS =			\
 	$(GPDS_CFLAGS)		\
@@ -15,35 +16,12 @@
   	-no-undefined 		\
   	-export-dynamic $(LIBTOOL_EXPORT_OPTIONS)
 
-gpds_module_LTLIBRARIES = 	\
-	trackpoint.la		\
-	touchpad.la
-
 LIBS =					\
 	$(top_builddir)/src/libgpds.la	\
 	$(GTK_LIBS)			\
 	$(GCONF2_LIBS)			\
 	$(GNOME_SETTINGS_DAEMON_LIBS)
 
-trackpoint_common_SOURCES =             \
-        gpds-trackpoint-xinput.c        \
-        gpds-trackpoint-xinput.h        \
-	gpds-trackpoint-definitions.h
-
-trackpoint_la_SOURCES = 		\
-	gpds-trackpoint-ui.c		\
-        $(trackpoint_common_SOURCES)
-
-touchpad_common_SOURCES =               \
-        gpds-touchpad-xinput.c          \
-        gpds-touchpad-xinput.h          \
-	gpds-touchpad-definitions.h
-        
-touchpad_la_SOURCES = 			\
-	gpds-touchpad-ui.c		\
-        $(touchpad_common_SOURCES)
-
-# plugins for gnome-settings-daemon
 gsd_plugin_LTLIBRARIES =	\
 	libtrackpoint.la	\
 	libtouchpad.la
@@ -57,15 +35,17 @@
 libtrackpoint_la_SOURCES = 		\
 	gsd-trackpoint-plugin.c		\
 	gsd-trackpoint-manager.h	\
-	gsd-trackpoint-manager.c        \
-        $(trackpoint_common_SOURCES)
+	gsd-trackpoint-manager.c
+
+libtrackpoint_la_LIBADD = $(top_builddir)/modules/common/libtrackpoint_common.la
 
 libtouchpad_la_CFLAGS = $(gsd_plugin_CFLAGS)
 libtouchpad_la_SOURCES = 		\
 	gsd-touchpad-plugin.c		\
 	gsd-touchpad-manager.h		\
-	gsd-touchpad-manager.c          \
-        $(touchpad_common_SOURCES)
+	gsd-touchpad-manager.c
+
+libtouchpad_la_LIBADD = $(top_builddir)/modules/common/libtouchpad_common.la
 
 gsd_plugin_in_files =	 			\
 	trackpoint.gnome-settings-plugin.in	\

Copied: trunk/modules/gnome-settings-daemon-plugins/gnome-settings-plugin.h (from r99, /trunk/modules/gnome-settings-plugin.h)
==============================================================================

Copied: trunk/modules/gnome-settings-daemon-plugins/gsd-touchpad-manager.c (from r99, /trunk/modules/gsd-touchpad-manager.c)
==============================================================================

Copied: trunk/modules/gnome-settings-daemon-plugins/gsd-touchpad-manager.h (from r99, /trunk/modules/gsd-touchpad-manager.h)
==============================================================================

Copied: trunk/modules/gnome-settings-daemon-plugins/gsd-touchpad-plugin.c (from r99, /trunk/modules/gsd-touchpad-plugin.c)
==============================================================================

Copied: trunk/modules/gnome-settings-daemon-plugins/gsd-trackpoint-manager.c (from r99, /trunk/modules/gsd-trackpoint-manager.c)
==============================================================================

Copied: trunk/modules/gnome-settings-daemon-plugins/gsd-trackpoint-manager.h (from r99, /trunk/modules/gsd-trackpoint-manager.h)
==============================================================================

Copied: trunk/modules/gnome-settings-daemon-plugins/gsd-trackpoint-plugin.c (from r99, /trunk/modules/gsd-trackpoint-plugin.c)
==============================================================================

Copied: trunk/modules/gnome-settings-daemon-plugins/touchpad.gnome-settings-plugin.in (from r99, /trunk/modules/touchpad.gnome-settings-plugin.in)
==============================================================================

Copied: trunk/modules/gnome-settings-daemon-plugins/trackpoint.gnome-settings-plugin.in (from r99, /trunk/modules/trackpoint.gnome-settings-plugin.in)
==============================================================================
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]