diff options
| author | Aleksander Morgado <aleksander@lanedo.com> | 2012-10-02 15:08:46 +0200 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@lanedo.com> | 2012-10-04 10:17:05 +0200 |
| commit | b6d628b3a10bf183b918c7afe89a5b260eb87760 (patch) | |
| tree | 8d87e92f2d8b7da99e6a0e41e49a6aa0ebbf55bd /cli | |
| parent | 624fdb6ab4544a82774e9805332cc242c1068b0f (diff) | |
build: merge libmm-common into libmm-glib
It's pointless to have libmm-common around, just merge it into libmm-glib and
make ModemManager depend on libmm-glib directly. At the end, the non-common
stuff in libmm-glib is really minimal.
Diffstat (limited to 'cli')
| -rw-r--r-- | cli/Makefile.am | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/cli/Makefile.am b/cli/Makefile.am index 394113c7..12126ec1 100644 --- a/cli/Makefile.am +++ b/cli/Makefile.am @@ -5,9 +5,9 @@ mmcli_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/include \ -I$(top_builddir)/include \ - -I$(top_srcdir)/libmm-common \ - -I$(top_builddir)/libmm-common \ - -I$(top_srcdir)/libmm-glib + -I$(top_srcdir)/libmm-glib \ + -I${top_srcdir}/libmm-glib/generated \ + -I${top_builddir}/libmm-glib/generated mmcli_SOURCES = \ mmcli.h \ @@ -29,5 +29,4 @@ mmcli_SOURCES = \ mmcli_LDADD = \ $(MMCLI_LIBS) \ - $(top_builddir)/libmm-common/libmm-common.la \ $(top_builddir)/libmm-glib/libmm-glib.la |