Browse Source

Finished doing the rest of the merge

watermark_alloc
Cameron Weinfurt 2 years ago
parent
commit
e7e90fe2bf
  1. 4
      Makefile

4
Makefile

@ -21,13 +21,11 @@ clean:
main.o: main.c alloc_api.h
$(CC) $(CFLAGS) -c main.c -o main.o
<<<<<<< HEAD
watermark_alloc.o: watermark_alloc.c allocator_interal.h
$(CC) $(CFLAGS) -c watermark_alloc.c -o watermark_alloc.o
=======
tree_alloc.o: tree_alloc.c allocator_internal.h
$(CC) $(CFLAGS) -c tree_alloc.c -o tree_alloc.o
util.o: util.c
$(CC) $(CFLAGS) -c util.c
>>>>>>> tree_alloc
Loading…
Cancel
Save