diff --git a/.gitmodules b/.gitmodules index 3e5786d..5bee0d0 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,3 +4,6 @@ [submodule "libargo"] path = libargo url = git@github.com:overflowerror/libargo.git +[submodule "libparcival"] + path = libparcival + url = git@github.com:overflowerror/libparcival.git diff --git a/Makefile b/Makefile index 3ef49d0..fa87766 100644 --- a/Makefile +++ b/Makefile @@ -1,11 +1,12 @@ CC = gcc LD = gcc -CFLAGS = -Wall -g -std=c99 -ICFloor/src/ -Ilibargo/src/ -D_POSIX_SOURCE -D_XOPEN_SOURCE=500 +CFLAGS = -Wall -g -std=c99 -ICFloor/src/ -Ilibargo/src/ -Ilibparcival/src/ -D_POSIX_SOURCE -D_XOPEN_SOURCE=500 LDFLAGS = -lpthread -lrt CFLOOR_LIB = CFloor/libcfloor.a LIBARGO = libargo/libargo.a -LIBS = $(CFLOOR_LIB) $(LIBARGO) +LIBPARCIVAL = libparcival/libparcival.a +LIBS = $(CFLOOR_LIB) $(LIBARGO) $(LIBPARCIVAL) OBJS = obj/router.o obj/request.o obj/base_cfloor.o obj/base_cgi.o DEPS = $(OBJS:%.o=%.d) @@ -40,6 +41,9 @@ $(CFLOOR_LIB): $(LIBARGO): $(MAKE) -C libargo/ libargo.a + +$(LIBPARCIVAL): + $(MAKE) -C libparcival libparcival.a -include $(DEPS) @@ -55,6 +59,9 @@ obj: libargo/marshaller-gen: $(MAKE) -C libargo/ marshaller-gen +libparcival/parcival: + $(MAKE) -C libparcival/ parcival + obj/entities.tab.o: obj/entities.tab.c $(CC) $(CFLAGS) -MMD -c -o $@ $< diff --git a/libparcival b/libparcival new file mode 160000 index 0000000..e42686d --- /dev/null +++ b/libparcival @@ -0,0 +1 @@ +Subproject commit e42686dc63e0e470c7dd1194eb2b32ea5f83f97b