# HG changeset patch
# User e085711
# Date 1298922405 -32400
# Node ID 3b02b3b26cfe17b64922a179bf1548a620581f92
# Parent  e9211e83b79dff26b99dc1d4a07e8cc8134c9388
upload Makefile

diff -r e9211e83b79d -r 3b02b3b26cfe returnCheck/Makefile
--- a/returnCheck/Makefile	Tue Mar 01 04:38:41 2011 +0900
+++ b/returnCheck/Makefile	Tue Mar 01 04:46:45 2011 +0900
@@ -2,16 +2,24 @@
 # Makefile
 #
 
-program = return 
+program = return
 objs = return.o
+
+cbc_program =  return_cbc
+cbc_objs =  return_cbc.o
+
 #CC = gcc
 CC = ~/hg/CbC/build-CbC/INSTALL_DIR/bin/cbc-gcc
 CFLAGS = -O0 -g
 
+all: $(program) $(cbc_program)
 $(program): $(objs)
 	$(CC) -o $(program) $^
 $(objs): $(program).c
 	$(CC) $(CFLAGS) -c $<
-
+$(cbc_program): $(cbc_objs)
+	$(CC) -o $(cbc_program) $^
+$(cbc_objs): $(cbc_program).cbc
+	$(CC) $(CFLAGS) -c $<
 clean:
-	rm -rf $(program) $(objs)
\ No newline at end of file
+	rm -rf $(program) $(objs) $(cbc_program) $(cbc_objs)
\ No newline at end of file
diff -r e9211e83b79d -r 3b02b3b26cfe returnCheck/Makefile~
--- a/returnCheck/Makefile~	Tue Mar 01 04:38:41 2011 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-# 
-# Makefile
-#
-
-program = return
-objs = return.o
-#CC = gcc
-CC = ~/hg/CbC/build-gcc/INSTALL_DIR/bin/gcc
-CFLAGS = -O0 -g
-
-$(program): $(objs)
-	$(CC) -o $(program) $^
-$(objs): $(program).c
-	$(CC) $(CFLAGS) -c $<
-
-clean:
-	rm -rf $(program) $(objs)
\ No newline at end of file