Install a dhcpcd icon so menu entries work.
authorRoy Marples <roy@marples.name>
Tue, 16 Sep 2014 19:33:23 +0000 (19:33 +0000)
committerRoy Marples <roy@marples.name>
Tue, 16 Sep 2014 19:33:23 +0000 (19:33 +0000)
25 files changed:
configure
icons/Makefile
icons/hicolor/16x16/Makefile [new file with mode: 0644]
icons/hicolor/16x16/Makefile.inc [new file with mode: 0644]
icons/hicolor/16x16/apps/Makefile [new file with mode: 0644]
icons/hicolor/22x22/Makefile [new file with mode: 0644]
icons/hicolor/22x22/Makefile.inc [new file with mode: 0644]
icons/hicolor/22x22/apps/Makefile [new file with mode: 0644]
icons/hicolor/24x24/Makefile [new file with mode: 0644]
icons/hicolor/24x24/Makefile.inc [new file with mode: 0644]
icons/hicolor/24x24/apps/Makefile [new file with mode: 0644]
icons/hicolor/32x32/Makefile [new file with mode: 0644]
icons/hicolor/32x32/Makefile.inc [new file with mode: 0644]
icons/hicolor/32x32/apps/Makefile [new file with mode: 0644]
icons/hicolor/48x48/Makefile [new file with mode: 0644]
icons/hicolor/48x48/Makefile.inc [new file with mode: 0644]
icons/hicolor/48x48/apps/Makefile [new file with mode: 0644]
icons/hicolor/Makefile [new file with mode: 0644]
icons/hicolor/Makefile.inc [new file with mode: 0644]
icons/scalable/Makefile
icons/scalable/README
mk/files.mk
src/dhcpcd-gtk/Makefile
src/dhcpcd-gtk/dhcpcd-gtk.desktop
src/dhcpcd-qt/dhcpcd-qt.pro

index fece384e2865ad943e428e742f29ac21182944a8..257f112d7e75c0d8b598499ab3da465999d091ef 100755 (executable)
--- a/configure
+++ b/configure
@@ -34,7 +34,6 @@ for x; do
        --includedir) eval INCLUDEDIR="$INCLUDEDIR${INCLUDEDIR:+ }$var";;
        --datadir|--infodir) ;; # ignore autotools
        --disable-maintainer-mode|--disable-dependency-tracking) ;;
-       --icondir) ICONDIR=$var;;
        --with-gtk|--with-gtk+) WITH_GTK=${var:-yes};;
        --without-gtk|--without-gtk+) WITH_GTK=no;;
        --with-qt) WITH_QT=${var:-yes};;
@@ -127,9 +126,9 @@ echo "# $OS" >$CONFIG_MK
 echo "/* $OS */" >$CONFIG_H
 
 VERSION=$($SED -ne 's/VERSION= //p' Makefile)
-echo "#define VERSION \"$VERSION\"" >>$CONFIG_H
+echo "#define VERSION          \"$VERSION\"" >>$CONFIG_H
 
