call-meter: Conform to coding style item M4
[platform/upstream/ofono.git] / Makefile.am
index 7bd7f4f..f4bca7f 100644 (file)
@@ -5,7 +5,7 @@ pkginclude_HEADERS = include/log.h include/plugin.h include/history.h \
                        include/dbus.h include/modem.h include/types.h \
                        include/call-barring.h include/call-forwarding.h \
                        include/call-meter.h include/call-settings.h \
-                       include/phonebook.h include/ssn.h include/ussd.h \
+                       include/phonebook.h include/ussd.h \
                        include/sms.h include/sim.h include/message-waiting.h \
                        include/netreg.h include/voicecall.h include/devinfo.h \
                        include/cbs.h include/call-volume.h \
@@ -14,7 +14,11 @@ pkginclude_HEADERS = include/log.h include/plugin.h include/history.h \
                        include/audio-settings.h include/nettime.h \
                        include/ctm.h include/cdma-voicecall.h \
                        include/cdma-sms.h include/sim-auth.h \
-                       include/gprs-provision.h include/emulator.h
+                       include/gprs-provision.h include/emulator.h \
+                       include/location-reporting.h \
+                       include/cdma-connman.h include/gnss.h \
+                       include/private-network.h include/cdma-netreg.h \
+                       include/cdma-provision.h include/handsfree.h
 
 nodist_pkginclude_HEADERS = include/version.h
 
@@ -72,7 +76,7 @@ gatchat_sources = gatchat/gatchat.h gatchat/gatchat.c \
                                gatchat/ppp.h gatchat/ppp_cp.h \
                                gatchat/ppp_cp.c gatchat/ppp_lcp.c \
                                gatchat/ppp_auth.c gatchat/ppp_net.c \
-                               gatchat/ppp_ipcp.c
+                               gatchat/ppp_ipcp.c gatchat/ppp_ipv6cp.c
 
 gisi_sources = gisi/client.c gisi/client.h gisi/common.h \
                                gisi/iter.c gisi/iter.h \
@@ -87,94 +91,103 @@ gisi_sources = gisi/client.c gisi/client.h gisi/common.h \
 
 btio_sources = btio/btio.h btio/btio.c
 
-udev_files = plugins/ofono.rules
-
 if UDEV
 builtin_modules += udev
 builtin_sources += plugins/udev.c
 builtin_cflags += @UDEV_CFLAGS@
 builtin_libadd += @UDEV_LIBS@
 
-if DATAFILES
-rulesdir = @UDEV_DATADIR@
-
-rules_DATA = $(foreach file,$(udev_files), plugins/97-$(notdir $(file)))
-endif
+builtin_modules += udevng
+builtin_sources += plugins/udevng.c
 endif
 
 if ISIMODEM
 builtin_modules += isimodem
 builtin_sources += $(gisi_sources) \
