diff options
| author | Pekka Pessi <Pekka.Pessi@nokia.com> | 2010-11-05 00:45:07 +0200 |
|---|---|---|
| committer | Pekka Pessi <Pekka.Pessi@nokia.com> | 2010-11-05 16:14:39 +0200 |
| commit | e2171a4530b061502c997ef9d1176f152a50f9d9 (patch) | |
| tree | 721d4c53973d207fad0cad66f208391c8e0f689c | |
| parent | 4b633046a712cca93f3ab5c067b126b6c3840b48 (diff) | |
Combine modem library components into single library
| -rw-r--r-- | modem/Makefile.am | 18 | ||||
| -rw-r--r-- | modem/tests/Makefile.am | 5 | ||||
| -rw-r--r-- | src/Makefile.am | 8 |
3 files changed, 8 insertions, 23 deletions
diff --git a/modem/Makefile.am b/modem/Makefile.am index a5452b4..5e2483e 100644 --- a/modem/Makefile.am +++ b/modem/Makefile.am @@ -23,10 +23,7 @@ LIBADD = @TP_LIBS@ @DBUS_LIBS@ @GLIB_LIBS@ @UUID_LIBS@ # Build targets lib_LTLIBRARIES = \ - libmodem-glib.la \ - libmodem-call-glib.la \ - libmodem-sms-glib.la \ - libmodem-sim-glib.la + libmodem-glib.la noinst_LTLIBRARIES = @@ -45,21 +42,15 @@ libmodem_glib_la_LIBADD = ${LIBADD} modem_HEADERS += call.h tones.h -libmodem_call_glib_la_SOURCES = call-service.c call.c tones.c - -libmodem_call_glib_la_LIBADD = libmodem-glib.la ${LIBADD} +libmodem_glib_la_SOURCES += call-service.c call.c tones.c modem_HEADERS += sms.h -libmodem_sms_glib_la_SOURCES = sms-service.c - -libmodem_sms_glib_la_LIBADD = libmodem-glib.la ../sms-glib/libsms-glib.la ${LIBADD} +libmodem_glib_la_SOURCES += sms-service.c modem_HEADERS += sim.h -libmodem_sim_glib_la_SOURCES = sim-service.c - -libmodem_sim_glib_la_LIBADD = libmodem-glib.la ${LIBADD} +libmodem_glib_la_SOURCES += sim-service.c # ---------------------------------------------------------------------- @@ -89,7 +80,6 @@ CLEANFILES = ${BUILT_SOURCES} noinst_LTLIBRARIES += libtest-modem-sms.la libtest_modem_sms_la_SOURCES = \ - $(libmodem_sms_la_SOURCES) \ $(nodist_libmodem_sms_glib_la_SOURCES) libtest_modem_sms_la_LIBADD = libmodem-glib.la diff --git a/modem/tests/Makefile.am b/modem/tests/Makefile.am index 5dc6feb..ffc882b 100644 --- a/modem/tests/Makefile.am +++ b/modem/tests/Makefile.am @@ -17,10 +17,9 @@ test_modem_SOURCES = \ base.h base.c derived.h derived.c # test-modem-sms.c -test_modem_LDADD = ../libmodem-call-glib.la \ - ../libmodem-sim-glib.la \ - ../libtest-modem-sms.la \ +test_modem_LDADD = \ ../libmodem-glib.la \ + ../../sms-glib/libsms-glib.la \ ../../tests/libtestcommon.la \ @TP_LIBS@ @DBUS_LIBS@ @GLIB_LIBS@ \ @CHECK_LIBS@ diff --git a/src/Makefile.am b/src/Makefile.am index 07ca91b..68df9c1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -32,10 +32,8 @@ test_ring_SOURCES = tests/test-ring.h tests/test-ring.c tests/test-ring-util.c test_ring_LDADD = \ libtpring.la $(TP_EXTLIB) \ - ../modem/libmodem-call-glib.la \ - ../modem/libmodem-sms-glib.la \ - ../modem/libmodem-sim-glib.la \ ../modem/libmodem-glib.la \ + ../sms-glib/libsms-glib.la \ ../tests/libtestcommon.la \ @TP_LIBS@ @DBUS_LIBS@ @GLIB_LIBS@ \ @CHECK_LIBS@ -lpthread @@ -64,10 +62,8 @@ TP_EXTLIB += $(top_builddir)/ring-extensions/libtpextensions.a telepathy_ring_LDADD = \ libtpring.la $(TP_EXTLIB) \ - ../modem/libmodem-call-glib.la \ - ../modem/libmodem-sms-glib.la \ - ../modem/libmodem-sim-glib.la \ ../modem/libmodem-glib.la \ + ../sms-glib/libsms-glib.la \ @TP_LIBS@ @DBUS_LIBS@ @GLIB_LIBS@ \ -lpthread |