aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorNicholas Noll <nbnoll@eml.cc>2020-04-17 18:50:29 -0700
committerNicholas Noll <nbnoll@eml.cc>2020-04-17 18:50:29 -0700
commit1d188c4f816fce8728fdffaa7ad6ef205ca05abd (patch)
tree8523aea864e0d2042c4494a181c910ec1948461d /Makefile
parentb7b3dece056794d7b840b71c25ad5ca5846cf231 (diff)
chore: update naming & calling conventions
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile7
1 files changed, 4 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 65eb8b5..9c1307b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
# Compiler, Linker, and Assembler
-CC := clang
-AR := ar
-ASMR := nasm
+CC := clang
+AR := ar
+AS := nasm
# All needed build directories
INC_DIR := include
@@ -23,6 +23,7 @@ TGTLIBS :=
COMPILE = $(CC) -MMD $(CFLAGS) $(TGTFLAGS) $(INCS) $(TGTINCS) -o $@ -c $<
LINK = $(CC) -MMD $(CFLAGS) $(TGTFLAGS) -o $@ $^ $(LIBS) $(TGTLIBS)
COMPLINK = $(CC) -MMD $(CFLAGS) $(TGTFLAGS) $(INCS) $(TGTINCS) -o $@ $< $(LIBS)
+ASSEMBLE = $(AS) $(AFLAGS) $(TGTFLAGS) -o $@ $<
ARCHIVE = $(AR) -crs $@ $^
include rules.mk