Describe how we work with wpa_supplicant better.

[dhcpcd-ui] / src / dhcpcd-gtk / Makefile

diff --git a/src/dhcpcd-gtk/Makefile b/src/dhcpcd-gtk/Makefile
index 55781dd38f6e860e72434292b475f89884c4a0a0..56e16ea2f8a2eebd19c2a4c5528746b2abf2584f 100644 (file)
--- a/src/dhcpcd-gtk/Makefile
+++ b/src/dhcpcd-gtk/Makefile
@@ -1,30 +1,19 @@
-# 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
 
 PROG=          dhcpcd-gtk
 SRCS=          main.c menu.c prefs.c wpa.c
 

+TOPDIR=                ../..
+include ${TOPDIR}/config.mk
+

 ICONDIR?=      ${PREFIX}/share/dhcpcd/icons
 ICONDIR?=      ${PREFIX}/share/dhcpcd/icons

-SYSCONFDIR?=   ${PREFIX}/etc/xdg/autostart
-FILESDIR?=     ${SYSCONFDIR}
+AUTOSTARTDIR?= ${PREFIX}/share/gnome/autostart
+FILESDIR=      ${AUTOSTARTDIR}

 FILES=         dhcpcd-gtk.desktop
 FILES=         dhcpcd-gtk.desktop

+MAN8=          dhcpcd-gtk.8

 
 

-include ../libdhcpcd/Makefile.inc
-
-CPPFLAGS+=     -DICONDIR=\"${ICONDIR}\"
-CPPFLAGS+=     -DNOTIFY
-
-_PKGCFLAGS_SH= pkg-config --cflags gtk+-2.0 libnotify
-_PKGCFLAGS!=   ${_PKGCFLAGS_SH}
-PKGCFLAGS?=    ${_PKGCFLAGS}$(shell ${_PKGCFLAGS_SH})
-CFLAGS+=       ${PKGCFLAGS}
+CPPFLAGS+=     ${NOTIFY} -I${TOPDIR}

 
 

-_PKGLIBS_SH=   pkg-config --libs gtk+-2.0 libnotify
-_PKGLIBS!=     ${_PKGLIBS_SH}
-PKGLIBS?=      ${_PKGLIBS}$(shell ${_PKGLIBS_SH})
-LDADD+=                ${PKGLIBS}
+CFLAGS+=       ${GTK_CFLAGS}
+LDADD+=                ${LIB_DHCPCD} ${GTK_LIBS}

 
 

-MK=            ../../mk
-include ${MK}/sys.mk
-include ${MK}/prog.mk
+include ../libdhcpcd/Makefile.inc
+include ${MKDIR}/prog.mk