Convert to fully non-recursive build system

15 files changed, 2 insertions, 142 deletions

diff --git a/drivers/Makefile.am b/drivers/Makefile.am
deleted file mode 100644
index 9c40fd17..00000000
--- a/drivers/Makefile.am
+++ /dev/null
@@ -1,48 +0,0 @@
-
-builtin_modules =
-builtin_sources =
-builtin_cflags =
-
-builtin_modules += atmodem
-builtin_sources += atmodem/atmodem.c atmodem/at.h \
-			atmodem/call-settings.c atmodem/sms.c \
-			atmodem/call-forwarding.c atmodem/call-meter.c \
-			atmodem/network-registration.c atmodem/sim.c \
-			atmodem/ussd.c atmodem/voicecall.c \
-			atmodem/call-barring.c atmodem/phonebook.c \
-			atmodem/ssn.c atmodem/devinfo.c
-
-if COND_ISI
-builtin_modules += isimodem
-builtin_sources += isimodem/isimodem.c isimodem/isi.h isimodem/isiphonebook.c \
-			isimodem/isidevinfo.c isimodem/isinetwork.c \
-			isimodem/isivoicecall.c isimodem/isisms.c \
-			isimodem/isisim.c isimodem/isissn.c \
-			isimodem/isiussd.c isimodem/isicall-forwarding.c \
-			isimodem/isicall-settings.c isimodem/isicall-barring.c \
-			isimodem/isicall-meter.c
-endif
-
-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@ @GISI_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\[\]/drivers\[\]/" > $@
diff --git a/drivers/atmodem/atmodem.c b/drivers/atmodem/atmodem.c
index c2324e5d..d6ae3919 100644
--- a/drivers/atmodem/atmodem.c
+++ b/drivers/atmodem/atmodem.c
@@ -29,6 +29,7 @@
 #include <gatchat.h>
 #include <stdlib.h>
 
+#define OFONO_API_SUBJECT_TO_CHANGE
 #include <ofono/plugin.h>
 #include <ofono/log.h>
 #include <ofono/modem.h>
diff --git a/drivers/atmodem/devinfo.c b/drivers/atmodem/devinfo.c
index ad61e8e7..df43bc4d 100644
--- a/drivers/atmodem/devinfo.c
+++ b/drivers/atmodem/devinfo.c
@@ -26,7 +26,6 @@
 #include <string.h>
 #include <glib.h>
 
-#include <ofono/plugin.h>
 #include <ofono/log.h>
 #include <ofono/modem.h>
 #include <ofono/devinfo.h>
diff --git a/drivers/isimodem/isicall-barring.c b/drivers/isimodem/isicall-barring.c
index e7102be7..a35dd9bc 100644
--- a/drivers/isimodem/isicall-barring.c
+++ b/drivers/isimodem/isicall-barring.c
@@ -35,7 +35,6 @@
 
 #include <gisi/client.h>
 
-#include <ofono/plugin.h>
 #include <ofono/log.h>
 #include <ofono/modem.h>
 #include <ofono/call-barring.h>
