close() file after GET

[krsd] / Makefile

diff --git a/Makefile b/Makefile
index 08ffca0..6ed2baf 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,27 +1,87 @@
-CFLAGS=${shell pkg-config libevent --cflags} -ggdb -Wall -Werror --std=c99 -pedantic
-LDFLAGS=${shell pkg-config libevent --libs} -lmagic
+CFLAGS=${shell pkg-config libevent_openssl --cflags} -ggdb -Wall --std=c99 $(INCLUDES)
+LDFLAGS=${shell pkg-config libevent_openssl --libs} ${shell pkg-config libssl --libs} -lmagic -lattr -lpthread
+INCLUDES=-Isrc -Ilib/evhtp/ -Ilib/evhtp/htparse -Ilib/evhtp/evthr -Ilib/evhtp/oniguruma/
 
-OBJECTS=src/main.o src/common.o src/storage.o src/auth.o src/handler.o src/webfinger.o src/config.o src/ui.o src/auth_struct.o src/session.o src/csrf_protection.o src/trie.o src/auth_store.o
+BASE_OBJECTS=src/config.o
+COMMON_OBJECTS=src/common/log.o src/common/user.o src/common/auth.o src/common/json.o
+HANDLER_OBJECTS=src/handler/storage.o src/handler/auth.o src/handler/webfinger.o src/handler/dispatch.o
+PROCESS_OBJECTS=src/process/main.o
+OBJECTS=$(BASE_OBJECTS) $(COMMON_OBJECTS) $(PROCESS_OBJECTS) $(HANDLER_OBJECTS)
+
+STATIC_LIBS=lib/evhtp/build/libevhtp.a
+
+SUBMODULES=lib/evhtp/
 
 default: all
 
-all: rs-serve
+all: rs-serve tools
 
-rs-serve: $(OBJECTS)
+rs-serve: $(STATIC_LIBS) $(OBJECTS)
        @echo "[LD] $@"
-       @$(CC) -o $@ $(OBJECTS) $(LDFLAGS)
+       @$(CC) -o $@ $(OBJECTS) $(STATIC_LIBS) $(LDFLAGS)
 
 %.o: %.c
        @echo "[CC] ${shell echo $@ | sed 's/src\///' | sed 's/\.o//'}"
        @$(CC) -c $< -o $@ $(CFLAGS)
 
+tools: tools/add-token tools/remove-token tools/list-tokens
+
+.PHONY: tools
+
+tools/add-token: src/tools/add-token.o src/common/auth.o
+       @echo "[LD] $@"
+       @$(CC) -o $@ src/tools/add-token.o src/common/auth.o
+
+tools/remove-token: src/tools/remove-token.o src/common/auth.o
+       @echo "[LD] $@"
+       @$(CC) -o $@ src/tools/remove-token.o src/common/auth.o
+
+tools/list-tokens: src/tools/list-tokens.o src/common/auth.o
+       @echo "[LD] $@"
+       @$(CC) -o $@ src/tools/list-tokens.o src/common/auth.o
+
 clean:
        @echo "[CLEAN]"
-       @rm -f rs-serve
-       @rm -f $(OBJECTS)
+       @rm -f rs-serve tools/add-token tools/remove-token tools/list-tokens
+       @find src/ -name '*.o' -exec rm '{}' ';'
        @find -name '*~' -exec rm '{}' ';'
        @find -name '*.swp' -exec rm '{}' ';'
 
+notes:
+       @grep -rE 'TODO:|FIXME:' src/
+
+.PHONY: notes
+
+install: rs-serve
+# install rs-esrve
+       @echo "[INSTALL] rs-serve"
+       @install -s rs-serve /usr/bin
+# install tools
+       @echo "[INSTALL] rs-list-tokens"
+       @install -s tools/list-tokens /usr/bin/rs-list-tokens
+       @echo "[INSTALL] rs-add-token"
+       @install -s tools/add-token /usr/bin/rs-add-token
+       @echo "[INSTALL] rs-remove-token"
+       @install -s tools/remove-token /usr/bin/rs-remove-token
+# create working dir
+       @echo "[MKDIR] /var/lib/rs-serve/"
+       @mkdir -p /var/lib/rs-serve
+# install init scxript
+       @echo "[INSTALL] /etc/init.d/rs-serve"
+       @install -m 0755 init-script.sh /etc/init.d/rs-serve
+ifeq (${shell test -f /etc/default/rs-serve >/dev/null 2>&1 ; echo $$?}, 0)
+       @echo "[EXISTS] /etc/default/rs-serve"
+else
+       @echo "[INSTALL] /etc/default/rs-serve"
+       @install init-script-defaults /etc/default/rs-serve
+endif
+ifeq (${shell type update-rc.d >/dev/null 2>&1 ; echo $$?}, 0)
+       @echo "[UPDATE-RC.D]"
+       @update-rc.d rs-serve defaults
+else
+       @echo "(can't update /etc/rcN.d, no idea how that works on your system)"
+endif
+
 test: all
        @test/run.sh
 
@@ -32,3 +92,23 @@ limit_check: all
        scripts/limitcheck.sh 5000
 
 .PHONY: default all clean leakcheck
+
+## DEPENDENT LIBS
+
+lib/evhtp/build/libevhtp.a: lib/evhtp/
+       @echo "[DEPS] libevhtp"
+       @cd lib/evhtp/build && cmake .. && make
+
+## SUBMODULES
+
+submodules: $(SUBMODULES)
+
+clean-submodules:
+       @echo "[CLEAN SUBMODULES]"
+       @rm -rf $(SUBMODULES)
+
+$(SUBMODULES):
+       @echo "[SUBMODULE] $@"
+       @git submodule update --init $@
+
+.PHONY: submodules clean-submodules $(SUBMODULES)