X-Git-Url: https://roy.marples.name/git

diff --git a/src/dhcpcd-gtk/Makefile b/src/dhcpcd-gtk/Makefile
index 55781dd..3652970 100644
--- a/src/dhcpcd-gtk/Makefile
+++ b/src/dhcpcd-gtk/Makefile
@@ -1,30 +1,27 @@
-# Makefile based on BSD make.
-# Our mk stubs also work with GNU make.
-# Copyright 2008 Roy Marples <roy@marples.name>
-
 PROG=		dhcpcd-gtk
 SRCS=		main.c menu.c prefs.c wpa.c
 
+TOPDIR=		../..
+include ${TOPDIR}/iconfig.mk
+
 ICONDIR?=	${PREFIX}/share/dhcpcd/icons
-SYSCONFDIR?=	${PREFIX}/etc/xdg/autostart
-FILESDIR?=	${SYSCONFDIR}
+APPDIR?=	${PREFIX}/share/applications
+AUTOSTARTDIR?=	${SYSCONFDIR}/xdg/autostart
+FILESDIR=	${APPDIR}
 FILES=		dhcpcd-gtk.desktop
+FILESDIR2=	${AUTOSTARTDIR}
+FILES2=		dhcpcd-gtk.desktop
+MAN8=		dhcpcd-gtk.8
 
-include ../libdhcpcd/Makefile.inc
+CPPFLAGS+=	${NOTIFY} -I${TOPDIR}
 
-CPPFLAGS+=	-DICONDIR=\"${ICONDIR}\"
-CPPFLAGS+=	-DNOTIFY
+CFLAGS+=	${GTK_CFLAGS}
+LDADD+=		${LIB_DHCPCD} ${GTK_LIBS}
 
-_PKGCFLAGS_SH=	pkg-config --cflags gtk+-2.0 libnotify
-_PKGCFLAGS!=	${_PKGCFLAGS_SH}
-PKGCFLAGS?=	${_PKGCFLAGS}$(shell ${_PKGCFLAGS_SH})
-CFLAGS+=	${PKGCFLAGS}
+.PHONY: dhcpcd-gtk
 
-_PKGLIBS_SH=	pkg-config --libs gtk+-2.0 libnotify
-_PKGLIBS!=	${_PKGLIBS_SH}
-PKGLIBS?=	${_PKGLIBS}$(shell ${_PKGLIBS_SH})
-LDADD+=		${PKGLIBS}
+include ../libdhcpcd/Makefile.inc
 
-MK=		../../mk
-include ${MK}/sys.mk
-include ${MK}/prog.mk
+FILESINSTALL=	_filesinstall
+include ${MKDIR}/prog.mk
+include ${MKDIR}/files.mk