about summary refs log tree commit diff
path: root/src/Makefile.am
diff options
context:
space:
mode:
Diffstat (limited to 'src/Makefile.am')
-rw-r--r--src/Makefile.am18
1 files changed, 5 insertions, 13 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 9d306a7e..3ca5a7da 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -198,11 +198,9 @@ NetworkManager_SOURCES = \
 		nm-connection-provider.h \
 		nm-connection-provider.c \
 		nm-dispatcher.c \
-		nm-dispatcher.h
-
-if WITH_CONCHECK
-NetworkManager_SOURCES += nm-connectivity.c nm-connectivity.h
-endif
+		nm-dispatcher.h \
+		nm-connectivity.c \
+		nm-connectivity.h
 
 if SESSION_TRACKING_SYSTEMD
 NetworkManager_SOURCES += nm-session-monitor-systemd.c
@@ -302,6 +300,7 @@ NetworkManager_CPPFLAGS = \
 	$(LIBNL_CFLAGS) \
 	$(POLKIT_CFLAGS) \
 	$(SYSTEMD_LOGIN_CFLAGS) \
+	$(LIBSOUP_CFLAGS) \
 	-DBINDIR=\"$(bindir)\" \
 	-DSBINDIR=\"$(sbindir)\" \
 	-DLIBEXECDIR=\"$(libexecdir)\" \
@@ -315,10 +314,6 @@ NetworkManager_CPPFLAGS = \
 	-DNMSTATEDIR=\"$(nmstatedir)\" \
 	-DARP_DEBUG
 
-if WITH_CONCHECK
-NetworkManager_CPPFLAGS += $(LIBSOUP_CFLAGS)
-endif
-
 if SESSION_TRACKING_CK
 NetworkManager_CPPFLAGS += -DCKDB_PATH=\"${CKDB_PATH}\"
 endif
@@ -346,13 +341,10 @@ NetworkManager_LDADD = \
 	$(LIBNL_LIBS) \
 	$(POLKIT_LIBS) \
 	$(SYSTEMD_LOGIN_LIBS) \
+	$(LIBSOUP_LIBS) \
 	$(LIBM) \
 	$(LIBDL)
 
-if WITH_CONCHECK
-NetworkManager_LDADD += $(LIBSOUP_LIBS)
-endif
-
 NetworkManager_LDFLAGS = -rdynamic
 
 dbusservicedir = $(DBUS_SYS_DIR)