Fix ssid selection and a crash on exit.

[dhcpcd-ui] / src / Makefile

diff --git a/src/Makefile b/src/Makefile
index 9555ffabbbb978e9c51613018f0537f54f4e10dd..c51eac1d590ea86e4d7fd9c668470ed01fc20120 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,27 +1,6 @@
-# Makefile based on BSD make.
-# Our mk stubs also work with GNU make.
-# Copyright 2008 Roy Marples <roy@marples.name>
+TOPDIR=                ..
+include ${TOPDIR}/iconfig.mk

 
 

-PROG=          dhcpcd-gtk
-SRCS=          main.c menu.c dhcpcd-config.c prefs.c wpa.c
+SUBDIR=                libdhcpcd dhcpcd-online ${UI}

 
 

-ICONDIR?=      ${PREFIX}/share/dhcpcd/icons
-SYSCONFDIR?=   ${PREFIX}/etc/xdg/autostart
-FILESDIR?=     ${SYSCONFDIR}
-FILES=         dhcpcd-gtk.desktop
-
-CPPFLAGS+=     -DICONDIR=\"${ICONDIR}\"
-
-_PKGCFLAGS_SH= pkg-config --cflags dbus-glib-1 gtk+-2.0 libnotify
-_PKGCFLAGS!=   ${_PKGCFLAGS_SH}
-PKGCFLAGS?=    ${_PKGCFLAGS}$(shell ${_PKGCFLAGS_SH})
-CFLAGS+=       ${PKGCFLAGS}
-
-_PKGLIBS_SH=   pkg-config --libs dbus-glib-1 gtk+-2.0 libnotify
-_PKGLIBS!=     ${_PKGLIBS_SH}
-PKGLIBS?=      ${_PKGLIBS}$(shell ${_PKGLIBS_SH})
-LDADD+=                ${PKGLIBS}
-
-MK=            ../mk
-include ${MK}/sys.mk
-include ${MK}/prog.mk
+include ${MKDIR}/subdir.mk