-                               drivers/isimodem/isimodem.h \
-                               drivers/isimodem/isimodem.c \
-                               drivers/isimodem/mtc.h \
-                               drivers/isimodem/debug.h \
-                               drivers/isimodem/isiutil.h \
-                               drivers/isimodem/debug.c \
-                               drivers/isimodem/phonebook.c \
-                               drivers/isimodem/devinfo.c \
-                               drivers/isimodem/info.h \
-                               drivers/isimodem/network-registration.c \
-                               drivers/isimodem/network.h \
-                               drivers/isimodem/infoserver.h \
-                               drivers/isimodem/infoserver.c \
-                               drivers/isimodem/voicecall.c \
-                               drivers/isimodem/call.h \
-                               drivers/isimodem/sms.c \
-                               drivers/isimodem/sms.h \
-                               drivers/isimodem/cbs.c \
-                               drivers/isimodem/sim.c \
-                               drivers/isimodem/sim.h \
-                               drivers/isimodem/ssn.c \
-                               drivers/isimodem/ussd.c \
-                               drivers/isimodem/call-forwarding.c \
-                               drivers/isimodem/call-settings.c \
-                               drivers/isimodem/call-barring.c \
-                               drivers/isimodem/call-meter.c \
-                               drivers/isimodem/ss.h \
-                               drivers/isimodem/radio-settings.c \
-                               drivers/isimodem/gss.h \
-                               drivers/isimodem/gprs.c \
-                               drivers/isimodem/gprs-context.c \
-                               drivers/isimodem/gpds.h \
-                               drivers/isimodem/audio-settings.c
+                       drivers/isimodem/isimodem.h \
+                       drivers/isimodem/isimodem.c \
+                       drivers/isimodem/mtc.h \
+                       drivers/isimodem/debug.h \
+                       drivers/isimodem/isiutil.h \
+                       drivers/isimodem/debug.c \
+                       drivers/isimodem/phonebook.c \
+                       drivers/isimodem/devinfo.c \
+                       drivers/isimodem/info.h \
+                       drivers/isimodem/network-registration.c \
+                       drivers/isimodem/network.h \
+                       drivers/isimodem/infoserver.h \
+                       drivers/isimodem/infoserver.c \
+                       drivers/isimodem/voicecall.c \
+                       drivers/isimodem/call.h \
+                       drivers/isimodem/sms.c \
+                       drivers/isimodem/sms.h \
+                       drivers/isimodem/cbs.c \
+                       drivers/isimodem/sim.c \
+                       drivers/isimodem/sim.h \
+                       drivers/isimodem/ussd.c \
+                       drivers/isimodem/call-forwarding.c \
+                       drivers/isimodem/call-settings.c \
+                       drivers/isimodem/call-barring.c \
+                       drivers/isimodem/call-meter.c \
+                       drivers/isimodem/ss.h \
+                       drivers/isimodem/radio-settings.c \
+                       drivers/isimodem/gss.h \
+                       drivers/isimodem/gprs.c \
+                       drivers/isimodem/gprs-context.c \
+                       drivers/isimodem/gpds.h \
+                       drivers/isimodem/audio-settings.c \
+                       drivers/isimodem/uicc.h \
+                       drivers/isimodem/uicc.c \
+                       drivers/isimodem/uicc-util.h \
+                       drivers/isimodem/uicc-util.c
 
 builtin_modules += isiusb
 builtin_sources += plugins/isiusb.c
 
 builtin_modules += n900
 builtin_sources += plugins/n900.c plugins/nokia-gpio.h plugins/nokia-gpio.c
+
+builtin_modules += u8500
+builtin_sources += plugins/u8500.c
+endif
+
+if QMIMODEM
+builtin_modules += qmimodem
+builtin_sources += $(qmi_sources) \
+                       drivers/qmimodem/qmimodem.h \
+                       drivers/qmimodem/qmimodem.c
+
+builtin_modules += gobi
+builtin_sources += plugins/gobi.c
 endif
 
 if ATMODEM
 builtin_modules += atmodem
 builtin_sources += $(gatchat_sources) \
