baco/ft_printf
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Propagate make variables to sub make

Browse Source
This commit is contained in:
gbaconni
2022-04-26 19:23:00 +02:00
parent d9fc240b0e
commit 95130a420a
3 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Makefile
View File

@@ -6,7 +6,7 @@
# By: gbaconni@student.42lausanne.ch +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ #
# Created: 2022/01/18 15:11:16 by gbaconni #+# #+# #
# Updated: 2022/04/26 17:47:55 by gbaconni ### ########.fr #
# Updated: 2022/04/26 19:22:10 by gbaconni ### lausanne.ch #
# #
# **************************************************************************** #
#
@@ -62,7 +62,10 @@ MAKE = make
all: $(NAME)
$(NAME):
@$(MAKE) -C $(LIBFTPRINTF) all >/dev/null 2>&1
@$(MAKE) -C $(LIBFTPRINTF) all DEBUG=$(DEBUG) LEAK=$(LEAKS) FAST=$(FAST) >/dev/null 2>&1
ifeq ($(BONUS), 1)
@$(MAKE) -C $(LIBFTPRINTF) bonus DEBUG=$(DEBUG) LEAK=$(LEAKS) FAST=$(FAST) >/dev/null 2>&1
endif
@$(CC) $(CFLAGS) $(INCLUDE) $(SRC) $(LFLAGS) -o $@
clean:
@@ -72,27 +75,26 @@ fclean: clean
@$(MAKE) -C $(LIBFTPRINTF) fclean
re: fclean all
@$(MAKE) -C $(LIBFTPRINTF) re
bonus:
@$(MAKE) -C $(LIBFTPRINTF) bonus
@$(MAKE) all BONUS=1
rebonus:
@$(MAKE) -C $(LIBFTPRINTF) rebonus
@$(MAKE) re BONUS=1
check:
@$(MAKE) -C $(LIBFTPRINTF) check
leak:
@$(MAKE) -C $(LIBFTPRINTF) re LEAK=1
@$(MAKE) re LEAK=1
debug:
@$(MAKE) -C $(LIBFTPRINTF) re DEBUG=1
@$(MAKE) re DEBUG=1
fast:
@$(MAKE) -C $(LIBFTPRINTF) re FAST=1
@$(MAKE) re FAST=1
test: clean $(NAME)
test: re
@$(PREFIX) ./$(NAME) "%c" C
@$(PREFIX) ./$(NAME) "%s" "42 Lausanne"
@$(PREFIX) ./$(NAME) "%s" ""
@@ -120,7 +122,7 @@ endif
test3: fast
@$(MAKE) test FAST=1
test42: clean $(NAME)
test42: re
@$(PREFIX) ./$(NAME) "Hello World %% %44s %d %c %x %p" "Lausanne" 42 C 66 "C"
@$(PREFIX) ./$(NAME) "Characters: %c %c \n" 'a' 65
@$(PREFIX) ./$(NAME) "Decimals: %d\n" 1977
@@ -130,7 +132,7 @@ test42: clean $(NAME)
@$(PREFIX) ./$(NAME) "Width trick: %*d \n" 5 10
watch:
@read -p "cmd: " cmd; while :; do clear; date "+%F %T"; echo; $${cmd} 2>&1 | tail -n 20 || true; sleep 2; done
@read -p "cmd: " cmd; while :; do clear; date "+%F %T (every 2.0s)"; echo; sh -c "$${cmd} 2>&1" | tail -n 10 || true; sleep 2; done
doc:
@curl -s -L -z fr.subject.pdf -o fr.subject.pdf $(PDF_FR)

8
libftprintf/Makefile
View File

@@ -6,7 +6,7 @@
# By: gbaconni@student.42lausanne.ch +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ #
# Created: 2022/01/18 15:11:16 by gbaconni #+# #+# #
# Updated: 2022/04/26 17:38:06 by gbaconni ### ########.fr #
# Updated: 2022/04/26 19:15:34 by gbaconni ### lausanne.ch #
# #
# **************************************************************************** #
#
@@ -65,13 +65,11 @@ endif
ifeq ($(DEBUG), 1)
CFLAGS += -g -O0 -fsanitize=address -fsanitize=undefined -fsanitize=signed-integer-overflow
endif
ifeq ($(LEAK), 1)
CFLAGS += -g -O0
endif
VALGRIND = valgrind
VALGRINDFLAGS = --quiet --leak-check=full --show-leak-kinds=all
ifeq ($(LEAK), 1)
CFLAGS += -g -O0
PREFIX += $(VALGRIND) $(VALGRINDFLAGS)
endif
@@ -145,7 +143,7 @@ ft:
@nm $(NAME) | grep T | grep -o 'ft_.*' | sort -u
watch:
@read -p "cmd: " cmd; while :; do clear; date "+%F %T"; echo; $${cmd} 2>&1 | tail -n 20 || true; sleep 2; done
@read -p "cmd: " cmd; while :; do clear; date "+%F %T (every 2.0s)"; echo; sh -c "$${cmd} 2>&1" | tail -n 20 || true; sleep 2; done
update: sync

7
libftprintf/ft_vprintf_string.c
View File

@@ -6,7 +6,7 @@
/* By: gbaconni@student.42lausanne.ch +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2022/01/20 11:56:37 by gbaconni #+# #+# */
/* Updated: 2022/04/26 17:43:42 by gbaconni ### ########.fr */
/* Updated: 2022/04/26 18:41:30 by gbaconni ### lausanne.ch */
/* */
/* ************************************************************************** */
@@ -27,11 +27,12 @@ int ft_vprintf_string(const char *format, va_list ap)
}
const char *f;
int flags;
int precision;
int len;
int flags;
precision = 0;
flags = 0;
flags = ft_vprintf_flags_bonus(format, ap);
(void) flags;
f = format;
while (*f != '\0')
{