summary refs log tree commit diff
path: root/src/devices/wwan/Makefile.am
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2015-01-22 00:29:39 +0100
committerMichael Biebl <biebl@debian.org>2015-01-22 00:29:39 +0100
commit2c032d8f1c6292c1338a615e6ec40252889ba85c (patch)
tree1f77182220b2b0264288ba4a476ab47e5bc48716 /src/devices/wwan/Makefile.am
parent33491bc4279481db8ae47213e34a6d695a0e8830 (diff)
Imported Upstream version 1.0.0 upstream/1.0.0
Diffstat (limited to 'src/devices/wwan/Makefile.am')
-rw-r--r--src/devices/wwan/Makefile.am19
1 files changed, 5 insertions, 14 deletions
diff --git a/src/devices/wwan/Makefile.am b/src/devices/wwan/Makefile.am
index 988f4679..7e5b190b 100644
--- a/src/devices/wwan/Makefile.am
+++ b/src/devices/wwan/Makefile.am
@@ -5,18 +5,16 @@ include $(GLIB_MAKEFILE)
 AM_CPPFLAGS = \
 	-I${top_srcdir}/src \
 	-I${top_builddir}/src \
-	-I${top_srcdir}/src/logging \
 	-I${top_srcdir}/src/devices \
 	-I${top_srcdir}/src/settings \
 	-I${top_srcdir}/src/platform \
-	-I${top_builddir}/include \
 	-I${top_srcdir}/include \
-	-I${top_builddir}/libnm-util \
-	-I${top_srcdir}/libnm-util \
+	-I${top_builddir}/libnm-core \
+	-I${top_srcdir}/libnm-core \
 	-DG_LOG_DOMAIN=\""NetworkManager-wwan"\" \
+	-DNETWORKMANAGER_COMPILATION \
 	-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
 	$(DBUS_CFLAGS) \
-	$(POLKIT_CFLAGS) \
 	$(MM_GLIB_CFLAGS)
 
 BUILT_SOURCES = $(null)
@@ -33,9 +31,8 @@ nm_modem_enum_types_sources = $(srcdir)/nm-modem.h
 BUILT_SOURCES += $(GLIB_GENERATED)
 
 libnm_wwan_la_SOURCES = \
-	nm-modem-old.c \
-	nm-modem-old.h \
-	nm-modem-old-types.h \
+	nm-modem-broadband.c \
+	nm-modem-broadband.h \
 	nm-modem-manager.c \
 	nm-modem-manager.h \
 	nm-modem.c \
@@ -43,12 +40,6 @@ libnm_wwan_la_SOURCES = \
 	\
 	$(GLIB_GENERATED)
 
-if WITH_MODEM_MANAGER_1
-libnm_wwan_la_SOURCES += \
-	nm-modem-broadband.c \
-	nm-modem-broadband.h
-endif
-
 WWAN_SYMBOL_VIS_FILE=$(srcdir)/wwan-exports.ver
 
 libnm_wwan_la_LDFLAGS = \