-                               drivers/atmodem/atmodem.h \
-                               drivers/atmodem/atmodem.c \
-                               drivers/atmodem/call-settings.c \
-                               drivers/atmodem/sms.c \
-                               drivers/atmodem/cbs.c \
-                               drivers/atmodem/call-forwarding.c \
-                               drivers/atmodem/call-meter.c \
-                               drivers/atmodem/network-registration.c \
-                               drivers/atmodem/sim.c \
-                               drivers/atmodem/stk.c \
-                               drivers/atmodem/stk.h \
-                               drivers/atmodem/sim-poll.c \
-                               drivers/atmodem/sim-poll.h \
-                               drivers/atmodem/ussd.c \
-                               drivers/atmodem/voicecall.c \
-                               drivers/atmodem/call-barring.c \
-                               drivers/atmodem/phonebook.c \
-                               drivers/atmodem/ssn.c \
-                               drivers/atmodem/devinfo.c \
-                               drivers/atmodem/call-volume.c \
-                               drivers/atmodem/vendor.h \
-                               drivers/atmodem/atutil.h \
-                               drivers/atmodem/atutil.c \
-                               drivers/atmodem/gprs.c \
-                               drivers/atmodem/gprs-context.c \
-                               drivers/atmodem/sim-auth.c
+                       drivers/atmodem/atmodem.h \
+                       drivers/atmodem/atmodem.c \
+                       drivers/atmodem/call-settings.c \
+                       drivers/atmodem/sms.c \
+                       drivers/atmodem/cbs.c \
+                       drivers/atmodem/call-forwarding.c \
+                       drivers/atmodem/call-meter.c \
+                       drivers/atmodem/network-registration.c \
+                       drivers/atmodem/sim.c \
+                       drivers/atmodem/stk.c \
+                       drivers/atmodem/stk.h \
+                       drivers/atmodem/ussd.c \
+                       drivers/atmodem/voicecall.c \
+                       drivers/atmodem/call-barring.c \
+                       drivers/atmodem/phonebook.c \
+                       drivers/atmodem/devinfo.c \
+                       drivers/atmodem/call-volume.c \
+                       drivers/atmodem/vendor.h \
+                       drivers/atmodem/atutil.h \
+                       drivers/atmodem/atutil.c \
+                       drivers/atmodem/gprs.c \
+                       drivers/atmodem/gprs-context.c \
+                       drivers/atmodem/sim-auth.c \
+                       drivers/atmodem/gnss.c
 
 builtin_modules += nwmodem
 builtin_sources += drivers/atmodem/atutil.h \
@@ -182,14 +195,35 @@ builtin_sources += drivers/atmodem/atutil.h \
                        drivers/nwmodem/nwmodem.c \
                        drivers/nwmodem/radio-settings.c
 
+builtin_modules += swmodem
+builtin_sources += drivers/atmodem/atutil.h \
+                       drivers/swmodem/swmodem.h \
+                       drivers/swmodem/swmodem.c \
+                       drivers/swmodem/gprs-context.c
+
+builtin_modules += ztemodem
+builtin_sources += drivers/atmodem/atutil.h \
+                       drivers/ztemodem/ztemodem.h \
+                       drivers/ztemodem/ztemodem.c \
+                       drivers/ztemodem/radio-settings.c
+
+builtin_modules += iceramodem
+builtin_sources += drivers/atmodem/atutil.h \
+                       drivers/iceramodem/iceramodem.h \
+                       drivers/iceramodem/iceramodem.c \
+                       drivers/iceramodem/gprs-context.c \
+                       drivers/iceramodem/radio-settings.c
+
 builtin_modules += huaweimodem
 builtin_sources += drivers/atmodem/atutil.h \
                        drivers/huaweimodem/huaweimodem.h \
                        drivers/huaweimodem/huaweimodem.c \
+                       drivers/huaweimodem/ussd.c \
                        drivers/huaweimodem/voicecall.c \
                        drivers/huaweimodem/audio-settings.c \
                        drivers/huaweimodem/gprs-context.c \
-                       drivers/huaweimodem/radio-settings.c
+                       drivers/huaweimodem/radio-settings.c \
+                       drivers/huaweimodem/cdma-netreg.c
 
 builtin_modules += calypsomodem
 builtin_sources += drivers/atmodem/atutil.h \
@@ -198,20 +232,13 @@ builtin_sources += drivers/atmodem/atutil.h \
                        drivers/calypsomodem/voicecall.c \
                        drivers/calypsomodem/stk.c
 
-builtin_modules += hfpmodem
-builtin_sources += drivers/atmodem/atutil.h \
-                       drivers/hfpmodem/hfpmodem.h \
-                       drivers/hfpmodem/hfpmodem.c \
-                       drivers/hfpmodem/voicecall.c \
-                       drivers/hfpmodem/network-registration.c \
-                       drivers/hfpmodem/call-volume.c
-
 builtin_modules += mbmmodem
 builtin_sources += drivers/atmodem/atutil.h \
                        drivers/mbmmodem/mbmmodem.h \
                        drivers/mbmmodem/mbmmodem.c \
                        drivers/mbmmodem/gprs-context.c \
-                       drivers/mbmmodem/stk.c
+                       drivers/mbmmodem/stk.c \
+                       drivers/mbmmodem/location-reporting.c
 
 builtin_modules += hsomodem
 builtin_sources += drivers/atmodem/atutil.h \
