From 70aab2a82671d29a5a2dd0195469999bc70e2412 Mon Sep 17 00:00:00 2001
From: Marcel Holtmann <marcel@holtmann.org>
Date: Mon, 24 Aug 2009 23:49:40 -0700
Subject: Convert to fully non-recursive build system

---
 plugins/Makefile.am       | 35 -----------------------------------
 plugins/example_history.c |  1 +
 plugins/generic_at.c      |  1 +
 3 files changed, 2 insertions(+), 35 deletions(-)
 delete mode 100644 plugins/Makefile.am

(limited to 'plugins')

diff --git a/plugins/Makefile.am b/plugins/Makefile.am
deleted file mode 100644
index d1728e82..00000000
--- a/plugins/Makefile.am
+++ /dev/null
@@ -1,35 +0,0 @@
-
-builtin_modules =
-builtin_sources =
-builtin_cflags =
-
-if MAINTAINER_MODE
-builtin_modules += example_history
-builtin_sources += example_history.c
-endif
-
-builtin_modules += generic_at
-builtin_sources += generic_at.c
-
-noinst_LTLIBRARIES = libbuiltin.la
- 
-libbuiltin_la_SOURCES = $(builtin_sources)
-libbuiltin_la_LDFLAGS =
-libbuiltin_la_CFLAGS = $(AM_CFLAGS) $(builtin_cflags) -DOFONO_PLUGIN_BUILTIN \
-			-DOFONO_API_SUBJECT_TO_CHANGE
-
-BUILT_SOURCES = builtin.h
-
-nodist_libbuiltin_la_SOURCES = $(BUILT_SOURCES)
-
-AM_CFLAGS = -fvisibility=hidden @GLIB_CFLAGS@ @GDBUS_CFLAGS@ @GATCHAT_CFLAGS@
-
-INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/src
-
-CLEANFILES = $(BUILT_SOURCES)
-
-MAINTAINERCLEANFILES = Makefile.in
-
-builtin.h: $(top_srcdir)/src/genbuiltin $(builtin_sources)
-	$(AM_V_GEN)$(top_srcdir)/src/genbuiltin $(builtin_modules) | \
-				$(SED) -e "s/builtin\[\]/plugins\[\]/" > $@
diff --git a/plugins/example_history.c b/plugins/example_history.c
index c08d0cae..384c88dc 100644
--- a/plugins/example_history.c
+++ b/plugins/example_history.c
@@ -26,6 +26,7 @@
 #include <string.h>
 #include <glib.h>
 
+#define OFONO_API_SUBJECT_TO_CHANGE
 #include <ofono/plugin.h>
 #include <ofono/log.h>
 #include <ofono/history.h>
diff --git a/plugins/generic_at.c b/plugins/generic_at.c
index e5d7a428..f500e9ca 100644
--- a/plugins/generic_at.c
+++ b/plugins/generic_at.c
@@ -39,6 +39,7 @@
 #include <gatchat.h>
 #include <gatsyntax.h>
 
+#define OFONO_API_SUBJECT_TO_CHANGE
 #include <ofono/plugin.h>
 #include <ofono/log.h>
 #include <ofono/modem.h>
-- 
cgit v1.2.3