diff --git a/qw_client/Makefile.in b/qw_client/Makefile.in
index 6f811ed..5dced84 100644
--- a/qw_client/Makefile.in
+++ b/qw_client/Makefile.in
@@ -218,13 +218,13 @@ $(BUILD_DIR)/soft/%.@OBJEXT@: $(SRC_DIR)/%.c
 	$(CC) $(CFLAGS) -o $@ -c $<
 
 $(BUILD_DIR)/soft/%.@OBJEXT@: $(SRC_DIR)/%.s
-	$(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $<
+	$(CC) $(CFLAGS) -x assembler-with-cpp -o $@ -c $<
 
 $(BUILD_DIR)/soft/%.@OBJEXT@: $(COMMON_DIR)/%.c
 	$(CC) $(CFLAGS) -o $@ -c $<
 
 $(BUILD_DIR)/soft/%.@OBJEXT@: $(COMMON_DIR)/%.s
-	$(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $<
+	$(CC) $(CFLAGS) -x assembler-with-cpp -o $@ -c $<
 
 $(BUILD_DIR)/soft/%.o: $(QW_COMMON_DIR)/%.c
 	$(CC) $(CFLAGS) -o $@ -c $<
@@ -238,13 +238,13 @@ $(BUILD_DIR)/gl/%.@OBJEXT@: $(SRC_DIR)/%.c
 	$(CC) $(CFLAGS) $(GL_CFLAGS) -o $@ -c $<
 
 $(BUILD_DIR)/gl/%.@OBJEXT@: $(SRC_DIR)/%.s
-	$(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $<
+	$(CC) $(CFLAGS) -x assembler-with-cpp -o $@ -c $<
 
 $(BUILD_DIR)/gl/%.@OBJEXT@: $(COMMON_DIR)/%.c
 	$(CC) $(CFLAGS) $(GL_CFLAGS) -o $@ -c $<
 
 $(BUILD_DIR)/gl/%.@OBJEXT@: $(COMMON_DIR)/%.s
-	$(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $<
+	$(CC) $(CFLAGS) -x assembler-with-cpp -o $@ -c $<
 
 $(BUILD_DIR)/gl/%.o: $(QW_COMMON_DIR)/%.c
 	$(CC) $(CFLAGS) -o $@ -c $<
@@ -298,7 +298,7 @@ $(BUILD_DIR)/soft/vid_svgalib.@OBJEXT@: $(COMMON_DIR)/vid_svgalib.c
 	$(CC) -O $(CFLAGS) $(SVGA_CFLAGS) -o $@ -c $<
 
 $(BUILD_DIR)/soft/d_copy.@OBJEXT@: $(COMMON_DIR)/d_copy.s
-	$(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $<
+	$(CC) $(CFLAGS) -x assembler-with-cpp -o $@ -c $<
 
 $(SVGAQUAKE): soft_DIR $(BUILD_DIR)/../$(SVGAQUAKE)
 
diff --git a/qw_server/Makefile.in b/qw_server/Makefile.in
index b182581..6c54d18 100644
--- a/qw_server/Makefile.in
+++ b/qw_server/Makefile.in
@@ -93,7 +93,7 @@ $(BUILD_DIR)/%.o: $(SRC_DIR)/%.c
 	$(CC) $(CFLAGS) $(SRV_CFLAGS) -o $@ -c $<
 
 $(BUILD_DIR)/%.o: $(SRC_DIR)/%.s
-	$(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $<
+	$(CC) $(CFLAGS) -x assembler-with-cpp -o $@ -c $<
 
 $(BUILD_DIR)/%.o: $(COMMON_DIR)/%.c
 	$(CC) $(CFLAGS) $(SRV_CFLAGS) -o $@ -c $<
@@ -102,7 +102,7 @@ $(BUILD_DIR)/%.o: $(QW_COMMON_DIR)/%.c
 	$(CC) $(CFLAGS) $(SRV_CFLAGS) -o $@ -c $<
 
 $(BUILD_DIR)/%.o: $(COMMON_DIR)/%.s
-	$(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $<
+	$(CC) $(CFLAGS) -x assembler-with-cpp -o $@ -c $<
 
 $(SRVQUAKE): srv_DIR $(BUILD_DIR)/../$(SRVQUAKE)
 
@@ -120,7 +120,7 @@ distclean: clean
 	rm -f config.cache config.log config.status Makefile
 
 clean: $(CLEAN_TARGETS)
-	rm -r $(BUILD_DIR)
+	rm -rf $(BUILD_DIR)
 
 install: $(targets)
 	$(PROJECT_DIR)/mkinstalldirs $(DESTDIR)$(prefix)$(bindir)
diff --git a/uquake/Makefile.in b/uquake/Makefile.in
index 096d4e4..6802b16 100644
--- a/uquake/Makefile.in
+++ b/uquake/Makefile.in
@@ -214,13 +214,13 @@ $(BUILD_DIR)/soft/%.@OBJEXT@: $(SRC_DIR)/%.c
 	$(CC) $(CFLAGS) -o $@ -c $<
 
 $(BUILD_DIR)/soft/%.@OBJEXT@: $(SRC_DIR)/%.s
-	$(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $<
+	$(CC) $(CFLAGS) -x assembler-with-cpp -o $@ -c $<
 
 $(BUILD_DIR)/soft/%.@OBJEXT@: $(COMMON_DIR)/%.c
 	$(CC) $(CFLAGS) -o $@ -c $<
 
 $(BUILD_DIR)/soft/%.@OBJEXT@: $(COMMON_DIR)/%.s
-	$(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $<
+	$(CC) $(CFLAGS) -x assembler-with-cpp -o $@ -c $<
 
 # GL targets
 
@@ -231,13 +231,13 @@ $(BUILD_DIR)/gl/%.@OBJEXT@: $(SRC_DIR)/%.c
 	$(CC) $(CFLAGS) $(GL_CFLAGS) -o $@ -c $<
 
 $(BUILD_DIR)/gl/%.@OBJEXT@: $(SRC_DIR)/%.s
-	$(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $<
+	$(CC) $(CFLAGS) -x assembler-with-cpp -o $@ -c $<
 
 $(BUILD_DIR)/gl/%.@OBJEXT@: $(COMMON_DIR)/%.c
 	$(CC) $(CFLAGS) $(GL_CFLAGS) -o $@ -c $<
 
 $(BUILD_DIR)/gl/%.@OBJEXT@: $(COMMON_DIR)/%.s
-	$(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $<
+	$(CC) $(CFLAGS) -x assembler-with-cpp -o $@ -c $<
 
 ###########################################################################
 #
@@ -288,7 +288,7 @@ $(BUILD_DIR)/soft/vid_svgalib.@OBJEXT@: $(COMMON_DIR)/vid_svgalib.c
 	$(CC) -O $(CFLAGS) $(SVGA_CFLAGS) -o $@ -c $<
 
 $(BUILD_DIR)/soft/d_copy.@OBJEXT@: $(COMMON_DIR)/d_copy.s
-	$(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $<
+	$(CC) $(CFLAGS) -x assembler-with-cpp -o $@ -c $<
 
 $(SVGAQUAKE): soft_DIR $(BUILD_DIR)/../$(SVGAQUAKE)