@@ -243,6 +270,31 @@ builtin_sources += drivers/atmodem/atutil.h \
                        drivers/stemodem/caif_socket.h \
                        drivers/stemodem/if_caif.h
 
+builtin_modules += dunmodem
+builtin_sources += drivers/atmodem/atutil.h \
+                       drivers/dunmodem/dunmodem.h \
+                       drivers/dunmodem/dunmodem.c \
+                       drivers/dunmodem/network-registration.c \
+                       drivers/dunmodem/gprs.c
+
+builtin_modules += hfpmodem
+builtin_sources += drivers/atmodem/atutil.h \
+                       drivers/hfpmodem/hfpmodem.h \
+                       drivers/hfpmodem/hfpmodem.c \
+                       drivers/hfpmodem/slc.h \
+                       drivers/hfpmodem/slc.c \
+                       drivers/hfpmodem/voicecall.c \
+                       drivers/hfpmodem/network-registration.c \
+                       drivers/hfpmodem/call-volume.c \
+                       drivers/hfpmodem/devinfo.c \
+                       drivers/hfpmodem/handsfree.c
+
+builtin_modules += speedupmodem
+builtin_sources += drivers/atmodem/atutil.h \
+                       drivers/speedupmodem/speedupmodem.h \
+                       drivers/speedupmodem/speedupmodem.c \
+                       drivers/speedupmodem/ussd.c
+
 if PHONESIM
 builtin_modules += phonesim
 builtin_sources += plugins/phonesim.c
@@ -257,15 +309,13 @@ builtin_modules += cdmamodem
 builtin_sources += drivers/cdmamodem/cdmamodem.h \
                        drivers/cdmamodem/cdmamodem.c \
                        drivers/cdmamodem/voicecall.c \
-                       drivers/cdmamodem/devinfo.c
+                       drivers/cdmamodem/devinfo.c \
+                       drivers/cdmamodem/connman.c
 endif
 
 builtin_modules += g1
 builtin_sources += plugins/g1.c
 
-builtin_modules += gobi
-builtin_sources += plugins/gobi.c
-
 builtin_modules += wavecom
 builtin_sources += plugins/wavecom.c
 
@@ -317,10 +367,34 @@ builtin_sources += plugins/nokiacdma.c
 builtin_modules += linktop
 builtin_sources += plugins/linktop.c
 
+builtin_modules += icera
+builtin_sources += plugins/icera.c
+
+builtin_modules += alcatel
+builtin_sources += plugins/alcatel.c
+
+builtin_modules += speedup
+builtin_sources += plugins/speedup.c
+
+builtin_modules += speedupcdma
+builtin_sources += plugins/speedupcdma.c
+
+builtin_modules += samsung
+builtin_sources += plugins/samsung.c
+
+builtin_modules += sim900
+builtin_sources += plugins/sim900.c
+
 if BLUETOOTH
 builtin_modules += bluetooth
 builtin_sources += plugins/bluetooth.c plugins/bluetooth.h
 
+builtin_modules += telit
+builtin_sources += plugins/telit.c plugins/bluetooth.h
+
+builtin_modules += sap
+builtin_sources += plugins/sap.c plugins/bluetooth.h
+
 builtin_modules += hfp
 builtin_sources += plugins/hfp_hf.c plugins/bluetooth.h
 
@@ -330,12 +404,25 @@ builtin_sources += plugins/hfp_ag.c plugins/bluetooth.h
 builtin_modules += dun_gw
 builtin_sources += plugins/dun_gw.c plugins/bluetooth.h
 
+builtin_modules += connman
+builtin_sources += plugins/connman.c
+
 builtin_sources += $(btio_sources)
 builtin_cflags += @BLUEZ_CFLAGS@
 builtin_libadd += @BLUEZ_LIBS@
 endif
 endif
 
+if PROVISION
+builtin_sources += plugins/mbpi.h plugins/mbpi.c
+
+builtin_modules += provision
+builtin_sources += plugins/provision.c
+
+builtin_modules += cdma_provision
+builtin_sources += plugins/cdma-provision.c
+endif
+
 if MAINTAINER_MODE
 builtin_modules += example_history
 builtin_sources += examples/history.c
