Use correct flags for PPP plugin

[connman] / plugins / Makefile.am

diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index a7db873..f2b280c 100644 (file)
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -1,9 +1,7 @@
 
 plugindir = $(libdir)/connman/plugins
 
-plugin_LTLIBRARIES = ethernet.la bluetooth.la \
-                               ipv4.la udhcp.la dhclient.la \
-                               dnsproxy.la resolvconf.la resolvfile.la
+plugin_LTLIBRARIES = ethernet.la bluetooth.la ipv4.la dnsproxy.la
 
 if LOOPBACK
 plugin_LTLIBRARIES += loopback.la
@@ -23,10 +21,16 @@ endif
 bluetooth_la_SOURCES = bluetooth.c inet.h inet.c
 bluetooth_la_LIBADD = @GDBUS_LIBS@
 
+if NOVATEL
+plugin_LTLIBRARIES += novatel.la
+
+novatel_la_SOURCES = novatel.c modem.h modem.c
+endif
+
 if HUAWEI
 plugin_LTLIBRARIES += huawei.la
 
-huawei_la_SOURCES = huawei.c modem.h modem.
+huawei_la_SOURCES = huawei.c modem.h modem.c
 endif
 
 if HSO
@@ -37,26 +41,37 @@ endif
 
 ipv4_la_SOURCES = ipv4.c inet.h inet.c
 
+if UDHCP
+plugin_LTLIBRARIES += udhcp.la
+
 udhcp_la_SOURCES = udhcp.c inet.h inet.c task.h task.c
 udhcp_la_CFLAGS = @GLIB_CFLAGS@ @GDBUS_CFLAGS@ -DUDHCPC=\"@UDHCPC@\" \
                -DSTATEDIR=\""$(statedir)"\" -DSCRIPTDIR=\""$(scriptdir)"\"
+endif
+
+if DHCLIENT
+plugin_LTLIBRARIES += dhclient.la
 
 dhclient_la_SOURCES = dhclient.c inet.h inet.c
 dhclient_la_CFLAGS = @GLIB_CFLAGS@ @GDBUS_CFLAGS@ -DDHCLIENT=\"@DHCLIENT@\" \
                -DSTATEDIR=\""$(statedir)"\" -DSCRIPTDIR=\""$(scriptdir)"\"
+endif
 
 if PPPD
 plugin_LTLIBRARIES += pppd.la
 
 pppd_la_SOURCES = pppd.c
+pppd_la_CFLAGS = @GLIB_CFLAGS@ -DPPPD=\"@PPPD@\"
 endif
 
 dnsproxy_la_SOURCES = dnsproxy.c
 
+if RESOLVCONF
+plugin_LTLIBRARIES += resolvconf.la
+
 resolvconf_la_SOURCES = resolvconf.c
 resolvconf_la_CFLAGS = @GLIB_CFLAGS@ -DRESOLVCONF=\"@RESOLVCONF@\"
-
-resolvfile_la_SOURCES = resolvfile.c
+endif
 
 if POLKIT
 plugin_LTLIBRARIES += polkit.la