From 7c7de1ffb565505c5a86cf30aa98d7d423f09d11 Mon Sep 17 00:00:00 2001 From: "me@ow.nekobit.net" Date: Wed, 19 Jan 2022 05:07:30 +0000 Subject: [PATCH] Fix mastodont include FossilOrigin-Name: 9203fbe8e3c23848d18a35cf88249ac3facc76c2ebc653be829f0aeb290daf8d --- .gitignore | 1 - Makefile | 5 +++-- config.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index a3cc331..709101d 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,3 @@ filec **/*.cgi **/*.o **/*.chtml -mastodont \ No newline at end of file diff --git a/Makefile b/Makefile index 8f6bc0b..2016793 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ CC ?= cc GIT ?= git MASTODONT_DIR = mastodont/ MASTODONT = $(MASTODONT_DIR)libmastodont.a -CFLAGS = -Wall -I $(MASTODONT)include/ +CFLAGS = -Wall -I $(MASTODONT_DIR)include/ LDFLAGS = -L$(MASTODONT_DIR) -lcurl -lmastodont SRC = $(wildcard src/*.c) OBJ = $(patsubst %.c,%.o,$(SRC)) @@ -15,7 +15,7 @@ TARGET = ratfe.cgi all: $(MASTODONT) $(TARGET) $(TARGET): filec $(PAGES_CMP) $(OBJ) - $(CC) -o $(DIST)$(TARGET) $(LDFLAGS) $(OBJ) + $(CC) -o $(DIST)$(TARGET) $(OBJ) $(LDFLAGS) filec: src/file-to-c/main.o $(CC) -o filec $< @@ -37,5 +37,6 @@ clean: rm -f $(OBJ) src/file-to-c/main.o rm -f $(PAGES_CMP) rm -f filec + make -C $(MASTODONT_DIR) clean .PHONY: all filec clean diff --git a/config.h b/config.h index 1353af7..89aebde 100644 --- a/config.h +++ b/config.h @@ -31,6 +31,6 @@ static const char* config_canonical_name = "RatFE"; * * Example: https://cum.desupost.soy/ */ -static const char* config_instance_url = "https://cum.desupost.soy/"; +static char* config_instance_url = "https://cum.desupost.soy/"; #endif // CONFIG_H