--- truecrypt/linux/cli/makefile	2018/04/24 16:44:06	1.1.1.2
+++ truecrypt/linux/cli/makefile	2018/04/24 16:45:57	1.1.1.4
@@ -1,9 +1,9 @@
-# TrueCrypt Linux Makefile
+# TrueCrypt Linux CLI Makefile
 
 TC_COMMON := ../../Common
 TC_CRYPTO := ../../Crypto
 
-CC := gcc
+CC ?= gcc
 
 ifneq ($(MAKECMDGOALS),clean)
 -include ../Common/.platform
@@ -19,9 +19,11 @@ CFLAGS += -D_cdecl="" -DBOOL=int -DTRUE=
 CFLAGS += $(TYPES)
 
 ifndef DEBUG
+# Do not enable strict aliasing
 CFLAGS += -O2 -fno-strict-aliasing
 else
 CFLAGS += -ggdb
+NO_STRIP := 1
 endif
 
 KERNEL_OBJS_F := ../.kernel-objs
@@ -49,8 +51,11 @@ OBJS += $(TC_COMMON)/Crc.o
 OBJS += $(TC_COMMON)/Crypto.o
 OBJS += $(TC_COMMON)/Endian.o
 OBJS += $(TC_COMMON)/GfMul.o
+OBJS += $(TC_COMMON)/Fat.o
+OBJS += $(TC_COMMON)/Format.o
 OBJS += $(TC_COMMON)/Keyfiles.o
 OBJS += $(TC_COMMON)/Pkcs5.o
+OBJS += $(TC_COMMON)/Random.o
 OBJS += $(TC_COMMON)/Volumes.o
 OBJS += $(TC_COMMON)/Tests.o
 OBJS += Cli.o 
@@ -71,7 +76,7 @@ all: objclean truecrypt
 truecrypt: $(OBJS)
 	@echo Linking $@
 	@$(CC) -o $@ $(OBJS)
-ifndef DEBUG
+ifndef NO_STRIP
 	@strip $@
 endif