diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 54 | ||||
| -rw-r--r-- | src/plugin.c | 17 |
2 files changed, 4 insertions, 67 deletions
diff --git a/src/Makefile.am b/src/Makefile.am deleted file mode 100644 index 11dac64b..00000000 --- a/src/Makefile.am +++ /dev/null @@ -1,54 +0,0 @@ - -if DATAFILES -dbusdir = @DBUS_DATADIR@ - -dbus_DATA = ofono.conf -endif - -sbin_PROGRAMS = ofonod - -ofonod_SOURCES = main.c ofono.h log.c plugin.c \ - modem.c common.h common.c \ - manager.c dbus.c util.h util.c \ - network.c voicecall.c ussd.c sms.c \ - call-settings.c call-forwarding.c call-meter.c \ - smsutil.h smsutil.c ssn.c call-barring.c sim.c \ - phonebook.c history.c simutil.h simutil.c \ - message-waiting.c - -ofonod_LDADD = $(top_builddir)/plugins/libbuiltin.la \ - $(top_builddir)/drivers/libbuiltin.la \ - @GATCHAT_LIBS@ @GDBUS_LIBS@ @GLIB_LIBS@ \ - @GISI_LIBS@ @GTHREAD_LIBS@ -ldl - -ofonod_LDFLAGS = -Wl,--export-dynamic -Wl,--version-script=ofono.ver - -ofonod_DEPENDENCIES = ofono.ver \ - @GATCHAT_LIBS@ @GISI_LIBS@ ../gdbus/libgdbus.la \ - ../drivers/libbuiltin.la ../plugins/libbuiltin.la - -CLEANFILES = ofono.ver ofono.exp - -if MAINTAINER_MODE -plugindir = $(abs_top_srcdir)/plugins/.libs -else -plugindir = $(libdir)/ofono/plugins -endif - -AM_CFLAGS = @GTHREAD_CFLAGS@ @GLIB_CFLAGS@ @GDBUS_CFLAGS@ @GATCHAT_CFLAGS@ \ - @GISI_CFLAGS@ -DPLUGINDIR=\""$(plugindir)"\" - -INCLUDES = -I$(top_builddir)/include -I$(top_builddir) - -EXTRA_DIST = genbuiltin ofono.conf - -MAINTAINERCLEANFILES = Makefile.in - -ofono.exp: $(ofonod_OBJECTS) - $(AM_V_GEN)$(NM) $^ | $(AWK) '{ print $$3 }' | sort -u | \ - $(EGREP) -e '^ofono_' > $@ - -ofono.ver: ofono.exp - $(AM_V_at)echo "{ global:" > $@ - $(AM_V_GEN)$(SED) -e "s/\(.*\)/\1;/" $< >> $@ - $(AM_V_at)echo "local: *; };" >> $@ diff --git a/src/plugin.c b/src/plugin.c index 017ebad5..979a6855 100644 --- a/src/plugin.c +++ b/src/plugin.c @@ -88,8 +88,7 @@ static gboolean check_plugin(struct ofono_plugin_desc *desc, return TRUE; } -#include "plugins/builtin.h" -#include "drivers/builtin.h" +#include "builtin.h" int __ofono_plugin_init(const char *pattern, const char *exclude) { @@ -101,20 +100,12 @@ int __ofono_plugin_init(const char *pattern, const char *exclude) DBG(""); - for (i = 0; __ofono_plugins[i]; i++) { - if (check_plugin(__ofono_plugins[i], + for (i = 0; __ofono_builtin[i]; i++) { + if (check_plugin(__ofono_builtin[i], pattern, exclude) == FALSE) continue; - add_plugin(NULL, __ofono_plugins[i]); - } - - for (i = 0; __ofono_drivers[i]; i++) { - if (check_plugin(__ofono_drivers[i], - pattern, exclude) == FALSE) - continue; - - add_plugin(NULL, __ofono_drivers[i]); + add_plugin(NULL, __ofono_builtin[i]); } dir = g_dir_open(PLUGINDIR, 0, NULL); |