@@ -348,6 +435,9 @@ builtin_sources += examples/provision.c
 
 builtin_modules += example_emulator
 builtin_sources += examples/emulator.c
+
+builtin_modules += example_private_network
+builtin_sources += examples/private-network.c
 endif
 
 builtin_modules += smart_messaging
@@ -365,7 +455,7 @@ src_ofonod_SOURCES = $(gdbus_sources) $(builtin_sources) src/ofono.ver \
                        src/network.c src/voicecall.c src/ussd.c src/sms.c \
                        src/call-settings.c src/call-forwarding.c \
                        src/call-meter.c src/smsutil.h src/smsutil.c \
-                       src/ssn.c src/call-barring.c src/sim.c src/stk.c \
+                       src/call-barring.c src/sim.c src/stk.c \
                        src/phonebook.c src/history.c src/message-waiting.c \
                        src/simutil.h src/simutil.c src/storage.h \
                        src/storage.c src/cbs.c src/watch.c src/call-volume.c \
@@ -376,16 +466,21 @@ src_ofonod_SOURCES = $(gdbus_sources) $(builtin_sources) src/ofono.ver \
                        src/smsagent.c src/smsagent.h src/ctm.c \
                        src/cdma-voicecall.c src/sim-auth.c \
                        src/message.h src/message.c src/gprs-provision.c \
-                       src/emulator.c
+                       src/emulator.c src/location-reporting.c \
+                       src/cdma-connman.c src/gnss.c \
+                       src/gnssagent.c src/gnssagent.h \
+                       src/cdma-smsutil.h src/cdma-smsutil.c \
+                       src/cdma-sms.c src/private-network.c src/cdma-netreg.c \
+                       src/cdma-provision.c src/handsfree.c
 
-src_ofonod_LDADD = $(builtin_libadd) @GLIB_LIBS@ @DBUS_LIBS@ @CAPNG_LIBS@ -ldl
+src_ofonod_LDADD = $(builtin_libadd) @GLIB_LIBS@ @DBUS_LIBS@ -ldl
 
 src_ofonod_LDFLAGS = -Wl,--export-dynamic \
                                -Wl,--version-script=$(srcdir)/src/ofono.ver
 
-BUILT_SOURCES = $(local_headers)
+BUILT_SOURCES = $(local_headers) src/builtin.h
 
-CLEANFILES = src/builtin.h $(BUILT_SOURCES) $(rules_DATA)
+CLEANFILES = $(BUILT_SOURCES) $(rules_DATA)
 
 plugindir = $(pkglibdir)/plugins
 
@@ -395,7 +490,7 @@ else
 build_plugindir = $(plugindir)
 endif
 
-AM_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@ @CAPNG_CFLAGS@ @USB_CFLAGS@ \
+AM_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@ @USB_CFLAGS@ \
                                        $(builtin_cflags) \
                                        -DOFONO_PLUGIN_BUILTIN \
                                        -DPLUGINDIR=\""$(build_plugindir)"\"
@@ -418,7 +513,8 @@ doc_files = doc/overview.txt doc/ofono-paper.txt doc/release-faq.txt \
                        doc/phonebook-api.txt doc/radio-settings-api.txt \
                        doc/sim-api.txt doc/stk-api.txt \
                        doc/audio-settings-api.txt doc/text-telephony-api.txt \
-                       doc/calypso-modem.txt doc/message-api.txt
+                       doc/calypso-modem.txt doc/message-api.txt \
+                       doc/location-reporting-api.txt
 
 
 test_scripts = test/backtrace \
@@ -430,6 +526,7 @@ test_scripts = test/backtrace \
                test/dial-number \
                test/list-calls \
                test/answer-calls \
+               test/reject-calls \
                test/create-multiparty \
                test/private-chat \
                test/disable-modem \
@@ -460,6 +557,8 @@ test_scripts = test/backtrace \
                test/test-modem \
                test/test-network-registration \
                test/test-phonebook \
