SomeNet
/
public repos
/
pub
/
jan
/
parprog.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
fixed hillis algorithm
[pub/jan/parprog.git]
/
openmp
/
merge
/
Makefile
diff --git
a/openmp/merge/Makefile
b/openmp/merge/Makefile
index 1085bf0060660b0dec725d51d202199dff1e7556..0f10ac0f4d99f1788fe53d0d38c744239881f5ef 100644
(file)
--- a/
openmp/merge/Makefile
+++ b/
openmp/merge/Makefile
@@
-9,7
+9,7
@@
OBJECTS = $(BINARIES).o
all: sort
-sort: sort.o numlist
1.o numlist2
.o
+sort: sort.o numlist.o
$(CC) -o $@ $? $(LDFLAGS)
%.o: %.c
@@
-17,4
+17,4
@@
sort: sort.o numlist1.o numlist2.o
.PHONY: clean
clean:
- rm -rf $(OBJECTS) $(BINARIES)
+ rm -rf $(OBJECTS) $(BINARIES)
numlist.o