From 731e1002cd71b2dd48a95c8ecaf610d7336cb3f2 Mon Sep 17 00:00:00 2001
From: Dan Buch <daniel.buch@gmail.com>
Date: Thu, 16 Jun 2011 21:46:56 -0400
Subject: [PATCH] cleaning things up a bit

---
 .gitignore                           |  6 +-----
 gowrikumar/Makefile                  |  7 +++++--
 gowrikumar/bin/.keep                 |  0
 gowrikumar/{ => src}/00-sizeof.c     |  0
 gowrikumar/{ => src}/02-dowhile.c    |  0
 gowrikumar/{ => src}/03-stdoutbuf.c  |  0
 gowrikumar/{ => src}/03b-stdoutbuf.c |  0
 gowrikumar/{ => src}/03c-stdoutbuf.c |  0
 gowrikumar/src/04-macrodef.c         | 19 +++++++++++++++++++
 gowrikumar/src/Makefile              | 14 ++++++++++++++
 10 files changed, 39 insertions(+), 7 deletions(-)
 create mode 100644 gowrikumar/bin/.keep
 rename gowrikumar/{ => src}/00-sizeof.c (100%)
 rename gowrikumar/{ => src}/02-dowhile.c (100%)
 rename gowrikumar/{ => src}/03-stdoutbuf.c (100%)
 rename gowrikumar/{ => src}/03b-stdoutbuf.c (100%)
 rename gowrikumar/{ => src}/03c-stdoutbuf.c (100%)
 create mode 100644 gowrikumar/src/04-macrodef.c
 create mode 100644 gowrikumar/src/Makefile

diff --git a/.gitignore b/.gitignore
index 740fcd7..d800b0d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1 @@
-gowrikumar/00-sizeof
-gowrikumar/02-dowhile
-gowrikumar/03-stdoutbuf
-gowrikumar/03b-stdoutbuf
-gowrikumar/03c-stdoutbuf
+gowrikumar/bin
diff --git a/gowrikumar/Makefile b/gowrikumar/Makefile
index 6290501..ef886fd 100644
--- a/gowrikumar/Makefile
+++ b/gowrikumar/Makefile
@@ -1,7 +1,10 @@
-# puzzles from http://www.gowrikumar.com/c/
+BINDIR := ./bin
 
+export BINDIR
 
-all: $(patsubst %.c,%,$(wildcard *.c))
+
+all:
+	cd src && $(MAKE)
 
 
 .PHONY: all
diff --git a/gowrikumar/bin/.keep b/gowrikumar/bin/.keep
new file mode 100644
index 0000000..e69de29
diff --git a/gowrikumar/00-sizeof.c b/gowrikumar/src/00-sizeof.c
similarity index 100%
rename from gowrikumar/00-sizeof.c
rename to gowrikumar/src/00-sizeof.c
diff --git a/gowrikumar/02-dowhile.c b/gowrikumar/src/02-dowhile.c
similarity index 100%
rename from gowrikumar/02-dowhile.c
rename to gowrikumar/src/02-dowhile.c
diff --git a/gowrikumar/03-stdoutbuf.c b/gowrikumar/src/03-stdoutbuf.c
similarity index 100%
rename from gowrikumar/03-stdoutbuf.c
rename to gowrikumar/src/03-stdoutbuf.c
diff --git a/gowrikumar/03b-stdoutbuf.c b/gowrikumar/src/03b-stdoutbuf.c
similarity index 100%
rename from gowrikumar/03b-stdoutbuf.c
rename to gowrikumar/src/03b-stdoutbuf.c
diff --git a/gowrikumar/03c-stdoutbuf.c b/gowrikumar/src/03c-stdoutbuf.c
similarity index 100%
rename from gowrikumar/03c-stdoutbuf.c
rename to gowrikumar/src/03c-stdoutbuf.c
diff --git a/gowrikumar/src/04-macrodef.c b/gowrikumar/src/04-macrodef.c
new file mode 100644
index 0000000..30b641f
--- /dev/null
+++ b/gowrikumar/src/04-macrodef.c
@@ -0,0 +1,19 @@
+/**
+ * :author: Dan Buch (daniel.buch@gmail.com)
+ */
+
+#include <stdio.h>
+
+#define f(a, b) a##b
+#define g(a) #a
+#define h(a) g(a)
+
+int main()
+{
+    printf("%s\n", h(f(1, 2)));
+    printf("%s\n", g(f(1, 2)));
+    return 0;
+}
+
+/* vim:filetype=c:fileencoding=utf-8
+ */
diff --git a/gowrikumar/src/Makefile b/gowrikumar/src/Makefile
new file mode 100644
index 0000000..b8b21ff
--- /dev/null
+++ b/gowrikumar/src/Makefile
@@ -0,0 +1,14 @@
+# puzzles from http://www.gowrikumar.com/c/
+
+BINDIR := ../bin
+
+ALL_BIN := $(patsubst %.c,$(BINDIR)/%,$(wildcard *.c))
+
+
+$(BINDIR)/%: %.c
+	$(CC) -o $@ $<
+
+all: $(ALL_BIN)
+
+
+.PHONY: all