mirror of
https://github.com/sigmasternchen/CShore
synced 2025-03-16 00:28:56 +00:00
added libparcival to dependencies
This commit is contained in:
parent
4546ac53e8
commit
00c2c61012
3 changed files with 13 additions and 2 deletions
3
.gitmodules
vendored
3
.gitmodules
vendored
|
@ -4,3 +4,6 @@
|
||||||
[submodule "libargo"]
|
[submodule "libargo"]
|
||||||
path = libargo
|
path = libargo
|
||||||
url = git@github.com:overflowerror/libargo.git
|
url = git@github.com:overflowerror/libargo.git
|
||||||
|
[submodule "libparcival"]
|
||||||
|
path = libparcival
|
||||||
|
url = git@github.com:overflowerror/libparcival.git
|
||||||
|
|
11
Makefile
11
Makefile
|
@ -1,11 +1,12 @@
|
||||||
CC = gcc
|
CC = gcc
|
||||||
LD = 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
|
LDFLAGS = -lpthread -lrt
|
||||||
|
|
||||||
CFLOOR_LIB = CFloor/libcfloor.a
|
CFLOOR_LIB = CFloor/libcfloor.a
|
||||||
LIBARGO = libargo/libargo.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
|
OBJS = obj/router.o obj/request.o obj/base_cfloor.o obj/base_cgi.o
|
||||||
DEPS = $(OBJS:%.o=%.d)
|
DEPS = $(OBJS:%.o=%.d)
|
||||||
|
@ -41,6 +42,9 @@ $(CFLOOR_LIB):
|
||||||
$(LIBARGO):
|
$(LIBARGO):
|
||||||
$(MAKE) -C libargo/ libargo.a
|
$(MAKE) -C libargo/ libargo.a
|
||||||
|
|
||||||
|
$(LIBPARCIVAL):
|
||||||
|
$(MAKE) -C libparcival libparcival.a
|
||||||
|
|
||||||
-include $(DEPS)
|
-include $(DEPS)
|
||||||
|
|
||||||
obj/%.o: demo/%.c obj
|
obj/%.o: demo/%.c obj
|
||||||
|
@ -55,6 +59,9 @@ obj:
|
||||||
libargo/marshaller-gen:
|
libargo/marshaller-gen:
|
||||||
$(MAKE) -C libargo/ marshaller-gen
|
$(MAKE) -C libargo/ marshaller-gen
|
||||||
|
|
||||||
|
libparcival/parcival:
|
||||||
|
$(MAKE) -C libparcival/ parcival
|
||||||
|
|
||||||
obj/entities.tab.o: obj/entities.tab.c
|
obj/entities.tab.o: obj/entities.tab.c
|
||||||
$(CC) $(CFLAGS) -MMD -c -o $@ $<
|
$(CC) $(CFLAGS) -MMD -c -o $@ $<
|
||||||
|
|
||||||
|
|
1
libparcival
Submodule
1
libparcival
Submodule
|
@ -0,0 +1 @@
|
||||||
|
Subproject commit e42686dc63e0e470c7dd1194eb2b32ea5f83f97b
|
Loading…
Reference in a new issue