@@ -66,15 +65,6 @@ static void isi_set_passwd(struct ofono_call_barring *barr, const char *lock,
 {
 }
 
-static gboolean isi_call_barring_register(gpointer user)
-{
-	struct ofono_call_barring *barr = user;
-
-	ofono_call_barring_register(barr);
-
-	return FALSE;
-}
-
 static int isi_call_barring_probe(struct ofono_call_barring *barr)
 {
 	GIsiModem *idx = ofono_call_barring_get_data(barr);
diff --git a/drivers/isimodem/isicall-forwarding.c b/drivers/isimodem/isicall-forwarding.c
index 056ebd62..08236c8c 100644
--- a/drivers/isimodem/isicall-forwarding.c
+++ b/drivers/isimodem/isicall-forwarding.c
@@ -35,7 +35,6 @@
 
 #include <gisi/client.h>
 
-#include <ofono/plugin.h>
 #include <ofono/log.h>
 #include <ofono/modem.h>
 #include <ofono/call-forwarding.h>
@@ -80,15 +79,6 @@ static void isi_query(struct ofono_call_forwarding *cf, int type, int cls,
 {
 }
 
-static gboolean isi_call_forwarding_register(gpointer user)
-{
-	struct ofono_call_forwarding *cf = user;
-
-	ofono_call_forwarding_register(cf);
-
-	return FALSE;
-}
-
 static int isi_call_forwarding_probe(struct ofono_call_forwarding *cf)
 {
 	GIsiModem *idx = ofono_call_forwarding_get_data(cf);
diff --git a/drivers/isimodem/isicall-meter.c b/drivers/isimodem/isicall-meter.c
index 5736ec24..7a7930f7 100644
--- a/drivers/isimodem/isicall-meter.c
+++ b/drivers/isimodem/isicall-meter.c
@@ -35,7 +35,6 @@
 
 #include <gisi/client.h>
 
-#include <ofono/plugin.h>
 #include <ofono/log.h>
 #include <ofono/modem.h>
 #include <ofono/call-meter.h>
@@ -88,15 +87,6 @@ static void isi_puct_set(struct ofono_call_meter *cm, const char *currency,
 {
 }
 
-static gboolean isi_call_meter_register(gpointer user)
-{
-	struct ofono_call_meter *cm = user;
-
-	ofono_call_meter_register(cm);
-
-	return FALSE;
-}
-
 static int isi_call_meter_probe(struct ofono_call_meter *cm)
 {
 	GIsiModem *idx = ofono_call_meter_get_data(cm);
diff --git a/drivers/isimodem/isicall-settings.c b/drivers/isimodem/isicall-settings.c
index b5df8132..99129618 100644
--- a/drivers/isimodem/isicall-settings.c
+++ b/drivers/isimodem/isicall-settings.c
@@ -35,7 +35,6 @@
 
 #include <gisi/client.h>
 
-#include <ofono/plugin.h>
 #include <ofono/log.h>
 #include <ofono/modem.h>
 #include <ofono/call-settings.h>
@@ -84,15 +83,6 @@ static void isi_cw_set(struct ofono_call_settings *cs, int mode, int cls,
 {
 }
 
-static gboolean isi_call_settings_register(gpointer user)
-{
-	struct ofono_call_settings *cs = user;
-
-	ofono_call_settings_register(cs);
-
-	return FALSE;
-}
-
 static int isi_call_settings_probe(struct ofono_call_settings *cs)
 {
 	GIsiModem *idx = ofono_call_settings_get_data(cs);
diff --git a/drivers/isimodem/isidevinfo.c b/drivers/isimodem/isidevinfo.c
index c865fa2c..6c479bb4 100644
--- a/drivers/isimodem/isidevinfo.c
+++ b/drivers/isimodem/isidevinfo.c
@@ -35,7 +35,6 @@
 
 #include <gisi/client.h>
 
-#include <ofono/plugin.h>
 #include <ofono/log.h>
 #include <ofono/modem.h>
 #include <ofono/devinfo.h>
diff --git a/drivers/isimodem/isimodem.c b/drivers/isimodem/isimodem.c
index 4a01dd3c..3f3d179d 100644
--- a/drivers/isimodem/isimodem.c
+++ b/drivers/isimodem/isimodem.c
@@ -33,6 +33,7 @@
 #include <gisi/netlink.h>
 #include <gisi/client.h>
 
+#define OFONO_API_SUBJECT_TO_CHANGE
 #include <ofono/plugin.h>
 #include <ofono/log.h>
 #include <ofono/modem.h>
diff --git a/drivers/isimodem/isinetwork.c b/drivers/isimodem/isinetwork.c
index e2a65940..88483903 100644
--- a/drivers/isimodem/isinetwork.c
+++ b/drivers/isimodem/isinetwork.c
@@ -37,7 +37,6 @@
 #include <gisi/netlink.h>
 #include <gisi/client.h>
 
-#include <ofono/plugin.h>
 #include <ofono/log.h>
 #include <ofono/modem.h>
 #include <ofono/netreg.h>
@@ -173,7 +172,6 @@ static void isi_strength(struct ofono_netreg *netreg,
 static gboolean isi_netreg_register(gpointer user)
 {
 	struct ofono_netreg *net = user;
-	struct netreg_data *data = ofono_netreg_get_data(net);
 
 	ofono_netreg_register(net);
 
diff --git a/drivers/isimodem/isisim.c b/drivers/isimodem/isisim.c
index b50083da..e0e64252 100644
--- a/drivers/isimodem/isisim.c
+++ b/drivers/isimodem/isisim.c
@@ -35,7 +35,6 @@
 
 #include <gisi/client.h>
 
-#include <ofono/plugin.h>
 #include <ofono/log.h>
 #include <ofono/modem.h>
 #include <ofono/sim.h>
@@ -97,15 +96,6 @@ static void isi_read_imsi(struct ofono_sim *sim,
 {
 }
 
-static gboolean isi_sim_register(gpointer user)
-{
-	struct ofono_sim *sim = user;
-
-	ofono_sim_register(sim);
-
-	return FALSE;
-}
-
 static int isi_sim_probe(struct ofono_sim *sim)
 {
 	GIsiModem *idx = ofono_sim_get_data(sim);
diff --git a/drivers/isimodem/isisms.c b/drivers/isimodem/isisms.c
index 5f188566..52ce4d1a 100644
--- a/drivers/isimodem/isisms.c
+++ b/drivers/isimodem/isisms.c
@@ -35,7 +35,6 @@
 
 #include <gisi/client.h>
 
-#include <ofono/plugin.h>
 #include <ofono/log.h>
 #include <ofono/modem.h>
 #include <ofono/sms.h>
@@ -66,15 +65,6 @@ static void isi_submit(struct ofono_sms *sms, unsigned char *pdu,
 {
 }
 
-static gboolean isi_sms_register(gpointer user)
-{
-	struct ofono_sms *sms = user;
-
-	ofono_sms_register(sms);
-
-	return FALSE;
-}
-
 static int isi_sms_probe(struct ofono_sms *sms)
 {
 	GIsiModem *idx = ofono_sms_get_data(sms);
diff --git a/drivers/isimodem/isissn.c b/drivers/isimodem/isissn.c
index bd9a4ff8..4225ffc2 100644
--- a/drivers/isimodem/isissn.c
+++ b/drivers/isimodem/isissn.c
@@ -35,7 +35,6 @@
 
 #include <gisi/client.h>
 
-#include <ofono/plugin.h>
 #include <ofono/log.h>
 #include <ofono/modem.h>
 #include <ofono/ssn.h>
@@ -49,15 +48,6 @@ struct ssn_data {
 	struct isi_version version;
 };
 
-static gboolean isi_ssn_register(gpointer user)
-{
-	struct ofono_ssn *ssn = user;
-
-	ofono_ssn_register(ssn);
-
-	return FALSE;
-}
-
 static int isi_ssn_probe(struct ofono_ssn *ssn)
 {
 	GIsiModem *idx = ofono_ssn_get_data(ssn);
diff --git a/drivers/isimodem/isiussd.c b/drivers/isimodem/isiussd.c
index 2c7bf30d..e2cbd605 100644
--- a/drivers/isimodem/isiussd.c
+++ b/drivers/isimodem/isiussd.c
@@ -35,7 +35,6 @@
 
 #include <gisi/client.h>
 
-#include <ofono/plugin.h>
 #include <ofono/log.h>
 #include <ofono/modem.h>
 #include <ofono/ussd.h>
@@ -59,15 +58,6 @@ static void isi_cancel(struct ofono_ussd *ussd,
 {
 }
 
-static gboolean isi_ussd_register(gpointer user)
-{
-	struct ofono_ussd *ussd = user;
-
-	ofono_ussd_register(ussd);
-
-	return FALSE;
-}
-
 static int isi_ussd_probe(struct ofono_ussd *ussd)
 {
 	GIsiModem *idx = ofono_ussd_get_data(ussd);
diff --git a/drivers/isimodem/isivoicecall.c b/drivers/isimodem/isivoicecall.c
index 1e01a0ea..423c0268 100644
--- a/drivers/isimodem/isivoicecall.c
+++ b/drivers/isimodem/isivoicecall.c
@@ -36,7 +36,6 @@
 #include <gisi/netlink.h>
 #include <gisi/client.h>
 
-#include <ofono/plugin.h>
 #include <ofono/log.h>
 #include <ofono/modem.h>
 #include <ofono/voicecall.h>
@@ -128,15 +127,6 @@ static void isi_send_tones(struct ofono_voicecall *vc, const char *tones,
 {
 }
 
-static gboolean isi_voicecall_register(gpointer user)
-{
-	struct ofono_voicecall *call = user;
-
-	ofono_voicecall_register(call);
-
-	return FALSE;
-}
-
 static int isi_voicecall_probe(struct ofono_voicecall *call)
 {
 	GIsiModem *idx = ofono_voicecall_get_data(call);