dbus example: remove compile.sh and make a autotools project

compile.sh was a pain. didn't work with current debian.
so this patch removes it and converts the example to an autools project.

Signed-off-by: Manuel Traut <manut@mecka.net>

10 files changed, 49 insertions, 15 deletions

diff --git a/frameworks/middleware/examples/dbus/AUTHORS b/frameworks/middleware/examples/dbus/AUTHORS
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/frameworks/middleware/examples/dbus/AUTHORS
diff --git a/frameworks/middleware/examples/dbus/ChangeLog b/frameworks/middleware/examples/dbus/ChangeLog
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/frameworks/middleware/examples/dbus/ChangeLog
diff --git a/frameworks/middleware/examples/dbus/Makefile.am b/frameworks/middleware/examples/dbus/Makefile.am
new file mode 100644
index 0000000..830a98e
--- /dev/null
+++ b/frameworks/middleware/examples/dbus/Makefile.am
@@ -0,0 +1,8 @@
+bin_PROGRAMS = pingserver pingclient
+pingserver_SOURCES = ping-server.c
+pingserver_CFLAGS = $(DBUS_CFLAGS)
+pingserver_LDADD = $(DBUS_LIBS)
+
+pingclient_SOURCES = ping-client.c
+pingclient_CFLAGS = $(DBUS_CFLAGS)
+pingclient_LDADD = $(DBUS_LIBS)
diff --git a/frameworks/middleware/examples/dbus/NEWS b/frameworks/middleware/examples/dbus/NEWS
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/frameworks/middleware/examples/dbus/NEWS
diff --git a/frameworks/middleware/examples/dbus/README b/frameworks/middleware/examples/dbus/README
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/frameworks/middleware/examples/dbus/README
diff --git a/frameworks/middleware/examples/dbus/autogen.sh b/frameworks/middleware/examples/dbus/autogen.sh
new file mode 100755
index 0000000..58c0175
--- /dev/null
+++ b/frameworks/middleware/examples/dbus/autogen.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+automake --add-missing
+autoreconf -sif
diff --git a/frameworks/middleware/examples/dbus/compile.sh b/frameworks/middleware/examples/dbus/compile.sh
deleted file mode 100755
index d2b2822..0000000
--- a/frameworks/middleware/examples/dbus/compile.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-gcc  -o server -lrt -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  -ldbus-glib-1 -ldbus-1 -lgobject-2.0 -lglib-2.0   ping-server.c
-gcc  -o client -lrt -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  -ldbus-glib-1 -ldbus-1 -lgobject-2.0 -lglib-2.0   ping-client.c
diff --git a/frameworks/middleware/examples/dbus/configure.ac b/frameworks/middleware/examples/dbus/configure.ac
new file mode 100644
index 0000000..bf99b42
--- /dev/null
+++ b/frameworks/middleware/examples/dbus/configure.ac
@@ -0,0 +1,24 @@
+#                                               -*- Autoconf -*-
+# Process this file with autoconf to produce a configure script.
+
+AC_PREREQ([2.69])
+AC_INIT([dbus-example], [1.0], [manut@linutronix.de])
+AC_CONFIG_SRCDIR([ping-server.c])
+AM_INIT_AUTOMAKE([dist-bzip2])
+AC_CONFIG_HEADERS([config.h])
+
+# Checks for programs.
+AC_PROG_CC
+
+# Checks for libraries.
+PKG_CHECK_MODULES([DBUS], [dbus-glib-1])
+# Checks for header files.
+
+# Checks for typedefs, structures, and compiler characteristics.
+
+# Checks for library functions.
+AC_CHECK_FUNCS([clock_gettime])
+
+AC_CONFIG_FILES([Makefile])
+
+AC_OUTPUT
diff --git a/frameworks/middleware/examples/dbus/ping-client.c b/frameworks/middleware/examples/dbus/ping-client.c
index e3035e4..ceb3205 100644
--- a/frameworks/middleware/examples/dbus/ping-client.c
+++ b/frameworks/middleware/examples/dbus/ping-client.c
@@ -12,10 +12,10 @@ int main (int argc, char **argv)
   DBusConnection *bus;
   DBusError error;
 
-	if (argc > 1)
-		v_STRING = argv[1];
-	else
-		v_STRING = "no arg given";
+  if (argc > 1)
+    v_STRING = argv[1];
+  else
+    v_STRING = "no arg given";
 
   /* Create a new event loop to run in */
   loop = g_main_loop_new (NULL, FALSE);
@@ -42,8 +42,8 @@ int main (int argc, char **argv)
 static gboolean send_ping (DBusConnection *bus)
 {
   DBusMessage *message;
-	struct timespec tx_time;
-	struct timespec done_time;
+  struct timespec tx_time;
+  struct timespec done_time;
 
   message = dbus_message_new_signal ("/de/linutronix/Ping",
                                      "de.linutronix.Ping", "Ping");
@@ -51,12 +51,16 @@ static gboolean send_ping (DBusConnection *bus)
   dbus_message_append_args (message,
                             DBUS_TYPE_STRING, &v_STRING,
                             DBUS_TYPE_INVALID);
-	clock_gettime(CLOCK_MONOTONIC, &tx_time);
+
+ clock_gettime(CLOCK_MONOTONIC, &tx_time);
+
   /* Send the signal */
   dbus_connection_send (bus, message, NULL);
-	clock_gettime(CLOCK_MONOTONIC, &done_time);
-	g_print("%d:%d\n%d:%d\n\n", tx_time.tv_sec, tx_time.tv_nsec/1000,
-		done_time.tv_sec, done_time.tv_nsec/1000);
+  clock_gettime(CLOCK_MONOTONIC, &done_time);
+
+  g_print("%d:%d\n%d:%d\n\n", tx_time.tv_sec, tx_time.tv_nsec/1000,
+    done_time.tv_sec, done_time.tv_nsec/1000);
+
   /* Free the signal now we have finished with it */
   dbus_message_unref (message);
   /* Return TRUE to tell the event loop we want to be called again */
diff --git a/frameworks/middleware/examples/dbus/ping-server.c b/frameworks/middleware/examples/dbus/ping-server.c
index 36dd122..96b2397 100644
--- a/frameworks/middleware/examples/dbus/ping-server.c
+++ b/frameworks/middleware/examples/dbus/ping-server.c
@@ -60,7 +60,6 @@ static DBusHandlerResult signal_filter
 			clock_gettime(CLOCK_MONOTONIC, &rx_time);
 			g_print("ping received: %s - %d:%d\n", s, rx_time.tv_sec,
 				rx_time.tv_nsec/1000);
-			// dbus_free (s);
 		} else {
 			g_print("ping received, but error getting message: %s\n", error.message);
 			dbus_error_free (&error);
@@ -69,4 +68,3 @@ static DBusHandlerResult signal_filter
 	}
 	return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
 }
-