Rename C programs and update the Makefile

diff --git a/.gitignore b/.gitignore
index 3723be1f2c5c2265e8084b5d240e72f98292dbef..830e3663adf854bf658fdec9f791a644bc95c3f5 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
-hello_world
-goodbye_world
+one_gaussian_bump
+error_analysis
 *.o

diff --git a/Makefile b/Makefile
index af2d15bbbc003d4a322be1236b70dfab14e2abb0..97c4ac927b6bc9c8ab6a1a7c798a7e06d89f97a5 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -19,19 +19,19 @@
 #   http://www.gnu.org/software/make/manual/html_node/Reference.html
 # You can override variables from the command line.  For example
 #   $ make VERSION=2 dist
-# will generate phys405-hw0-2.tar.gz
-COURSE = phys405
-PACKAGE = hw0
+# will generate phys305-hw4-2.tar.gz
+COURSE = phys305
+PACKAGE = hw4
 VERSION = 1
 RELEASE = $(COURSE)-$(PACKAGE)-$(VERSION)
-RUN_PROGRAM = hello_world
+RUN_PROGRAM =
 SCRIPTS =
-C_PROGRAMS = hello_world
-CXX_PROGRAMS = goodbye_world
+C_PROGRAMS = one_gaussian_bump error_analysis
+CXX_PROGRAMS =
 PROGRAMS = $(C_PROGRAMS) $(CXX_PROGRAMS)
 
 # Define the source files that will be distributed in the tarball
-SOURCE = *.c *.cpp *.h COPYING Makefile README $(SCRIPTS)
+SOURCE = *.c *.h COPYING Makefile README $(SCRIPTS)
 
 # Define a list of object files needed to link PROGRAM.  We're setting
 # things up here so that a program % depends on the object file %.o.
@@ -46,7 +46,7 @@ $(foreach PROGRAM, $(PROGRAMS), $(eval $(PROGRAM)_OBJECTS = $(PROGRAM).o))
 # You may want to link agains external libraries.  For example, to
 # link against the system math library, use.
 #   hello_world_LIBS = -lm
-$(foreach PROGRAM, $(PROGRAMS), $(eval $(PROGRAM)_LIBS =))
+$(foreach PROGRAM, $(PROGRAMS), $(eval $(PROGRAM)_LIBS = -lm))
 
 # Define useful programs (this makes it easy to swap in alternates)
 CP = cp

diff --git a/hello_world.c b/error_analysis.c
similarity index 100%
rename from hello_world.c
rename to error_analysis.c

diff --git a/goodbye_world.cpp b/one_gaussian_bump.c
similarity index 86%
rename from goodbye_world.cpp
rename to one_gaussian_bump.c
index f9ec77fe5672a933260a16205eb15ada5bbf8874..c2423049f8ba3e94dc3161704eb9fce828895f8c 100644 (file)
--- a/goodbye_world.cpp
+++ b/one_gaussian_bump.c
@@ -1,5 +1,5 @@
 /*
-A simple "hello world" example in C++.
+A simple "hello world" example in C.
 
 Copyright (C) 2012  W. Trevor King
 
@@ -17,11 +17,9 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <iostream>
-
-using namespace std;
+#include <stdio.h>
 
 int main() {
-       cout << "goodbye, world\n";
+       printf("hello, world\n");
        return 0;
 }