From 8cc5595d9091b484b9a4abe314c0f3ec055e0581 Mon Sep 17 00:00:00 2001
From: Marcel Holtmann <marcel@holtmann.org>
Date: Sat, 20 Jan 2007 05:26:15 +0000
Subject: Make it possible to support an embedded GLib

---
 common/Makefile.am      | 15 +++------------
 common/dbus-helper.c    |  3 ++-
 common/dbus.c           |  3 ++-
 common/notify-inotify.c |  3 ++-
 4 files changed, 9 insertions(+), 15 deletions(-)

(limited to 'common')

diff --git a/common/Makefile.am b/common/Makefile.am
index a92ff9a3..412786c9 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -11,30 +11,21 @@ else
 notify_sources = notify-dummy.c
 endif
 
-if GLIB
-glib_sources =
-glib_cflags  = @GLIB_CFLAGS@
-else
-glib_sources = glib-ectomy.c
-glib_cflags  =
-endif
-
 noinst_LIBRARIES = libhelper.a
 
 libhelper_a_SOURCES = oui.h oui.c dbus.h dbus.c \
 	textfile.h textfile.c logging.h logging.c \
 	dbus-helper.h dbus-helper.c \
 	sdp-xml.h sdp-xml.c $(sdp_sources) \
-	notify.h $(notify_sources) \
-	glib-ectomy.h $(glib_sources)
+	notify.h $(notify_sources)
 
 noinst_PROGRAMS = test_textfile
 
 test_textfile_LDADD = libhelper.a
 
-AM_CFLAGS = @DBUS_CFLAGS@ $(glib_cflags)
+AM_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@
 
 EXTRA_DIST = ppoll.h sdp-dummy.c sdp-expat.c \
-	notify-dummy.c notify-inotify.c glib-ectomy.c
+		notify-dummy.c notify-inotify.c
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/common/dbus-helper.c b/common/dbus-helper.c
index 71d1eeb7..64b00cd8 100644
--- a/common/dbus-helper.c
+++ b/common/dbus-helper.c
@@ -28,9 +28,10 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <glib.h>
+
 #include <dbus/dbus.h>
 
-#include "glib-ectomy.h"
 #include "logging.h"
 
 #include "dbus-helper.h"
diff --git a/common/dbus.c b/common/dbus.c
index 3b211851..bdcb1684 100644
--- a/common/dbus.c
+++ b/common/dbus.c
@@ -32,13 +32,14 @@
 #include <stdlib.h>
 #include <stdint.h>
 
+#include <glib.h>
+
 #include <dbus/dbus.h>
 
 #ifdef HAVE_DBUS_GLIB
 #include <dbus/dbus-glib-lowlevel.h>
 #endif
 
-#include "glib-ectomy.h"
 #include "dbus.h"
 #include "logging.h"
 
diff --git a/common/notify-inotify.c b/common/notify-inotify.c
index 27719dbf..a35cf745 100644
--- a/common/notify-inotify.c
+++ b/common/notify-inotify.c
@@ -34,7 +34,8 @@
 #define IN_ONLYDIR 0x01000000
 #endif
 
-#include "glib-ectomy.h"
+#include <glib.h>
+
 #include "logging.h"
 #include "notify.h"
 
-- 
cgit