initial cleanup passing over all makefiles and configure.ac

gui/icons/Makefile.am

@@ -5,94 +5,25 @@
 # author: Jeff Ahrenholz  <jeffrey.m.ahrenholz@boeing.com>
 #
 
-TINY_ICONS =	tiny/button.play.gif \
-		tiny/select.gif tiny/marker.gif \
-		tiny/rj45.gif tiny/text.gif \
-		tiny/edit-delete.gif tiny/stop.gif \
-		tiny/blank.gif tiny/mobility.gif \
-		tiny/script_play.gif tiny/arrow.gif \
-		tiny/lanswitch.gif tiny/script_pause.gif \
-		tiny/pc.gif tiny/rectangle.gif \
-		tiny/observe.gif tiny/document-new.gif \
-		tiny/document-save.gif \
-		tiny/view-refresh.gif tiny/moboff.gif \
-		tiny/document-properties.gif tiny/arrow.up.gif \
-		tiny/host.gif tiny/hub.gif \
-		tiny/twonode.gif tiny/router.gif \
-		tiny/eraser.gif \
-		tiny/stock_connect.gif tiny/stock_disconnect.gif \
-		tiny/ping.gif tiny/link.gif \
-		tiny/start.gif \
-		tiny/trace.gif tiny/button.stop.gif \
-		tiny/arrow.down.gif tiny/oval.gif \
-		tiny/wlan.gif tiny/delete.gif \
-		tiny/run.gif tiny/tunnel.gif \
-		tiny/script_stop.gif \
-		tiny/router_black.gif tiny/router_green.gif \
-		tiny/router_red.gif tiny/router_yellow.gif \
-		tiny/router_purple.gif \
-		tiny/ap.gif tiny/mdr.gif \
-		tiny/folder.gif \
-		tiny/cel.gif \
-		tiny/fileopen.gif \
-		tiny/plot.gif
+TINY_ICONS := $(wildcard tiny/*)
+NORM_ICONS := $(wildcard normal/*)
+SVG_ICONS := $(wildcard svg/*)
 
-NORM_ICONS =	normal/gps-diagram.xbm \
-		normal/router_black.gif normal/host.gif \
-		normal/hub.gif \
-		normal/router.gif \
-		normal/rj45.gif normal/antenna.gif \
-		normal/text.gif \
-		normal/lanswitch.gif normal/core-icon.png \
-		normal/core-icon.xbm normal/oval.gif \
-		normal/wlan.gif normal/pc.gif \
-		normal/tunnel.gif normal/core-logo-275x75.gif \
-		normal/router_red.gif normal/router_green.gif \
-		normal/simple.xbm \
-		normal/document-properties.gif \
-		normal/thumb-unknown.gif \
-		normal/router_purple.gif normal/router_yellow.gif \
-		normal/ap.gif normal/mdr.gif
-
-SVG_ICONS = 	svg/ap.svg \
-		svg/cel.svg \
-		svg/hub.svg \
-		svg/lanswitch.svg \
-		svg/mdr.svg \
-		svg/otr.svg \
-		svg/rj45.svg \
-		svg/router_black.svg \
-		svg/router_green.svg \
-		svg/router_purple.svg \
-		svg/router_red.svg \
-		svg/router.svg \
-		svg/router_yellow.svg \
-		svg/start.svg \
-		svg/tunnel.svg \
-		svg/vlan.svg
-
-#
 # Icon files (/usr/local/share/core/icons/[tiny,normal,svg])
-#
-coreiconnormaldir	= $(CORE_DATA_DIR)/icons/normal
+coreiconnormaldir = $(CORE_DATA_DIR)/icons/normal
 dist_coreiconnormal_DATA = $(NORM_ICONS)
-coreicontinydir		= $(CORE_DATA_DIR)/icons/tiny
-dist_coreicontiny_DATA	= $(TINY_ICONS)
-coreiconsvgdir		= $(CORE_DATA_DIR)/icons/svg
-dist_coreiconsvg_DATA	= $(SVG_ICONS)
 
-iconpixmapdir		= $(datarootdir)/pixmaps
-dist_iconpixmap_DATA	= core-gui.xpm
+coreicontinydir	= $(CORE_DATA_DIR)/icons/tiny
+dist_coreicontiny_DATA = $(TINY_ICONS)
 
-icondesktopdir		= $(datarootdir)/applications
-dist_icondesktop_DATA	= core-gui.desktop
+coreiconsvgdir = $(CORE_DATA_DIR)/icons/svg
+dist_coreiconsvg_DATA = $(SVG_ICONS)
 
-uninstall-hook:
-	rmdir -p $(icondesktopdir) || true
-	rmdir -p $(iconpixmapdir) || true
-	rmdir -p $(coreiconsvgdir) || true
-	rmdir -p $(coreicontinydir) || true
-	rmdir -p $(coreiconnormaldir) || true
+iconpixmapdir = $(datarootdir)/pixmaps
+dist_iconpixmap_DATA = core-gui.xpm
+
+icondesktopdir = $(datarootdir)/applications
+dist_icondesktop_DATA = core-gui.desktop
 
 # extra cruft to remove
 DISTCLEANFILES	= Makefile.in