+               test/test-cbs \
+               test/test-ss \
                test/test-ss-control-cb \
                test/test-ss-control-cf \
                test/test-ss-control-cs \
@@ -483,6 +582,7 @@ test_scripts = test/backtrace \
                test/test-push-notification \
                test/test-smart-messaging \
                test/send-vcard \
+               test/send-vcal \
                test/set-tty \
                test/set-gsm-band \
                test/set-umts-band \
@@ -491,27 +591,38 @@ test_scripts = test/backtrace \
                test/cdma-list-call \
                test/cdma-dial-number \
                test/cdma-hangup \
+               test/cdma-set-credentials \
                test/disable-call-forwarding \
                test/list-messages \
-               test/test-sms
+               test/test-sms \
+               test/test-message-waiting \
+               test/cdma-connman-disable \
+               test/cdma-connman-enable \
+               test/set-context-property \
+               test/test-gnss \
+               test/swap-calls \
+               test/release-and-answer
 
 if TEST
 testdir = $(pkglibdir)/test
 test_SCRIPTS = $(test_scripts)
 endif
 
-EXTRA_DIST = src/genbuiltin $(udev_files) $(doc_files) $(test_scripts)
+EXTRA_DIST = src/genbuiltin plugins/ofono.rules plugins/ofono-speedup.rules \
+                               $(doc_files) $(test_scripts)
 
 dist_man_MANS = doc/ofonod.8
 
 
-noinst_PROGRAMS = unit/test-common unit/test-util unit/test-idmap \
-                                       unit/test-sms unit/test-simutil \
-                                       unit/test-mux unit/test-caif \
-                                       unit/test-stkutil
-
 unit_objects =
 
+unit_tests = unit/test-common unit/test-util unit/test-idmap \
+                               unit/test-simutil unit/test-stkutil \
+                               unit/test-sms unit/test-cdmasms
+
+noinst_PROGRAMS = $(unit_tests) \
+                       unit/test-sms-root unit/test-mux unit/test-caif
+
 unit_test_common_SOURCES = unit/test-common.c src/common.c src/util.c
 unit_test_common_LDADD = @GLIB_LIBS@
 unit_objects += $(unit_test_common_OBJECTS)
@@ -524,21 +635,29 @@ unit_test_idmap_SOURCES = unit/test-idmap.c src/idmap.c
 unit_test_idmap_LDADD = @GLIB_LIBS@
 unit_objects += $(unit_test_idmap_OBJECTS)
 
-unit_test_sms_SOURCES = unit/test-sms.c src/util.c src/smsutil.c src/storage.c
-unit_test_sms_LDADD = @GLIB_LIBS@
-unit_objects += $(unit_test_sms_OBJECTS)
-
 unit_test_simutil_SOURCES = unit/test-simutil.c src/util.c \
-                               src/simutil.c src/smsutil.c src/storage.c
+                                src/simutil.c src/smsutil.c src/storage.c
 unit_test_simutil_LDADD = @GLIB_LIBS@
 unit_objects += $(unit_test_simutil_OBJECTS)
 
 unit_test_stkutil_SOURCES = unit/test-stkutil.c src/util.c \
-                               src/storage.c src/smsutil.c \
-                               src/simutil.c src/stkutil.c
+                                src/storage.c src/smsutil.c \
+                                src/simutil.c src/stkutil.c
 unit_test_stkutil_LDADD = @GLIB_LIBS@
 unit_objects += $(unit_test_stkutil_OBJECTS)
 
+unit_test_sms_SOURCES = unit/test-sms.c src/util.c src/smsutil.c src/storage.c
+unit_test_sms_LDADD = @GLIB_LIBS@
+unit_objects += $(unit_test_sms_OBJECTS)
+
+unit_test_cdmasms_SOURCES = unit/test-cdmasms.c src/cdma-smsutil.c
+unit_test_cdmasms_LDADD = @GLIB_LIBS@
+unit_objects += $(unit_test_cdmasms_OBJECTS)
+
+unit_test_sms_root_SOURCES = unit/test-sms.c src/util.c src/smsutil.c src/storage.c
+unit_test_sms_root_LDADD = @GLIB_LIBS@
+unit_objects += $(unit_test_sms_root_OBJECTS)
+
 unit_test_mux_SOURCES = unit/test-mux.c $(gatchat_sources)
 unit_test_mux_LDADD = @GLIB_LIBS@
 unit_objects += $(unit_test_mux_OBJECTS)
