Fix compile for Linux backend

5 files changed, 59 insertions, 17 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 9809ef5..0ea5a08 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,12 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-if BACKEND_TYPE_DUMMY
-SUBDIRS = dummy
-endif
-
-if BACKEND_TYPE_LINUX
-SUBDIRS = linux
-endif
+SUBDIRS = dummy linux
 
 INCLUDES = \
 	-I$(top_builddir)/src -I$(top_srcdir)/src		\
@@ -94,18 +88,18 @@ devkit_power_daemon_LDADD =					\
 	$(USB_LIBS)						\
 	$(GIO_LIBS)						\
 	$(DBUS_GLIB_LIBS)					\
-	$(POLKIT_LIBS)						\
-	$(GUDEV_LIBS)						\
-	$(DEVKIT_POWER_LIBS)
+	$(POLKIT_LIBS)
 
 if BACKEND_TYPE_DUMMY
 devkit_power_daemon_LDADD += 					\
-	dummy/libdkpshared.a
+	dummy/libdkpshared.la
 endif
 
 if BACKEND_TYPE_LINUX
 devkit_power_daemon_LDADD += 					\
-	linux/libdkpshared.a
+	linux/libdkpshared.la					\
+	$(GUDEV_LIBS)						\
+	$(DEVKIT_POWER_LIBS)
 endif
 
 devkit_power_daemon_CFLAGS =					\
diff --git a/src/dummy/Makefile.am b/src/dummy/Makefile.am
index aa1c944..804358a 100644
--- a/src/dummy/Makefile.am
+++ b/src/dummy/Makefile.am
@@ -12,8 +12,11 @@ INCLUDES = \
 	$(POLKIT_CFLAGS)					\
 	$(GLIB_CFLAGS)
 
-noinst_LIBRARIES = libdkpshared.a
-libdkpshared_a_SOURCES =					\
+if BACKEND_TYPE_DUMMY
+noinst_LTLIBRARIES = libdkpshared.la
+endif
+
+libdkpshared_la_SOURCES =					\
 	dkp-backend.c						\
 	dkp-native.c						\
 	$(BUILT_SOURCES)
diff --git a/src/linux/.gitignore b/src/linux/.gitignore
index ed89e2f..76b9072 100644
--- a/src/linux/.gitignore
+++ b/src/linux/.gitignore
@@ -1,5 +1,6 @@
 .deps
 .libs
 *.o
-*.a
+*.lo
+*.la
 
diff --git a/src/linux/Makefile.am b/src/linux/Makefile.am
index 67396a5..d5fd21d 100644
--- a/src/linux/Makefile.am
+++ b/src/linux/Makefile.am
@@ -15,8 +15,11 @@ INCLUDES = \
 	$(POLKIT_CFLAGS)					\
 	$(GLIB_CFLAGS)
 
-noinst_LIBRARIES = libdkpshared.a
-libdkpshared_a_SOURCES =					\
+if BACKEND_TYPE_LINUX
+noinst_LTLIBRARIES = libdkpshared.la
+endif
+
+libdkpshared_la_SOURCES =					\
 	dkp-device-supply.c					\
 	dkp-device-supply.h					\
 	dkp-device-csr.c					\
diff --git a/src/linux/dkp-native.c b/src/linux/dkp-native.c
new file mode 100644
index 0000000..f41b972
--- /dev/null
+++ b/src/linux/dkp-native.c
@@ -0,0 +1,41 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+ *
+ * Copyright (C) 2009 Richard Hughes <richard@hughsie.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#include <glib.h>
+#include <gudev/gudev.h>
+
+#include "dkp-native.h"
+
+/**
+ * dkp_native_get_native_path:
+ * @object: the native tracking object
+ *
+ * This converts a GObject used as the device data into a native path.
+ * This would be implemented on a Linux system using:
+ *  g_udev_device_get_sysfs_path (G_UDEV_DEVICE (object))
+ *
+ * Return value: The native path for the device which is unique, e.g. "/sys/class/power/BAT1"
+ **/
+const gchar *
+dkp_native_get_native_path (GObject *object)
+{
+	return g_udev_device_get_sysfs_path (G_UDEV_DEVICE (object));
+}
+