From c73abe6a94ad7e362c20723297901fb953bb0ec5 Mon Sep 17 00:00:00 2001
From: jdh8d <jdh8d@git.zephyr-software.com>
Date: Wed, 12 Jan 2011 15:25:24 +0000
Subject: [PATCH] Changes to demo to cleanup the output, and fix an error that
 was being reported

---
 demos/demo.jan_21_2011/Makefile   | 10 ++++++++--
 demos/demo.jan_21_2011/ps_demo.sh |  4 ++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/demos/demo.jan_21_2011/Makefile b/demos/demo.jan_21_2011/Makefile
index fda241bb7..3d9aafd85 100644
--- a/demos/demo.jan_21_2011/Makefile
+++ b/demos/demo.jan_21_2011/Makefile
@@ -1,6 +1,6 @@
 TOOLBASE=${PEASOUP_HOME}/tools
 
-all: dumbledore.original dumbledore_cmd.original
+all: dumbledore.original dumbledore_cmd.original dumbledore.protected
 
 dumbledore.original: dumbledore.o
 	${TOOLBASE}/ps_link.sh dumbledore.o -o dumbledore.original
@@ -8,8 +8,14 @@ dumbledore.original: dumbledore.o
 dumbledore_cmd.original: dumbledore_cmd.o
 	${TOOLBASE}/ps_link.sh dumbledore_cmd.o -o dumbledore_cmd.original
 
+dumbledore.protected: dumbledore.original
+	${TOOLBASE}/ps_analyze.sh dumbledore.original dumbledore.protected
+	echo "Note: this step will end in an error for now, but that's OK"
+
 .c.o:
 	${TOOLBASE}/ps_comp.sh  $<
 
 clean:
-	rm *.o dumbledore.original dumbledore_cmd.original dumbledore.protected dumbledore_cmd.protected tmp
+	rm -f *.o dumbledore.original dumbledore_cmd.original dumbledore.protected dumbledore_cmd.protected tmp
+
+	rm -Rf peasoup_executable_directory.*
diff --git a/demos/demo.jan_21_2011/ps_demo.sh b/demos/demo.jan_21_2011/ps_demo.sh
index dab788ee0..f92d55077 100755
--- a/demos/demo.jan_21_2011/ps_demo.sh
+++ b/demos/demo.jan_21_2011/ps_demo.sh
@@ -71,11 +71,11 @@ Pause
 # clear the screen
 clear
 echo "Running PEASOUP analysis phase...\n"
-echo "${TOOLBASE}/ps_analyze.sh dumbledore.original dumbledore.protected\n"
+echo "${TOOLBASE}/ps_analyze.sh dumbledore_cmd.original dumbledore_cmd.protected\n"
 
 Pause
 
-${TOOLBASE}/ps_analyze.sh dumbledore.original dumbledore.protected
+${TOOLBASE}/ps_analyze.sh dumbledore_cmd.original dumbledore_cmd.protected
 
 Pause
 
-- 
GitLab