aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorCharles Cabergs <me@cacharle.xyz>2020-10-21 16:08:41 +0200
committerCharles Cabergs <me@cacharle.xyz>2020-10-21 16:36:47 +0200
commit4bb8708bbbb4fa9b5fa947c1be6c02adc3dc94c2 (patch)
tree436a74de65b1824a37291340f5f9af4a1148a96c /Makefile
parentca5071168115e5cd272978e13ddb9fbb1365afbc (diff)
downloadlibasm_test-4bb8708bbbb4fa9b5fa947c1be6c02adc3dc94c2.tar.gz
libasm_test-4bb8708bbbb4fa9b5fa947c1be6c02adc3dc94c2.tar.bz2
libasm_test-4bb8708bbbb4fa9b5fa947c1be6c02adc3dc94c2.zip
Cleaning Makfile, Fixing missing TO_STRING in ft_atoi_base test
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile24
1 files changed, 7 insertions, 17 deletions
diff --git a/Makefile b/Makefile
index 206544b..c13f5a9 100644
--- a/Makefile
+++ b/Makefile
@@ -6,13 +6,14 @@
# By: cacharle <marvin@42.fr> +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ #
# Created: 2020/02/08 03:06:59 by cacharle #+# #+# #
-# Updated: 2020/10/21 15:57:34 by charles ### ########.fr #
+# Updated: 2020/10/21 16:36:37 by charles ### ########.fr #
# #
# **************************************************************************** #
-LIBASM_PATH = ../pg
+LIBASM_PATH = ../libasm
RM = rm -f
+MAKE = make --no-print-directory
PYTHON = python3
CC = gcc
@@ -27,7 +28,7 @@ SRC = main.c \
test/ft_strcmp_test.c \
test/ft_write_test.c \
test/ft_read_test.c \
- test/ft_strdup_test.c \
+ test/ft_strdup_test.c
SRCBONUS = helper_list.c \
test/ft_atoi_base_test.c \
@@ -46,34 +47,23 @@ ifeq ($(LIBASM_TEST_BONUS),yes)
CCFLAGS += -D LIBASM_TEST_BONUS
endif
-# CCFLAGS += -fPIE -fPIC
-
OBJ = $(SRC:.c=.o)
-OBJBONUS = $(SRCBONUS:.c=.o)
-OBJBONUS += $(OBJ)
-
run: pretty
-# runbonus: prettybonus
-# prettybonus: allbonus pretty
pretty: all
./$(NAME) 2> /dev/null | $(PYTHON) prettier.py
-# run_rawbonus: allbonus run_raw
run_raw: all
./$(NAME) 2> /dev/null
-# run_debugbonus: allbonus run_debug
run_debug: all
./$(NAME)
all: $(NAME)
-# allbonus:
-# allbonus: all
$(NAME): libasm_all $(OBJ)
- $(CC) -fPIE -fPIC -o $@ $(OBJ) $(LDFLAGS)
+ $(CC) -o $@ $(OBJ) $(LDFLAGS)
%.o: %.c
$(CC) $(CCFLAGS) -c -o $@ $<
@@ -88,9 +78,9 @@ re: libasm_fclean libasm_all fclean all
libasm_all:
- make -C $(LIBASM_PATH) all
+ $(MAKE) -C $(LIBASM_PATH) all
libasm_fclean:
- make -C $(LIBASM_PATH) fclean
+ $(MAKE) -C $(LIBASM_PATH) fclean
.PHONY: run pretty run_raw run_debug all clean fclean re libasm_all libasm_fclean