1 files changed, 14 insertions, 62 deletions
diff --git a/src/dhcp-manager/Makefile.am b/src/dhcp-manager/Makefile.am
index f32a2167..63eac9d5 100644
--- a/src/dhcp-manager/Makefile.am
+++ b/src/dhcp-manager/Makefile.am
@@ -1,71 +1,23 @@
-SUBDIRS = . tests
+libexec_PROGRAMS = nm-dhcp-helper
 
-AM_CPPFLAGS = \
-	-I${top_srcdir} \
-	-I${top_builddir}/include \
-	-I${top_srcdir}/include \
-	-I${top_builddir}/src/generated \
-	-I${top_srcdir}/src/generated \
-	-I${top_srcdir}/src/logging \
-	-I${top_srcdir}/src/posix-signals \
-	-I${top_builddir}/libnm-util \
-	-I${top_srcdir}/libnm-util \
-	-I${top_srcdir}/src \
-	-DRUNDIR=\"$(rundir)\"
+nm_dhcp_helper_SOURCES = nm-dhcp-helper.c
 
-noinst_LTLIBRARIES = libdhcp-manager.la libdhcp-dhclient.la
-
-################## dhclient ##################
-
-libdhcp_dhclient_la_SOURCES = \
-	nm-dhcp-dhclient-utils.h \
-	nm-dhcp-dhclient-utils.c \
-	nm-dhcp-dhclient.h \
-	nm-dhcp-dhclient.c
-
-libdhcp_dhclient_la_CPPFLAGS = \
+nm_dhcp_helper_CPPFLAGS = \
 	$(DBUS_CFLAGS) \
-	$(GLIB_CFLAGS) \
-	$(AM_CPPFLAGS) \
-	-DSYSCONFDIR=\"$(sysconfdir)\" \
-	-DLIBEXECDIR=\"$(libexecdir)\" \
-	-DLOCALSTATEDIR=\"$(localstatedir)\" \
-	-DDHCLIENT_PATH=\"$(DHCLIENT_PATH)\" \
-	-DNMSTATEDIR=\"$(nmstatedir)\" \
-	-DNMCONFDIR=\"$(nmconfdir)\"
+	-DG_LOG_DOMAIN=\""nm-dhcp-helper"\" \
+	-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
+	-DNMRUNDIR=\"$(nmrundir)\"
 
-libdhcp_dhclient_la_LIBADD = \
-	$(top_builddir)/src/logging/libnm-logging.la \
-	$(top_builddir)/src/posix-signals/libnm-posix-signals.la \
-	$(top_builddir)/libnm-util/libnm-util.la \
-	$(DBUS_LIBS) \
-	$(GLIB_LIBS)
+nm_dhcp_helper_LDADD = $(DBUS_LIBS)
 
-################## main lib ##################
 
-libdhcp_manager_la_SOURCES = \
-	nm-dhcp-client.c \
-	nm-dhcp-client.h \
-	nm-dhcp-manager.c \
-	nm-dhcp-manager.h \
-	nm-dhcp-dhcpcd.h \
-	nm-dhcp-dhcpcd.c
+# FIXME: remove when dbus-glib >= 0.100 is required
+dhcp_helper_conf = nm-dhcp-helper.conf
 
-libdhcp_manager_la_CPPFLAGS = \
-	$(DBUS_CFLAGS) \
-	$(GLIB_CFLAGS) \
-	$(AM_CPPFLAGS) \
-	-DSYSCONFDIR=\"$(sysconfdir)\" \
-	-DLIBEXECDIR=\"$(libexecdir)\" \
-	-DLOCALSTATEDIR=\"$(localstatedir)\" \
-	-DDHCLIENT_PATH=\"$(DHCLIENT_PATH)\" \
-	-DDHCPCD_PATH=\"$(DHCPCD_PATH)\" \
-	-DNMSTATEDIR=\"$(nmstatedir)\"
+if !HAVE_DBUS_GLIB_100
+dbusservicedir = $(DBUS_SYS_DIR)
+dbusservice_DATA = $(dhcp_helper_conf)
+endif
 
-libdhcp_manager_la_LIBADD = \
-	$(top_builddir)/src/logging/libnm-logging.la \
-	$(top_builddir)/src/posix-signals/libnm-posix-signals.la \
-	$(builddir)/libdhcp-dhclient.la \
-	$(DBUS_LIBS) \
-	$(GLIB_LIBS)
+EXTRA_DIST = $(dhcp_helper_conf)