From 08b15e126ee04ff0bb7a205c9f9ab4c4308d2ca8 Mon Sep 17 00:00:00 2001
From: Victor Lazzarini <victor.lazzarini@mu.ie>
Date: Wed, 26 Jan 2022 09:05:02 +0000
Subject: [PATCH] added installation and changed name

---
 CMakeLists.txt             |  3 ++-
 src/Makefile               |  1 +
 src/music5.c               | 12 ++++++------
 src/{towav.c => raw2wav.c} |  0
 4 files changed, 9 insertions(+), 7 deletions(-)
 rename src/{towav.c => raw2wav.c} (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 73bc760..e995ca7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,10 +9,11 @@ if(${ARGC} GREATER 1)
 else()
   add_executable(${NAME} "src/${NAME}.f")
 endif()
+   install(TARGETS ${NAME})
 endfunction()
 
 add_program(pass1)
 add_program(pass2)
 add_program(pass3)
-add_program(towav c)
+add_program(raw2wav c)
 add_program(music5 c)
diff --git a/src/Makefile b/src/Makefile
index 886b187..0caf0b3 100755
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,5 +1,6 @@
 # Makefile for MUSIC V
 # Victor Lazzarini, Jun 08
+# For doc purposes only, the software is now built with CMake.
 
 PROGS = pass1 pass2 pass3 towav music5
 
diff --git a/src/music5.c b/src/music5.c
index ca56eab..2ca712c 100644
--- a/src/music5.c
+++ b/src/music5.c
@@ -1,5 +1,5 @@
 // MUSIC V driver program
-// calls pass1, pass2, pass3 and towav to produce an output
+// calls pass1, pass2, pass3 and raw2wav to produce an output
 // (c) V Lazzarini, 2022
 //
 // Redistribution and use in source and binary forms, with or without
@@ -33,13 +33,13 @@ int main(int argc, char *argv[]) {
     char command[1024];
     sprintf(command, "cp -f %s score", argv[1]);
     system(command);
-    ret = system("./pass1");
+    ret = system("pass1");
     if(ret == 0) {
-      ret = system("./pass2");
+      ret = system("pass2");
       if(ret == 0) {
-	ret = system("./pass3");
+	ret = system("pass3");
 	if(ret == 0) {
-	  sprintf(command, "./towav %s", argv[2]);
+	  sprintf(command, "raw2wav %s", argv[2]);
 	  system(command);
 	  return 0;
 	}
@@ -47,7 +47,7 @@ int main(int argc, char *argv[]) {
       } else printf("pass 2 failed\n");
     } else printf("pass 1 failed\n");
     return 1;
-  } else printf("usage: %s score output.wav \n", argv[1]);
+  } else printf("usage: %s score output.wav \n", argv[0]);
   return -1;
 }
 
diff --git a/src/towav.c b/src/raw2wav.c
similarity index 100%
rename from src/towav.c
rename to src/raw2wav.c