From 8131a5d26441c5152ab151b4bb49b561e5ca6e81 Mon Sep 17 00:00:00 2001 From: Charles Date: Fri, 31 Jan 2020 10:44:30 +0100 Subject: hash table unit testing, norming --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 5a7d8a9..be53e61 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ # By: cacharle +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2019/10/08 15:45:53 by cacharle #+# #+# # -# Updated: 2020/02/13 04:31:23 by cacharle ### ########.fr # +# Updated: 2020/02/28 12:08:33 by cacharle ### ########.fr # # # # **************************************************************************** # -- cgit From c128213daa677d548bfc2905496257fe4a4faf79 Mon Sep 17 00:00:00 2001 From: Charles Date: Wed, 11 Mar 2020 21:07:32 +0100 Subject: ft_mem* and ft_strlen optimization --- Makefile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 5a7d8a9..83c1fc6 100644 --- a/Makefile +++ b/Makefile @@ -24,8 +24,10 @@ TEST_DIR = test INCLUDE_DIR = include +OPTIMIZATION ?= -O0 + CC = gcc -CCFLAGS = -I$(INCLUDE_DIR) -Wall -Wextra -Werror +CCFLAGS = -I$(INCLUDE_DIR) $(OPTIMIZATION) -Wall -Wextra -Werror IGNORE_FILE = .libftignore IGNORE_DEFAULT = ft_printf @@ -77,3 +79,6 @@ fclean: clean @$(RM) $(NAME) re: fclean all + +so: all + gcc -o libft.so -shared -fPIC $(OBJ) -- cgit From 40ed37c023627726a5c9c6928284e9f042dc0fa4 Mon Sep 17 00:00:00 2001 From: Charles Date: Mon, 30 Mar 2020 16:38:30 +0200 Subject: Added Doxygen config file --- Makefile | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index be53e61..1014e16 100644 --- a/Makefile +++ b/Makefile @@ -15,12 +15,15 @@ RM = rm -f NORM = norminette MAKE = make MAKE_ARGS = --no-print-directory +DOXYGEN = doxygen +DOXYGEN_FILE = Doxyfile SRC_DIR = src INCLUDE_DIR = include OBJ_DIR = obj SCRIPT_DIR = script TEST_DIR = test +DOC_DIR = doc INCLUDE_DIR = include @@ -77,3 +80,9 @@ fclean: clean @$(RM) $(NAME) re: fclean all + +doc: + $(DOXYGEN) $(DOXYGEN_FILE) + +doc_clean: + $(RM) -r $(DOC_DIR) -- cgit From 9316f2063255bd4a0abd5c38d4c065969a8980bb Mon Sep 17 00:00:00 2001 From: Charles Date: Wed, 1 Apr 2020 18:10:36 +0200 Subject: Norm compliant comment format, dirty script for doxygen comments --- Makefile | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 1014e16..da7db5a 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ # By: cacharle +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2019/10/08 15:45:53 by cacharle #+# #+# # -# Updated: 2020/02/28 12:08:33 by cacharle ### ########.fr # +# Updated: 2020/04/01 18:09:04 by charles ### ########.fr # # # # **************************************************************************** # @@ -27,8 +27,10 @@ DOC_DIR = doc INCLUDE_DIR = include + CC = gcc -CCFLAGS = -I$(INCLUDE_DIR) -Wall -Wextra -Werror +OFLAG ?= -O1 +CCFLAGS = $(OFLAG) -I$(INCLUDE_DIR) -Wall -Wextra -Werror IGNORE_FILE = .libftignore IGNORE_DEFAULT = ft_printf @@ -81,8 +83,12 @@ fclean: clean re: fclean all +.PHONY: doc doc: + mkdir -p tmp + for f in $(SRC) $(INCLUDE); do mkdir -p tmp/`dirname $$f` && sed 's_^/\*$$_/**_' $$f > tmp/$$f; done $(DOXYGEN) $(DOXYGEN_FILE) doc_clean: $(RM) -r $(DOC_DIR) + -- cgit From 1925805cc760061d5742f9d215998561fcd45211 Mon Sep 17 00:00:00 2001 From: Charles Date: Wed, 1 Apr 2020 23:02:59 +0200 Subject: Added ft_vecremove, Updated README.md --- Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index da7db5a..7886427 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ # By: cacharle +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2019/10/08 15:45:53 by cacharle #+# #+# # -# Updated: 2020/04/01 18:09:04 by charles ### ########.fr # +# Updated: 2020/04/01 22:00:44 by charles ### ########.fr # # # # **************************************************************************** # @@ -31,6 +31,9 @@ INCLUDE_DIR = include CC = gcc OFLAG ?= -O1 CCFLAGS = $(OFLAG) -I$(INCLUDE_DIR) -Wall -Wextra -Werror +ifeq ($(TRAVIS_COMPILER),gcc) +CCFLAGS += -Wno-unused-result +endif IGNORE_FILE = .libftignore IGNORE_DEFAULT = ft_printf -- cgit From 966eb29634a84496e0851ef2b5a7d64f413d33ed Mon Sep 17 00:00:00 2001 From: Charles Date: Tue, 12 May 2020 19:10:14 +0200 Subject: Added ft_veciter_ret --- Makefile | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 14b556d..7ab6fe8 100644 --- a/Makefile +++ b/Makefile @@ -6,17 +6,17 @@ # By: cacharle +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2019/10/08 15:45:53 by cacharle #+# #+# # -# Updated: 2020/05/09 12:28:11 by charles ### ########.fr # +# Updated: 2020/05/12 18:00:00 by charles ### ########.fr # # # # **************************************************************************** # LIB = ar rcs RM = rm -f NORM = norminette -MAKE = make -MAKE_ARGS = --no-print-directory +MAKE = make --no-print-directory DOXYGEN = doxygen DOXYGEN_FILE = Doxyfile +JOBS = 4 SRC_DIR = src INCLUDE_DIR = include @@ -48,14 +48,15 @@ OBJ = $(SRC:$(SRC_DIR)/%.c=$(OBJ_DIR)/%.o) INCLUDE = $(shell find $(INCLUDE_DIR) -name "*.h") -# export LIBFT_SRC = $(SRC) +all: prebuild + @$(MAKE) -j$(JOBS) allnopre -all: prebuild $(NAME) +allnopre: $(NAME) .PHONY: test test: all @echo "Testing" - @$(MAKE) $(MAKE_ARGS) -C $(TEST_DIR) run + @$(MAKE) -C $(TEST_DIR) run norm: @if [ `command -v $(NORM)` ]; \ @@ -75,7 +76,7 @@ $(NAME): $(OBJ) $(INCLUDE) @echo "Linking: $@" @$(LIB) $@ $(OBJ) -$(OBJ_DIR)/%.o: $(SRC_DIR)/%.c +$(OBJ_DIR)/%.o: $(SRC_DIR)/%.c $(INCLUDE) @echo "Compiling: $@" @$(CC) $(CCFLAGS) -c -o $@ $< @@ -84,7 +85,7 @@ clean: @$(RM) -r $(OBJ_DIR) fclean: clean - @echo "Removing library" + @echo "Removing $(NAME)" @$(RM) $(NAME) re: fclean all -- cgit