initial cleanup passing over all makefiles and configure.ac

gui/Makefile.am

@@ -10,63 +10,28 @@
 
 SUBDIRS = icons
 
-TCL_FILES	= annotations.tcl api.tcl canvas.tcl cfgparse.tcl \
-		core.tcl debug.tcl editor.tcl exec.tcl \
-		filemgmt.tcl gpgui.tcl \
-		graph_partitioning.tcl help.tcl \
-		initgui.tcl ipv4.tcl ipv6.tcl \
-		linkcfg.tcl mobility.tcl nodecfg.tcl \
-		nodes.tcl services.tcl ns2imunes.tcl plugins.tcl \
-		tooltips.tcl topogen.tcl traffic.tcl util.tcl \
-		version.tcl widget.tcl wlan.tcl wlanscript.tcl \
-		exceptions.tcl
+TCL_FILES := $(wildcard *.tcl)
+ADDONS_FILES := $(wildcard addons/*)
+CONFIG_FILES := $(wildcard configs/*)
 
-ADDONS_FILES    = addons/ipsecservice.tcl
-
-CONFIG_FILES	= configs/sample1.imn configs/sample1.scen \
-		configs/sample1-bg.gif configs/sample2-ssh.imn \
-		configs/sample3-bgp.imn	configs/sample4-nrlsmf.imn \
-		configs/sample4.scen configs/sample4-bg.jpg \
-		configs/sample5-mgen.imn configs/sample6-emane-rfpipe.imn \
-		configs/sample7-emane-ieee80211abg.imn \
-		configs/sample8-ipsec-service.imn \
-		configs/sample9-vpn.imn \
-		configs/sample10-kitchen-sink.imn
-
-#
 # CORE GUI script (/usr/local/bin/core-gui)
-#
 dist_bin_SCRIPTS = core-gui
 
-#
 # Tcl/Tk scripts (/usr/local/lib/core)
-#
-coredir			= $(CORE_LIB_DIR)
-dist_core_DATA		= $(TCL_FILES)
-dist_core_SCRIPTS	= $(OTHER_FILES)
+coredir	= $(CORE_LIB_DIR)
+dist_core_DATA = $(TCL_FILES)
+dist_core_SCRIPTS = $(OTHER_FILES)
 
-#
 # Addon files
-#
-coreaddonsdir		= $(coredir)/addons
+coreaddonsdir = $(coredir)/addons
 dist_coreaddons_DATA = $(ADDONS_FILES)
 
-#
 # Sample configs (/usr/local/share/core/examples/configs)
-#
-coreconfigsdir		= $(datadir)/core/examples/configs
-dist_coreconfigs_DATA	= $(CONFIG_FILES)
-
-dist-hook:
-	rm -rf $(distdir)/addons/.svn
-
-uninstall-hook:
-	rmdir -p $(coreconfigsdir) || true
-	rmdir -p $(coreaddonsdir) || true
-	rmdir -p $(coredir) || true
+coreconfigsdir = $(datadir)/core/examples/configs
+dist_coreconfigs_DATA = $(CONFIG_FILES)
 
 # extra cruft to remove
-DISTCLEANFILES	= Makefile.in
+DISTCLEANFILES = Makefile.in
 
 # files to include in source tarball not included elsewhere
-EXTRA_DIST 	= addons
+EXTRA_DIST = addons

gui/core-gui.in

@@ -54,7 +54,7 @@ case $1 in
     exit 0
     ;; 
 -v | --version) 
-    exec echo "`basename $0` version @CORE_VERSION@ (@CORE_VERSION_DATE@)"
+    exec echo "`basename $0` version @PACKAGE_VERSION@ (@PACKAGE_DATE@)"
     exit 0
     ;; 
 esac
@@ -63,7 +63,7 @@ SHELL=/bin/sh
 export SHELL
 
 export LIBDIR="@CORE_LIB_DIR@"
-export SBINDIR="@SBINDIR@"
+export SBINDIR="@sbindir@"
 # eval is used here to expand "~" to user's home dir
 if [ x$CONFDIR = x ]; then export CONFDIR=`eval "echo @CORE_GUI_CONF_DIR@"` ; fi
 export CORE_STATE_DIR="@CORE_STATE_DIR@"

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

gui/version.tcl.in

@@ -6,5 +6,5 @@
 #
 # define the version number and release date here
 #
-set CORE_VERSION @CORE_VERSION@
-set CORE_VERSION_DATE @CORE_VERSION_DATE@
+set CORE_VERSION @PACKAGE_VERSION@
+set CORE_VERSION_DATE @PACKAGE_DATE@