-INCLUDE = ../include
-CC = gcc
-CFLAGS = -g -Wall -I $(INCLUDE)
-COMMONSRC = struct.o cmd.o cerr.o
-ASSRC = assemble.o token.o label.o macro.o
-EXECSRC = exec.o dump.o
-.PHPNY: all clean
-all: ../casl2 ../comet2 TAGS
-../casl2: casl2.o $(COMMONSRC) $(ASSRC) $(EXECSRC)
+INCLUDE := ../include
+CC := gcc
+CFLAGS := -g -Wall -Wextra -I $(INCLUDE)
+RM := rm -f
+
+COMMONSRC := word.c cmem.c cerr.c
+CASL2SRC := struct.c hash.c
+ASSRC := assemble.c token.c label.c
+EXECSRC := exec.c dump.c
+
+.PHONY: all clean
+
+all: ../casl2 ../comet2 ../dumpword
+ @rm -f *.o
+
+../casl2: casl2.o $(subst .c,.o,$(COMMONSRC) $(CASL2SRC) $(ASSRC) $(EXECSRC))
+ $(CC) $(CFLAGS) -o $@ $^
+ @rm -f *.d
+
+../comet2: comet2.o $(subst .c,.o,$(COMMONSRC) $(CASL2SRC) $(EXECSRC))