Make target & variable names

5 files changed, 22 insertions, 16 deletions

diff --git a/Makefile b/Makefile
index 13b445c..04ebf15 100644
--- a/Makefile
+++ b/Makefile
@@ -20,6 +20,9 @@ all: $(EXE)
 $(EXE): % : %.icl | copy
 	$(CLM) $(CLM_LIBS) $(CLM_INC) $(CLM_OPTS) $@ -o $@
 
+run: $(filter-out run, $(MAKECMDGOALS))
+	@for i in $^; do ./$$i; done
+
 rebuild: clean all
 
 clean:
@@ -28,3 +31,6 @@ clean:
 copy:
 	mkdir -p "Clean System Files"
 	cp $(OBJECTIOCDIR)/*.o "Clean System Files"
+
+.PHONY: all run rebuild clean copy
+
diff --git a/support_button.icl b/support_button.icl
index 973cf72..04a71ce 100644
--- a/support_button.icl
+++ b/support_button.icl
@@ -17,11 +17,11 @@ Start world
         ButtonControl "Width"           [ControlWidth (PixelWidth 250)]
     ]
 # controls = ListLS buttons
-# hello = Dialog "Support - ButtonControl" controls [WindowClose (noLS closeProcess)]
-= startIO NDI Void (initialise hello) [] world
+# dialog = Dialog "Support - ButtonControl" controls [WindowClose (noLS closeProcess)]
+= startIO NDI Void (initialise dialog) [] world
 where
-    initialise hello pst
-    # (error,pst)       = openDialog 0 hello pst
+    initialise dialog pst
+    # (error,pst)       = openDialog 0 dialog pst
     | error <> NoError  = closeProcess pst
     | otherwise         = pst
 
diff --git a/support_check.icl b/support_check.icl
index 032b5de..89e9fcc 100644
--- a/support_check.icl
+++ b/support_check.icl
@@ -13,11 +13,11 @@ Start world
         CheckControl [("Item &" +++ toString i, Nothing, if (isOdd i) Mark NoMark, id) \\ i <- [1..5]] (Columns 2) [ControlPos (Left, zero), ControlTip "Some tip"]
     ]
 # controls = ListLS checks
-# hello = Dialog "Support - CheckControl" controls [WindowClose (noLS closeProcess)]
-= startIO NDI Void (initialise hello) [] world
+# dialog = Dialog "Support - CheckControl" controls [WindowClose (noLS closeProcess)]
+= startIO NDI Void (initialise dialog) [] world
 where
-    initialise hello pst
-    # (error,pst)       = openDialog 0 hello pst
+    initialise dialog pst
+    # (error,pst)       = openDialog 0 dialog pst
     | error <> NoError  = closeProcess pst
     | otherwise         = pst
 
diff --git a/support_edit.icl b/support_edit.icl
index a7f23ce..144e81b 100644
--- a/support_edit.icl
+++ b/support_edit.icl
@@ -18,11 +18,11 @@ Start world
         EditControl "Tip"           w                3 [ControlTip "Some tip"]
     ]
 # controls = ListLS edits
-# hello = Dialog "Support - EditControl" controls [WindowClose (noLS closeProcess)]
-= startIO NDI Void (initialise hello) [] world
+# dialog = Dialog "Support - EditControl" controls [WindowClose (noLS closeProcess)]
+= startIO NDI Void (initialise dialog) [] world
 where
-    initialise hello pst
-    # (error,pst)       = openDialog 0 hello pst
+    initialise dialog pst
+    # (error,pst)       = openDialog 0 dialog pst
     | error <> NoError  = closeProcess pst
     | otherwise         = pst
 
diff --git a/support_popup.icl b/support_popup.icl
index 50485b7..d6c1ca6 100644
--- a/support_popup.icl
+++ b/support_popup.icl
@@ -17,11 +17,11 @@ Start world
         PopUpControl [("Width " +++ toString i, id) \\ i <- [1..5]]       3 [ControlWidth (PixelWidth 500)]
     ]
 # controls = ButtonControl "For callbacks" [ControlId textid] :+: ListLS popups
-# hello = Dialog "Support - PopUpControl" controls [WindowClose (noLS closeProcess), WindowViewSize {w=1000,h=500}] // because vertical space isn't reserved properly
-= startIO NDI Void (initialise hello) [] world
+# dialog = Dialog "Support - PopUpControl" controls [WindowClose (noLS closeProcess), WindowViewSize {w=1000,h=500}] // because vertical space isn't reserved properly
+= startIO NDI Void (initialise dialog) [] world
 where
-    initialise hello pst
-    # (error,pst)       = openDialog 0 hello pst
+    initialise dialog pst
+    # (error,pst)       = openDialog 0 dialog pst
     | error <> NoError  = closeProcess pst
     | otherwise         = pst