-for x in PREFIX SYSCONFDIR BINDIR ICONDIR; do
+for x in PREFIX SYSCONFDIR BINDIR; do
        eval v=\$$x
        # Make files look nice for import
        l=$((10 - ${#x}))
@@ -140,7 +139,8 @@ for x in PREFIX SYSCONFDIR BINDIR ICONDIR; do
        [ $l -gt 2 ] && t="     "
        echo "#define $x$t      \"$v\"" >>$CONFIG_H
 done
-echo "MANDIR=          ${MANDIR}" >>$CONFIG_MK
+echo "#define ICONDIR          \"$ICONDIR\"" >>$CONFIG_H
+echo "MANDIR=          $MANDIR" >>$CONFIG_MK
 
 # Always obey CC.
 # However, if CC is not specified and we are given GNU style
@@ -366,7 +366,7 @@ elif [ -n "$WITH_QT" -a "$WITH_QT" != no ]; then
 fi
 
 if [ -n "$UI" ]; then
-       echo "MKICONS=          icons" >>$CONFIG_MK
+       echo "MKICONS=  icons" >>$CONFIG_MK
 fi
 echo "UI=              $UI" >>$CONFIG_MK
 
index e99c78c951d2caebb021d43623c85b6b7cf67ca3..92404bc9132566112ddd966b0ee8c2e8ee02d0ab 100644 (file)
@@ -1,4 +1,4 @@
-SUBDIR=        16x16 22x22 24x24 32x32 48x48 scalable
+SUBDIR=        16x16 22x22 24x24 32x32 48x48 scalable hicolor
 
 MK=    ../mk
 include ${MK}/subdir.mk
diff --git a/icons/hicolor/16x16/Makefile b/icons/hicolor/16x16/Makefile
new file mode 100644 (file)
index 0000000..e5e2a1e
--- /dev/null
@@ -0,0 +1,5 @@
+SUBDIR=        apps
+
+TOPDIR=                ../../..
+include ${TOPDIR}/iconfig.mk
+include ${MKDIR}/subdir.mk
diff --git a/icons/hicolor/16x16/Makefile.inc b/icons/hicolor/16x16/Makefile.inc
new file mode 100644 (file)
index 0000000..fdc0061
--- /dev/null
@@ -0,0 +1,11 @@
+SRCDIR=                ../../../scalable
+
+# .PATH is for BSD make, VPATH is for GNU make
+.PATH:         ${SRCDIR}/${CATEGORY}
+VPATH+=                ${SRCDIR}/${CATEGORY}
+
+SIZE=          16
+
+TOPDIR=                ../../../..
+include ${TOPDIR}/iconfig.mk
+include ${MKDIR}/icon.mk
diff --git a/icons/hicolor/16x16/apps/Makefile b/icons/hicolor/16x16/apps/Makefile
new file mode 100644 (file)
index 0000000..b136cb5
--- /dev/null
@@ -0,0 +1,5 @@
+CATEGORY=      apps
+SRCS=          dhcpcd.svg
+
+ICONDIR=       ${PREFIX}/share/icons
+include                ../Makefile.inc
diff --git a/icons/hicolor/22x22/Makefile b/icons/hicolor/22x22/Makefile
new file mode 100644 (file)
index 0000000..e5e2a1e
--- /dev/null
@@ -0,0 +1,5 @@
+SUBDIR=        apps
+
+TOPDIR=                ../../..
+include ${TOPDIR}/iconfig.mk
+include ${MKDIR}/subdir.mk
diff --git a/icons/hicolor/22x22/Makefile.inc b/icons/hicolor/22x22/Makefile.inc
new file mode 100644 (file)
index 0000000..12fa8b2
--- /dev/null
@@ -0,0 +1,11 @@
+SRCDIR=                ../../../scalable
+
+# .PATH is for BSD make, VPATH is for GNU make
+.PATH:         ${SRCDIR}/${CATEGORY}
+VPATH+=                ${SRCDIR}/${CATEGORY}
+
+SIZE=          22
+
+TOPDIR=                ../../../..
+include ${TOPDIR}/iconfig.mk
+include ${MKDIR}/icon.mk
diff --git a/icons/hicolor/22x22/apps/Makefile b/icons/hicolor/22x22/apps/Makefile
new file mode 100644 (file)
index 0000000..b136cb5
--- /dev/null
@@ -0,0 +1,5 @@
+CATEGORY=      apps
+SRCS=          dhcpcd.svg
+
+ICONDIR=       ${PREFIX}/share/icons
+include                ../Makefile.inc
diff --git a/icons/hicolor/24x24/Makefile b/icons/hicolor/24x24/Makefile
new file mode 100644 (file)
index 0000000..e5e2a1e
--- /dev/null
@@ -0,0 +1,5 @@
+SUBDIR=        apps
+
+TOPDIR=                ../../..
+include ${TOPDIR}/iconfig.mk
+include ${MKDIR}/subdir.mk
diff --git a/icons/hicolor/24x24/Makefile.inc b/icons/hicolor/24x24/Makefile.inc
new file mode 100644 (file)
index 0000000..4038cea
--- /dev/null
@@ -0,0 +1,11 @@
+SRCDIR=                ../../../scalable
+
+# .PATH is for BSD make, VPATH is for GNU make
+.PATH:         ${SRCDIR}/${CATEGORY}
+VPATH+=                ${SRCDIR}/${CATEGORY}
+
+SIZE=          24
+
+TOPDIR=                ../../../..
+include ${TOPDIR}/iconfig.mk
+include ${MKDIR}/icon.mk
diff --git a/icons/hicolor/24x24/apps/Makefile b/icons/hicolor/24x24/apps/Makefile
new file mode 100644 (file)
index 0000000..b136cb5
--- /dev/null
@@ -0,0 +1,5 @@
+CATEGORY=      apps
+SRCS=          dhcpcd.svg
+
+ICONDIR=       ${PREFIX}/share/icons
+include                ../Makefile.inc
diff --git a/icons/hicolor/32x32/Makefile b/icons/hicolor/32x32/Makefile
new file mode 100644 (file)
index 0000000..e5e2a1e
--- /dev/null
@@ -0,0 +1,5 @@
+SUBDIR=        apps
+
+TOPDIR=                ../../..
+include ${TOPDIR}/iconfig.mk
+include ${MKDIR}/subdir.mk
diff --git a/icons/hicolor/32x32/Makefile.inc b/icons/hicolor/32x32/Makefile.inc
new file mode 100644 (file)
index 0000000..dabbaad
--- /dev/null
@@ -0,0 +1,11 @@
+SRCDIR=                ../../../scalable
+
+# .PATH is for BSD make, VPATH is for GNU make
+.PATH:         ${SRCDIR}/${CATEGORY}
+VPATH+=                ${SRCDIR}/${CATEGORY}
+
+SIZE=          32
+
+TOPDIR=                ../../../..
+include ${TOPDIR}/iconfig.mk
+include ${MKDIR}/icon.mk
diff --git a/icons/hicolor/32x32/apps/Makefile b/icons/hicolor/32x32/apps/Makefile
new file mode 100644 (file)
index 0000000..b136cb5
--- /dev/null
@@ -0,0 +1,5 @@
+CATEGORY=      apps
+SRCS=          dhcpcd.svg
+
+ICONDIR=       ${PREFIX}/share/icons
+include                ../Makefile.inc
diff --git a/icons/hicolor/48x48/Makefile b/icons/hicolor/48x48/Makefile
new file mode 100644 (file)
index 0000000..e5e2a1e
--- /dev/null
@@ -0,0 +1,5 @@
+SUBDIR=        apps
+
+TOPDIR=                ../../..
+include ${TOPDIR}/iconfig.mk
+include ${MKDIR}/subdir.mk
diff --git a/icons/hicolor/48x48/Makefile.inc b/icons/hicolor/48x48/Makefile.inc
new file mode 100644 (file)
index 0000000..867d251
--- /dev/null
@@ -0,0 +1,11 @@
+SRCDIR=                ../../../scalable
+
+# .PATH is for BSD make, VPATH is for GNU make
+.PATH:         ${SRCDIR}/${CATEGORY}
+VPATH+=                ${SRCDIR}/${CATEGORY}
+
+SIZE=          48
+
+TOPDIR=                ../../../..
+include ${TOPDIR}/iconfig.mk
+include ${MKDIR}/icon.mk
diff --git a/icons/hicolor/48x48/apps/Makefile b/icons/hicolor/48x48/apps/Makefile
new file mode 100644 (file)
index 0000000..b136cb5
--- /dev/null
@@ -0,0 +1,5 @@
+CATEGORY=      apps
+SRCS=          dhcpcd.svg
+
+ICONDIR=       ${PREFIX}/share/icons
+include                ../Makefile.inc
diff --git a/icons/hicolor/Makefile b/icons/hicolor/Makefile
new file mode 100644 (file)
index 0000000..5cf97ed
--- /dev/null
@@ -0,0 +1,4 @@
+SUBDIR=        16x16 22x22 24x24 32x32 48x48
+
+MK=    ../../mk
+include ${MK}/subdir.mk
diff --git a/icons/hicolor/Makefile.inc b/icons/hicolor/Makefile.inc
new file mode 100644 (file)
index 0000000..aa65f16
--- /dev/null
@@ -0,0 +1 @@
+ICONDIR?=      ${PREFIX}/share/dhcpcd/icons
index 61a626da7f463d863f7cd6ad18d2c4fe192c05fe..9ab9f8c3c02e83a3f7ad7c35251af12fb32fd0ed 100644 (file)
@@ -1,4 +1,4 @@
-SUBDIR=        actions devices status
+SUBDIR=        apps actions devices status
 
 TOPDIR=                ../..
 include ${TOPDIR}/iconfig.mk
index 73e07422c06fb8597f56cbecb2c185e11d119848..cc0dcc167757df569e0a8ee53bd129a17389ef64 100644 (file)
@@ -3,3 +3,5 @@ http://tango.freedesktop.org
 
 They are Public Domain and I give them thanks for making their quality work
 availble to all :)
+
+apps/dhcpcd.svg is a copy of status/network-transmit-receive.svg
index 8e418e575e712d8919675bc0f232d7bbaf8f8f8f..5b09e59eae3a2510685b20888fc577f2cdf0d08e 100644 (file)
@@ -9,3 +9,6 @@ FILESINSTALL=   _filesinstall
 _filesinstall:
        ${INSTALL} -d ${DESTDIR}${FILESDIR}
        ${INSTALL} -m ${FILESMODE} ${FILES} ${DESTDIR}${FILESDIR}
+       ${INSTALL} -d ${DESTDIR}${FILESDIR2}
+       ${INSTALL} -m ${FILESMODE} ${FILES2} ${DESTDIR}${FILESDIR2}
+
index 3f070588d4460751a2399b595f45f3059bbb1699..c9c57b2169265866d6260aa25f80407f6190e6a1 100644 (file)
@@ -5,9 +5,12 @@ TOPDIR=                ../..
 include ${TOPDIR}/iconfig.mk
 
 ICONDIR?=      ${PREFIX}/share/dhcpcd/icons
+APPDIR?=       ${PREFIX}/share/applications
 AUTOSTARTDIR?= ${PREFIX}/share/gnome/autostart
-FILESDIR=      ${AUTOSTARTDIR}
+FILESDIR=      ${APPDIR}
 FILES=         dhcpcd-gtk.desktop
+FILESDIR2=     ${AUTOSTARTDIR}
+FILES2=                dhcpcd-gtk.desktop
 MAN8=          dhcpcd-gtk.8
 
 CPPFLAGS+=     ${NOTIFY} -I${TOPDIR}
index 1ef5e54400018e01114fafb668e28106b694459a..e432918aba74e03e587eb63dfc2b6d47a3e966eb 100644 (file)
@@ -2,7 +2,9 @@
 Name=Network Configurator
 Comment=Configure and monitor your network connections
 Exec=dhcpcd-gtk
-Icon=network-transmit-receive
+Icon=dhcpcd
 Terminal=false
 Type=Application
+Categories=GTK;System;TrayIcon;
 X-GNOME-Autostart-enabled=true
+OnlyShowIn=GNOME;LXDE;MATE;XFCE;ROX;Cinnamon;
index 2f57d2f4090d0f181849578ffa5e82c1bbf4dbfd..fea86bec5a529bf3cdf026615f82b803ca0bc53a 100644 (file)
@@ -28,7 +28,14 @@ isEmpty(MANDIR) {
 }
 
 target.path=           $$PREFIX/bin
+
 man8.path=             $$MANDIR/man8
 man8.files=            dhcpcd-qt.8
 
-INSTALLS+=             target man8
+desktop.path=          $$PREFIX/share/applications
+desktop.files=         dhcpcd-qt.desktop
+
+autostart.path=                $$PREFIX/share/autostart
+autostart.files=       dhcpcd-qt.desktop
+
+INSTALLS+=             target man8 desktop autostart