Makefile fix

cnphil · Apr 5, 2013 · 75ae206 · 75ae206
1 parent 70d7cd4
commit 75ae206
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 112 deletions.
diff --git a/MergesortMulti b/MergesortMulti
diff --git a/MergesortMulti.c b/MergesortMulti.c
@@ -24,9 +24,12 @@ void *m_sort(void *args)
 {
   struct arg_struct *aus = (struct arg_struct *) args;
   int mid, left = aus->le, right = aus->ri;
-
+
+
+
   if (right > left)
   {
+
     mid = (right + left) / 2;
 	pthread_t lth, rth;
 	struct arg_struct lst, rst;
@@ -39,7 +42,12 @@ void *m_sort(void *args)
 	pthread_join(lth, NULL);
 	pthread_join(rth, NULL);
     merge(left, mid+1, right);
+
+
   }
+
+
+
   pthread_exit(0);
 }
 
@@ -79,7 +87,7 @@ void merge(int left, int mid, int right)
     mid = mid + 1;
     temp_pos = temp_pos + 1;
   }
- 
+
   for (i=0; i <= num_elements; i++)
   {
     numbers[right] = temp[right];

diff --git a/makefile b/makefile
@@ -34,7 +34,7 @@ MergesortSingle: MergesortSingle.o
 MergesortSingle.o:
 	g++ -c MergesortSingle.c 
 MergesortMulti: MergesortMulti.o
-	g++ -lpthread MergesortMulti.o -o MergesortMulti
+	g++ -pthread MergesortMulti.o -o MergesortMulti
 MergesortMulti.o:
 	g++ -c MergesortMulti.c 
 
diff --git a/testwork b/testwork
diff --git a/testwork.c b/testwork.c
diff --git a/z b/z
diff --git a/zD.c b/zD.c