サンプルtriangleで不要ファイル削除、リンク修正

diff --git a/sample/triangle/Makefile b/sample/triangle/Makefile
index f4889bd..19f8308 100644 (file)
--- a/sample/triangle/Makefile
+++ b/sample/triangle/Makefile
@@ -1,3 +1,5 @@
+CC = gcc
+
 .PHONY: all clean
 
 all: triangle

diff --git a/sample/triangle/test/02_equilateral/02_equilateral b/sample/triangle/test/02_equilateral/02_equilateral
deleted file mode 100644 (file)
index 91ad4aa..0000000
--- a/sample/triangle/test/02_equilateral/02_equilateral
+++ /dev/null
@@ -1 +0,0 @@
-real   0m0.006s

diff --git a/sample/triangle/test/03_isosceles/03_isosceles b/sample/triangle/test/03_isosceles/03_isosceles
deleted file mode 100644 (file)
index d6a2a2e..0000000
--- a/sample/triangle/test/03_isosceles/03_isosceles
+++ /dev/null
@@ -1 +0,0 @@
-real   0m0.004s

diff --git a/sample/triangle/test/04_isosceles_c/04_isosceles_c b/sample/triangle/test/04_isosceles_c/04_isosceles_c
deleted file mode 100644 (file)
index a1f9611..0000000
--- a/sample/triangle/test/04_isosceles_c/04_isosceles_c
+++ /dev/null
@@ -1 +0,0 @@
-real   0m0.009s

diff --git a/sample/triangle/test/05_zero/05_zero b/sample/triangle/test/05_zero/05_zero
deleted file mode 100644 (file)
index 288f919..0000000
--- a/sample/triangle/test/05_zero/05_zero
+++ /dev/null
@@ -1 +0,0 @@
-real   0m0.005s

diff --git a/sample/triangle/test/06_minus/06_minus b/sample/triangle/test/06_minus/06_minus
deleted file mode 100644 (file)
index a072ab3..0000000
--- a/sample/triangle/test/06_minus/06_minus
+++ /dev/null
@@ -1 +0,0 @@
-real   0m0.010s

diff --git a/sample/triangle/test/07_line/07_line b/sample/triangle/test/07_line/07_line
deleted file mode 100644 (file)
index 385d704..0000000
--- a/sample/triangle/test/07_line/07_line
+++ /dev/null
@@ -1 +0,0 @@
-real   0m0.011s

diff --git a/sample/triangle/test/08_lines/08_lines b/sample/triangle/test/08_lines/08_lines
deleted file mode 100644 (file)
index a072ab3..0000000
--- a/sample/triangle/test/08_lines/08_lines
+++ /dev/null
@@ -1 +0,0 @@
-real   0m0.010s

diff --git a/sample/triangle/test/09_less/09_less b/sample/triangle/test/09_less/09_less
deleted file mode 100644 (file)
index 326d4ac..0000000
--- a/sample/triangle/test/09_less/09_less
+++ /dev/null
@@ -1 +0,0 @@
-real   0m0.007s

diff --git a/sample/triangle/test/11_zeroall/11_zeroall b/sample/triangle/test/11_zeroall/11_zeroall
deleted file mode 100644 (file)
index 288f919..0000000
--- a/sample/triangle/test/11_zeroall/11_zeroall
+++ /dev/null
@@ -1 +0,0 @@
-real   0m0.005s

diff --git a/sample/triangle/test/12_notint/12_notint b/sample/triangle/test/12_notint/12_notint
deleted file mode 100644 (file)
index 288f919..0000000
--- a/sample/triangle/test/12_notint/12_notint
+++ /dev/null
@@ -1 +0,0 @@
-real   0m0.005s

diff --git a/sample/triangle/test/Define.mk b/sample/triangle/test/Define.mk
index 30e79a4..4e490c7 120000 (symlink)
--- a/sample/triangle/test/Define.mk
+++ b/sample/triangle/test/Define.mk
@@ -1 +1 @@
-/Users/kazubito/2010_12/autotest.mk/template/Define.mk
\ No newline at end of file
+../../../template/Define.mk
\ No newline at end of file

diff --git a/sample/triangle/test/Define_group.mk b/sample/triangle/test/Define_group.mk
index 5efc14d..ca13c89 120000 (symlink)
--- a/sample/triangle/test/Define_group.mk
+++ b/sample/triangle/test/Define_group.mk
@@ -1 +1 @@
-/Users/kazubito/2010_12/autotest.mk/template/Define_group.mk
\ No newline at end of file
+../../../template/Define_group.mk
\ No newline at end of file

diff --git a/sample/triangle/test/Define_test.mk b/sample/triangle/test/Define_test.mk
index 152bd34..9c89c13 120000 (symlink)
--- a/sample/triangle/test/Define_test.mk
+++ b/sample/triangle/test/Define_test.mk
@@ -1 +1 @@
-/Users/kazubito/2010_12/autotest.mk/template/Define_test.mk
\ No newline at end of file
+../../../template/Define_test.mk
\ No newline at end of file

diff --git a/sample/triangle/test/Makefile b/sample/triangle/test/Makefile
index b78314e..f13df3e 120000 (symlink)
--- a/sample/triangle/test/Makefile
+++ b/sample/triangle/test/Makefile
@@ -1 +1 @@
-/Users/kazubito/2010_12/autotest.mk/template/Group.mk
\ No newline at end of file
+../../../template/Group.mk
\ No newline at end of file

diff --git a/sample/triangle/test/TEST_time.log b/sample/triangle/test/TEST_time.log
deleted file mode 100644 (file)
index b5d0813..0000000
--- a/sample/triangle/test/TEST_time.log
+++ /dev/null
@@ -1,39 +0,0 @@
-01_scalene/
-real 0.00
-
-02_equilateral/
-real 0.00
-
-03_isosceles/
-real 0.00
-
-04_isosceles_c/
-real 0.00
-
-05_zero/
-real 0.00
-
-06_minus/
-real 0.00
-
-07_line/
-real 0.00
-
-08_lines/
-real 0.00
-
-09_less/
-real 0.00
-
-10_lesses/
-real 0.00
-
-11_zeroall/
-real 0.00
-
-12_notint/
-real 0.00
-
-13_argcnt/
-real 0.00
-

diff --git a/sample/triangle/test/Test.mk b/sample/triangle/test/Test.mk
index bb188bd..e3041b4 120000 (symlink)
--- a/sample/triangle/test/Test.mk
+++ b/sample/triangle/test/Test.mk
@@ -1 +1 @@
-/Users/kazubito/2010_12/autotest.mk/template/Test.mk
\ No newline at end of file
+../../../template/Test.mk
\ No newline at end of file