forked from vieter-v/libvieter
chore: fix merge marker in makefile
parent
d0914adbb5
commit
d11a9d3638
7
Makefile
7
Makefile
|
@ -22,6 +22,7 @@ BINS_TEST := $(OBJS_TEST:%.c.o=%)
|
||||||
TARGETS_TEST := $(BINS_TEST:%=test-%)
|
TARGETS_TEST := $(BINS_TEST:%=test-%)
|
||||||
TARGETS_MEM_TEST := $(BINS_TEST:%=test-mem-%)
|
TARGETS_MEM_TEST := $(BINS_TEST:%=test-mem-%)
|
||||||
|
|
||||||
|
LIBFLAGS := -larchive
|
||||||
INC_FLAGS := $(addprefix -I,$(INC_DIRS))
|
INC_FLAGS := $(addprefix -I,$(INC_DIRS))
|
||||||
|
|
||||||
# -MMD: generate a .d file for every source file. This file can be imported by
|
# -MMD: generate a .d file for every source file. This file can be imported by
|
||||||
|
@ -71,11 +72,7 @@ build-test: $(BINS_TEST)
|
||||||
|
|
||||||
$(BINS_TEST): %: %.c.o $(LIB)
|
$(BINS_TEST): %: %.c.o $(LIB)
|
||||||
$(CC) \
|
$(CC) \
|
||||||
$^ -o $@
|
$^ $(LIBFLAGS) -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
|
# 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
|
# contains the acutest.h header file), and the src directory of the module it's
|
||||||
|
|
|
@ -15,6 +15,10 @@ See the [source code](src) for the list of modules.
|
||||||
Everything is handled by the provided Makefile. To compile the static library,
|
Everything is handled by the provided Makefile. To compile the static library,
|
||||||
simply run `make`.
|
simply run `make`.
|
||||||
|
|
||||||
|
### Required libraries
|
||||||
|
|
||||||
|
Libvieter requires libarchive.
|
||||||
|
|
||||||
### Project structure
|
### Project structure
|
||||||
|
|
||||||
Each module has its own subdirectory inside `src`, e.g. `src/cron`. This
|
Each module has its own subdirectory inside `src`, e.g. `src/cron`. This
|
||||||
|
|
Loading…
Reference in New Issue