Convert package from C++ to C.

diff --git a/Makefile b/Makefile
index b28804ac327ad720b81e596bf546c793a6b49a12..022ef268abdfb6f2fa597b3909610a433a224c66 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,7 @@ RELEASE = $(COURSE)-$(PACKAGE)-$(VERSION)
 PROGRAM = hello_world
 
 # Define the source files that will be distributed in the tarball
-SOURCE = *.cpp COPYING Makefile README
+SOURCE = *.c COPYING Makefile README
 
 # Define a list of object files needed to link PROGRAM
 OBJECTS = $(PROGRAM).o
@@ -72,7 +72,7 @@ dist:
 # target: hello_world - compile the hello_world program
 # Use GCC to link the program from object files.
 $(PROGRAM): $(OBJECTS)
-       $(CXX) $(LDFLAGS) -o $@ $^ $(LIBS)
+       $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
 
 # target: run - use the program for its intended purpose
 # Here we just execute PROGRAM, but you could also use something like
@@ -97,3 +97,8 @@ run: $(PROGRAM)
 #    $ make CXX=/usr/local/bin/g++ CXXFLAGS=-Wall
 %.o: %.cpp
        $(CXX) $(CXXFLAGS) -c $<
+
+# Matching rule for compiling object files from C source
+# The comments from the C++ rule above also apply here
+%.o: %.c
+       $(CC) $(CFLAGS) -c $<

diff --git a/hello_world.cpp b/hello_world.c
similarity index 86%
rename from hello_world.cpp
rename to hello_world.c
index b470249b4290bd8cdf4107e9dc3cf32dc4fc1f81..c2423049f8ba3e94dc3161704eb9fce828895f8c 100644 (file)
--- a/hello_world.cpp
+++ b/hello_world.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 << "hello, world\n";
+       printf("hello, world\n");
        return 0;
 }