@@ -549,14 +668,55 @@ unit_test_caif_SOURCES = unit/test-caif.c $(gatchat_sources) \
 unit_test_caif_LDADD = @GLIB_LIBS@
 unit_objects += $(unit_test_caif_OBJECTS)
 
+TESTS = $(unit_tests)
+
 if TOOLS
-noinst_PROGRAMS += tools/huawei-audio tools/auto-enable
+noinst_PROGRAMS += tools/huawei-audio tools/auto-enable \
+                       tools/get-location tools/lookup-apn \
+                       tools/lookup-provider-name
 
 tools_huawei_audio_SOURCES = $(gdbus_sources) tools/huawei-audio.c
 tools_huawei_audio_LDADD = @GLIB_LIBS@ @DBUS_LIBS@
 
 tools_auto_enable_SOURCES = $(gdbus_sources) tools/auto-enable.c
 tools_auto_enable_LDADD = @GLIB_LIBS@ @DBUS_LIBS@
+
+tools_get_location_SOURCES = tools/get-location.c
+tools_get_location_LDADD = @GLIB_LIBS@ @DBUS_LIBS@
+
+tools_lookup_apn_SOURCES = plugins/mbpi.c plugins/mbpi.h tools/lookup-apn.c
+tools_lookup_apn_LDADD = @GLIB_LIBS@
+
+tools_lookup_provider_name_SOURCES = plugins/mbpi.c plugins/mbpi.h \
+                               tools/lookup-provider-name.c
+tools_lookup_provider_name_LDADD = @GLIB_LIBS@
+
+if QMIMODEM
+noinst_PROGRAMS += tools/qmi
+
+tools_qmi_SOURCES = $(qmi_sources) tools/qmi.c
+tools_qmi_LDADD = @GLIB_LIBS@
+endif
+endif
+
+if DUNDEE
+sbin_PROGRAMS += dundee/dundee
+
+dundee_dundee_SOURCES = $(gdbus_sources) $(gatchat_sources) $(btio_sources) \
+                       src/log.c src/dbus.c plugins/bluetooth.c \
+                       dundee/dundee.h dundee/main.c dundee/dbus.c \
+                       dundee/manager.c dundee/device.c dundee/bluetooth.c
+
+dundee_dundee_LDADD = $(builtin_libadd) @GLIB_LIBS@ @DBUS_LIBS@ -ldl
+
+if DATAFILES
+dist_dbusconf_DATA += dundee/dundee.conf
+
+if SYSTEMD
+systemdunit_DATA += dundee/dundee.service
+endif
+endif
+
 endif
 
 noinst_PROGRAMS += gatchat/gsmdial gatchat/test-server gatchat/test-qcdm
@@ -578,8 +738,6 @@ MAINTAINERCLEANFILES = Makefile.in \
        ltmain.sh depcomp compile missing install-sh mkinstalldirs
 
 
-src/plugin.$(OBJEXT): src/builtin.h
-
 src/builtin.h: src/genbuiltin config.status
        $(AM_V_GEN)$(srcdir)/src/genbuiltin $(builtin_modules) > $@
 
@@ -590,9 +748,9 @@ include/ofono/version.h: include/version.h
        $(AM_V_at)$(MKDIR_P) include/ofono
        $(AM_V_GEN)$(LN_S) $(abs_top_builddir)/$< $@
 
-include/ofono/%.h: include/%.h
+include/ofono/%.h: $(abs_top_srcdir)/include/%.h
        $(AM_V_at)$(MKDIR_P) include/ofono
-       $(AM_V_GEN)$(LN_S) $(abs_top_srcdir)/$< $@
+       $(AM_V_GEN)$(LN_S) $< $@
 
 clean-local:
        @$(RM) -rf include/ofono