removed include paths, added include dirs to gcc flags, added compile_comands.json to gitignore for bear
This commit is contained in:
@@ -1,2 +1,4 @@
|
||||
**/build/
|
||||
**/*.o
|
||||
**/*.d
|
||||
**/compile_commands.json
|
||||
|
||||
+5
-2
@@ -1,10 +1,13 @@
|
||||
CC = gcc
|
||||
CFLAGS = -g
|
||||
CFLAGS = -g -MD -MP
|
||||
|
||||
TARGET = build/stored
|
||||
|
||||
SRC = $(wildcard src/*.c)
|
||||
OBJ = $(SRC:src/%.c=build/%.o)
|
||||
INC = ./include ../shared/include
|
||||
|
||||
HDR_FLG = $(foreach D, $(INC), -I$(D))
|
||||
|
||||
all: $(TARGET)
|
||||
|
||||
@@ -16,7 +19,7 @@ $(TARGET): $(OBJ)
|
||||
# compile step
|
||||
build/%.o: src/%.c
|
||||
@mkdir -p build
|
||||
$(CC) $(CFLAGS) -c $< -o $@
|
||||
$(CC) $(CFLAGS) $(HDR_FLG) -c $< -o $@
|
||||
|
||||
clean:
|
||||
rm -rf build
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#pragma once
|
||||
#include "../include/uds_client.h"
|
||||
#include "../include/mq_client.h"
|
||||
#include "uds_client.h"
|
||||
#include "mq_client.h"
|
||||
#include <stdlib.h>
|
||||
#include <stdint.h>
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#pragma once
|
||||
#include <pthread.h>
|
||||
#include "../include/client.h"
|
||||
#include "client.h"
|
||||
|
||||
|
||||
typedef struct ThreadArgs {
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#pragma once
|
||||
#include <pthread.h>
|
||||
#include "../include/uds_conn_handle.h"
|
||||
#include "../include/mq_conn_handle.h"
|
||||
#include "uds_conn_handle.h"
|
||||
#include "mq_conn_handle.h"
|
||||
|
||||
typedef struct ConnectionResult {
|
||||
enum { CONN_NONE, CONN_ERR, CONN_NEW } status;
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@
|
||||
|
||||
#include <pthread.h>
|
||||
#include <stdbool.h>
|
||||
#include "../include/uthash.h"
|
||||
#include "uthash.h"
|
||||
|
||||
typedef struct {
|
||||
char key[256];
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#pragma once
|
||||
|
||||
#include <pthread.h>
|
||||
#include "../include/db.h"
|
||||
#include "db.h"
|
||||
|
||||
#define MAX_DBS 64
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#pragma once
|
||||
|
||||
#include "../../shared/include/mq_message.h"
|
||||
#include "mq_message.h"
|
||||
#include <mqueue.h>
|
||||
#include <sys/types.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#pragma once
|
||||
|
||||
#include "../include/connection_handler.h"
|
||||
#include "connection_handler.h"
|
||||
#include <mqueue.h>
|
||||
|
||||
#define MQ_MAX_MSG 100
|
||||
|
||||
@@ -1,7 +1,8 @@
|
||||
#pragma once
|
||||
|
||||
#include "../include/connection_handler.h"
|
||||
#include "../include/db.h"
|
||||
#include "connection_handler.h"
|
||||
#include "db.h"
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <stdbool.h>
|
||||
|
||||
|
||||
+2
-2
@@ -1,5 +1,5 @@
|
||||
#include "../include/client.h"
|
||||
#include "../../shared/include/log.h"
|
||||
#include "client.h"
|
||||
#include "log.h"
|
||||
|
||||
|
||||
client_read_result_t client_read(client_t* client) {
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#include "../include/client_thread.h"
|
||||
#include "../../shared/include/log.h"
|
||||
#include "client_thread.h"
|
||||
#include "log.h"
|
||||
|
||||
#include <pthread.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
#include "../include/db.h"
|
||||
#include "db.h"
|
||||
|
||||
#include <stdbool.h>
|
||||
|
||||
|
||||
+2
-2
@@ -2,8 +2,8 @@
|
||||
#include <stdlib.h>
|
||||
|
||||
#define LOG_IMPL // implement header-only log sys
|
||||
#include "../../shared/include/log.h"
|
||||
#include "../include/server.h"
|
||||
#include "log.h"
|
||||
#include "server.h"
|
||||
|
||||
|
||||
// signal handling
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#include "../include/mq_client.h"
|
||||
#include "../include/client.h"
|
||||
#include "mq_client.h"
|
||||
#include "client.h"
|
||||
|
||||
#include "../../shared/include/log.h"
|
||||
#include "log.h"
|
||||
#include <asm-generic/errno-base.h>
|
||||
#include <asm-generic/errno.h>
|
||||
#include <errno.h>
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
#include <errno.h>
|
||||
#include <mqueue.h>
|
||||
|
||||
#include "../include/connection_handler.h"
|
||||
#include "../include/mq_conn_handle.h"
|
||||
#include "../include/client.h"
|
||||
#include "../include/client_thread.h"
|
||||
#include "connection_handler.h"
|
||||
#include "mq_conn_handle.h"
|
||||
#include "client.h"
|
||||
#include "client_thread.h"
|
||||
|
||||
#include "../../shared/include/mq_message.h"
|
||||
#include "../../shared/include/log.h"
|
||||
#include "mq_message.h"
|
||||
#include "log.h"
|
||||
|
||||
connection_handler_t create_mq_handler(void) {
|
||||
return (connection_handler_t) {
|
||||
|
||||
+6
-6
@@ -1,13 +1,13 @@
|
||||
#include <stdlib.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#include "../include/server.h"
|
||||
#include "../include/db.h"
|
||||
#include "../include/connection_handler.h"
|
||||
#include "../include/uds_conn_handle.h"
|
||||
#include "../include/mq_conn_handle.h"
|
||||
#include "server.h"
|
||||
#include "db.h"
|
||||
#include "connection_handler.h"
|
||||
#include "uds_conn_handle.h"
|
||||
#include "mq_conn_handle.h"
|
||||
|
||||
#include "../../shared/include/log.h"
|
||||
#include "log.h"
|
||||
|
||||
server_t* server_create(void) {
|
||||
log_info_m("Server starting...");
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#include "../include/uds_client.h"
|
||||
#include "../include/client.h"
|
||||
#include "uds_client.h"
|
||||
#include "client.h"
|
||||
|
||||
#include <errno.h>
|
||||
#include <stdint.h>
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#include "../include/uds_conn_handle.h"
|
||||
#include "../include/connection_handler.h"
|
||||
#include "../include/client_thread.h"
|
||||
#include "../../shared/include/log.h"
|
||||
#include "uds_conn_handle.h"
|
||||
#include "connection_handler.h"
|
||||
#include "client_thread.h"
|
||||
#include "log.h"
|
||||
|
||||
#include <errno.h>
|
||||
#include <fcntl.h>
|
||||
|
||||
Reference in New Issue
Block a user