diff options
| author | Michael Biebl <biebl@debian.org> | 2012-08-07 22:16:17 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2012-08-07 22:16:17 +0200 |
| commit | 44826499c23720be3d74ab674c4fd38912c5b8c2 (patch) | |
| tree | 613bec9c2242e5e0700bef1ba87ca2d25d755795 /src/modem-manager | |
| parent | 9a8ff86a032d1e4dd04238fcde856b145406df6f (diff) | |
| parent | 8c98b34228abb4dfde822ad89106b4d8b2287639 (diff) | |
Merge tag 'upstream/0.9.6.0' into experimental
Upstream version 0.9.6.0
Diffstat (limited to 'src/modem-manager')
| -rw-r--r-- | src/modem-manager/Makefile.am | 8 | ||||
| -rw-r--r-- | src/modem-manager/Makefile.in | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/modem-manager/Makefile.am b/src/modem-manager/Makefile.am index a5c6a668..b9cc7644 100644 --- a/src/modem-manager/Makefile.am +++ b/src/modem-manager/Makefile.am @@ -2,13 +2,13 @@ include $(GLIB_MAKEFILE) INCLUDES = \ -I${top_srcdir}/src \ - -I${top_srcdir}/src/generated \ -I${top_builddir}/src/generated \ + -I${top_srcdir}/src/generated \ -I${top_srcdir}/src/logging \ - -I${top_srcdir}/include \ -I${top_builddir}/include \ - -I${top_srcdir}/libnm-util \ - -I${top_builddir}/libnm-util + -I${top_srcdir}/include \ + -I${top_builddir}/libnm-util \ + -I${top_srcdir}/libnm-util noinst_LTLIBRARIES = libmodem-manager.la diff --git a/src/modem-manager/Makefile.in b/src/modem-manager/Makefile.in index c19ac7b9..7d6a7f7b 100644 --- a/src/modem-manager/Makefile.in +++ b/src/modem-manager/Makefile.in @@ -335,13 +335,13 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ INCLUDES = \ -I${top_srcdir}/src \ - -I${top_srcdir}/src/generated \ -I${top_builddir}/src/generated \ + -I${top_srcdir}/src/generated \ -I${top_srcdir}/src/logging \ - -I${top_srcdir}/include \ -I${top_builddir}/include \ - -I${top_srcdir}/libnm-util \ - -I${top_builddir}/libnm-util + -I${top_srcdir}/include \ + -I${top_builddir}/libnm-util \ + -I${top_srcdir}/libnm-util noinst_LTLIBRARIES = libmodem-manager.la libmodem_manager_la_SOURCES = \ |