forked from vieter-v/libvieter
chore: Rebase to dev branch with binomial heap PR.
This commit is contained in:
parent
d1a8ba7737
commit
10eb08b8e4
7 changed files with 404 additions and 3 deletions
5
Makefile
5
Makefile
|
|
@ -71,9 +71,14 @@ build-test: $(BINS_TEST)
|
|||
|
||||
# For simplicity, we link every object file to each of the test files. This
|
||||
# might be changed later if this starts to become too slow.
|
||||
<<<<<<< HEAD
|
||||
$(BINS_TEST): %: %.c.o $(LIB)
|
||||
$(CC) \
|
||||
$^ -o $@
|
||||
=======
|
||||
$(BINS_TEST): %: %.c.o $(OBJS)
|
||||
$(CC) $^ -larchive -o $@
|
||||
>>>>>>> c94ab92 (refactor: Add libarchive link to test compilation area of the Makefile. Created test units with xcursor-dmz as test package.)
|
||||
|
||||
# Along with the include directory, each test includes $(TEST_DIR) (which
|
||||
# contains the acutest.h header file), and the src directory of the module it's
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue