diff --git a/config.d/build_control.m4 b/config.d/build_control.m4
index ea3c7ca50..69e65bc5e 100644
--- a/config.d/build_control.m4
+++ b/config.d/build_control.m4
@@ -279,19 +279,6 @@ fi
 
 QF_PROCESS_NEED_DIRS(tools,[bsp2img carne pak qfbsp qfcc qflight qflmp qfmodelgen qfvis qwaq wad wav])
 
-AM_CONDITIONAL(BUILD_BSP2IMG, test "$ENABLE_tools_bsp2img" = "yes")
-AM_CONDITIONAL(BUILD_CARNE, test "$ENABLE_tools_carne" = "yes")
-AM_CONDITIONAL(BUILD_PAK, test "$ENABLE_tools_pak" = "yes")
-AM_CONDITIONAL(BUILD_QFBSP, test "$ENABLE_tools_qfbsp" = "yes")
-AM_CONDITIONAL(BUILD_QFCC, test "$ENABLE_tools_qfcc" = "yes")
-AM_CONDITIONAL(BUILD_QFLIGHT, test "$ENABLE_tools_qflight" = "yes")
-AM_CONDITIONAL(BUILD_QFLMP, test "$ENABLE_tools_qflmp" = "yes")
-AM_CONDITIONAL(BUILD_QFMODELGEN, test "$ENABLE_tools_qfmodelgen" = "yes")
-AM_CONDITIONAL(BUILD_QFVIS, test "$ENABLE_tools_qfvis" = "yes")
-AM_CONDITIONAL(BUILD_QWAQ, test "$ENABLE_tools_qwaq" = "yes" -a "$ENABLE_tools_qfcc" = "yes")
-AM_CONDITIONAL(BUILD_WAD, test "$ENABLE_tools_wad" = "yes")
-AM_CONDITIONAL(BUILD_WAV, test "$ENABLE_tools_wav" = "yes")
-
 AM_CONDITIONAL(BUILD_RUAMOKO, test "$ENABLE_tools_qfcc" = "yes" -a "$ENABLE_tools_pak" = "yes")
 
 if test "x$BUILD_SW" = xyes; then
diff --git a/tools/bsp2img/Makefile.am b/tools/bsp2img/Makefile.am
index 2f0114993..cef3784cf 100644
--- a/tools/bsp2img/Makefile.am
+++ b/tools/bsp2img/Makefile.am
@@ -4,14 +4,7 @@ BSP2IMG_INCS=@BSP2IMG_INCS@
 
 INCLUDES=	-I$(top_srcdir)/include $(BSP2IMG_INCS)
 
-if BUILD_BSP2IMG
-bsp2img=bsp2img
-else
-bsp2img=
-endif
-
-bin_PROGRAMS=$(bsp2img)
-EXTRA_PROGRAMS=bsp2img
+bin_PROGRAMS=bsp2img
 
 bsp2img_SOURCES= bsp2img.c
 bsp2img_LDADD= $(BSP2IMG_LIBS)
diff --git a/tools/carne/Makefile.am b/tools/carne/Makefile.am
index bbf96147d..6a966cbbc 100644
--- a/tools/carne/Makefile.am
+++ b/tools/carne/Makefile.am
@@ -6,17 +6,8 @@ PAK_INCS=@CARNE_INCS@
 
 INCLUDES= -I$(top_srcdir)/include $(CARNE_INCS)
 
-if BUILD_CARNE
-carne=carne
-else
-carne=
-endif
-
-noinst_PROGRAMS= $(carne)
-EXTRA_PROGRAMS= carne
+noinst_PROGRAMS= carne
 
 carne_SOURCES=	main.c
 carne_LDADD=	$(CARNE_LIBS)
 carne_DEPENDENCIES= $(CARNE_DEPS)
-
-EXTRA_DIST=
diff --git a/tools/pak/Makefile.am b/tools/pak/Makefile.am
index d9c7e1016..95559f892 100644
--- a/tools/pak/Makefile.am
+++ b/tools/pak/Makefile.am
@@ -6,24 +6,14 @@ PAK_INCS=@PAK_INCS@
 
 INCLUDES= -I$(top_srcdir)/include $(PAK_INCS)
 
-if BUILD_PAK
-pak=pak
-zpak=zpak
-mans=pak.1 zpak.1
-else
-pak=
-zpak=
-mans=
-endif
+bin_PROGRAMS=		pak
+bin_SCRIPTS=		zpak
 
-bin_PROGRAMS=	$(pak)
-bin_SCRIPTS=	$(zpak)
-EXTRA_PROGRAMS=	pak
+mans=				pak.1 zpak.1
+man_MANS=			$(mans)
 
-man_MANS=	$(mans)
+pak_SOURCES=		pak.c
+pak_LDADD=			$(PAK_LIBS)
+pak_DEPENDENCIES=	$(PAK_DEPS)
 
-pak_SOURCES=	pak.c
-pak_LDADD=	$(PAK_LIBS)
-pak_DEPENDENCIES= $(PAK_DEPS)
-
-EXTRA_DIST=		pak.h pak.1 zpak zpak.1
+EXTRA_DIST=pak.h zpak $(mans)
diff --git a/tools/qfbsp/source/Makefile.am b/tools/qfbsp/source/Makefile.am
index 9e4172541..dffb426ab 100644
--- a/tools/qfbsp/source/Makefile.am
+++ b/tools/qfbsp/source/Makefile.am
@@ -6,14 +6,7 @@ QFBSP_INCS=@QFBSP_INCS@
 
 INCLUDES=	-I$(top_srcdir)/include $(QFBSP_INCS)
 
-if BUILD_QFBSP
-qfbsp=qfbsp
-else
-qfbsp=
-endif
-
-bin_PROGRAMS=	$(qfbsp)
-EXTRA_PROGRAMS= qfbsp
+bin_PROGRAMS=	qfbsp
 
 qfbsp_SOURCES= \
 		brush.c csg4.c map.c merge.c nodraw.c options.c outside.c portals.c \
diff --git a/tools/qfcc/doc/man/Makefile.am b/tools/qfcc/doc/man/Makefile.am
index 04fccbc81..cca3e62a5 100644
--- a/tools/qfcc/doc/man/Makefile.am
+++ b/tools/qfcc/doc/man/Makefile.am
@@ -1,10 +1,4 @@
 AUTOMAKE_OPTIONS= foreign
 
-if BUILD_QFCC
-mans=qfcc.1
-else
-mans=
-endif
-
-man_MANS=$(mans)
+man_MANS=qfcc.1
 EXTRA_DIST=qfcc.1
diff --git a/tools/qfcc/source/Makefile.am b/tools/qfcc/source/Makefile.am
index 42deb435c..a122a3c41 100644
--- a/tools/qfcc/source/Makefile.am
+++ b/tools/qfcc/source/Makefile.am
@@ -35,21 +35,8 @@ QFCC_INCS=@QFCC_INCS@
 INCLUDES=	-I$(top_srcdir)/include $(QFCC_INCS)
 YFLAGS = -v -d
 
-if BUILD_QFCC
-qfcc=qfcc
-qfpc=qfpc
-qfpreqcc=qfpreqcc
-qfprogs=qfprogs
-else
-qfcc=
-qfpc=
-qfpreqcc=
-qfprogs=
-endif
-
-bin_PROGRAMS=	$(qfcc) $(qfpc) $(qfprogs)
-bin_SCRIPTS=	$(qfpreqcc)
-EXTRA_PROGRAMS= qfcc qfpc qfprogs
+bin_PROGRAMS=	qfcc qfpc qfprogs
+bin_SCRIPTS=	qfpreqcc
 
 common_src=\
 	class.c codespace.c constfold.c cpp.c debug.c def.c defspace.c \
diff --git a/tools/qflight/Makefile.am b/tools/qflight/Makefile.am
index 541d1125d..e4102a7e9 100644
--- a/tools/qflight/Makefile.am
+++ b/tools/qflight/Makefile.am
@@ -2,12 +2,6 @@ AUTOMAKE_OPTIONS= foreign
 
 SUBDIRS=	include source
 
-if BUILD_QFLIGHT
-mans=qflight.1
-else
-mans=
-endif
-
-man_MANS=	$(mans)
+man_MANS=	qflight.1
 
 EXTRA_DIST=	qflight.1
diff --git a/tools/qflight/source/Makefile.am b/tools/qflight/source/Makefile.am
index d044bf93a..063521a8f 100644
--- a/tools/qflight/source/Makefile.am
+++ b/tools/qflight/source/Makefile.am
@@ -8,14 +8,7 @@ PTHREAD_CFLAGS=@PTHREAD_CFLAGS@
 
 INCLUDES=	-I$(top_srcdir)/include $(QFLIGHT_INCS) $(PTHREAD_CFLAGS)
 
-if BUILD_QFLIGHT
-qflight=qflight
-else
-qflight=
-endif
-
-bin_PROGRAMS=	$(qflight)
-EXTRA_PROGRAMS= qflight
+bin_PROGRAMS=	qflight
 
 qflight_SOURCES=\
 	entities.c ltface.c noise.c options.c properties.c qflight.c \
diff --git a/tools/qflmp/Makefile.am b/tools/qflmp/Makefile.am
index 9866c046e..dc5bf7b27 100644
--- a/tools/qflmp/Makefile.am
+++ b/tools/qflmp/Makefile.am
@@ -6,17 +6,9 @@ QFLMP_INCS=@QFLMP_INCS@
 
 INCLUDES= -I$(top_srcdir)/include $(QFLMP_INCS)
 
-if BUILD_QFLMP
-qflmp=qflmp
-#mans=qflmp.1
-else
-wad=
-#mans=
-endif
-
 bin_PROGRAMS=	$(qflmp)
-EXTRA_PROGRAMS= qflmp
 
+#mans=qflmp.1
 man_MANS=	$(mans)
 
 qflmp_SOURCES=	lmp.c
diff --git a/tools/qfmodelgen/source/Makefile.am b/tools/qfmodelgen/source/Makefile.am
index b9a410139..6e95a7a3e 100644
--- a/tools/qfmodelgen/source/Makefile.am
+++ b/tools/qfmodelgen/source/Makefile.am
@@ -6,14 +6,7 @@ QFMODELGEN_INCS=@QFMODELGEN_INCS@
 
 INCLUDES=	-I$(top_srcdir)/include $(QFMODELGEN_INCS)
 
-if BUILD_QFMODELGEN
-qfmodelgen=qfmodelgen
-else
-qfmodelgen=
-endif
-
-bin_PROGRAMS=	$(qfmodelgen)
-EXTRA_PROGRAMS= qfmodelgen
+bin_PROGRAMS=	qfmodelgen
 
 qfmodelgen_SOURCES= lbmlib.c modelgen.c trilib.c
 
diff --git a/tools/qfvis/Makefile.am b/tools/qfvis/Makefile.am
index 4a530a8bb..52a798c6e 100644
--- a/tools/qfvis/Makefile.am
+++ b/tools/qfvis/Makefile.am
@@ -2,11 +2,6 @@ AUTOMAKE_OPTIONS= foreign
 
 SUBDIRS=	include source
 
-if BUILD_QFVIS
 mans=qfvis.1
-else
-mans=
-endif
-
 man_MANS=	$(mans)
-EXTRA_DIST=	qfvis.1
+EXTRA_DIST=	$(mans)
diff --git a/tools/qfvis/source/Makefile.am b/tools/qfvis/source/Makefile.am
index 1bf4ef837..1ddcf6404 100644
--- a/tools/qfvis/source/Makefile.am
+++ b/tools/qfvis/source/Makefile.am
@@ -8,14 +8,7 @@ PTHREAD_CFLAGS=@PTHREAD_CFLAGS@
 
 INCLUDES=	-I$(top_srcdir)/include $(QFVIS_INCS) $(PTHREAD_CFLAGS)
 
-if BUILD_QFVIS
-qfvis=qfvis
-else
-qfvis=
-endif
-
-bin_PROGRAMS=	$(qfvis)
-EXTRA_PROGRAMS= qfvis
+bin_PROGRAMS=	qfvis
 
 qfvis_SOURCES=	base-vis.c flow.c options.c qfvis.c soundphs.c
 
diff --git a/tools/qwaq/Makefile.am b/tools/qwaq/Makefile.am
index b440ccab7..f01e53549 100644
--- a/tools/qwaq/Makefile.am
+++ b/tools/qwaq/Makefile.am
@@ -8,18 +8,8 @@ QFCC_DEP=$(top_builddir)/tools/qfcc/source/qfcc$(EXEEXT)
 QFCC=$(top_builddir)/tools/qfcc/source/qfcc
 QCFLAGS=-qq -g -Werror --advanced --no-default-paths
 
-if BUILD_QWAQ
-qwaq=qwaq
-data=qwaq.dat
-else
-qwaq=
-data=
-endif
-
-noinst_PROGRAMS=$(qwaq)
-noinst_DATA=$(data)
-EXTRA_PROGRAMS=qwaq
-EXTRA_DATA=qwaq.dat
+noinst_PROGRAMS=qwaq
+noinst_DATA=qwaq.dat
 
 qwaq_dat_src= \
 	defs.qc main.qc test.r
diff --git a/tools/wad/Makefile.am b/tools/wad/Makefile.am
index e951fb687..fa681057c 100644
--- a/tools/wad/Makefile.am
+++ b/tools/wad/Makefile.am
@@ -6,21 +6,14 @@ WAD_INCS=@WAD_INCS@
 
 INCLUDES= -I$(top_srcdir)/include $(WAD_INCS)
 
-if BUILD_WAD
-wad=wad
-mans=wad.1
-else
-wad=
-mans=
-endif
 
 bin_PROGRAMS=	$(wad)
-EXTRA_PROGRAMS= wad
 
+mans=wad.1
 man_MANS=	$(mans)
 
 wad_SOURCES=	grab.c script.c wad.c
 wad_LDADD=	$(WAD_LIBS)
 wad_DEPENDENCIES= $(WAD_DEPS)
 
-EXTRA_DIST=		wad.h wad.1
+EXTRA_DIST=		wad.h $(mans)
diff --git a/tools/wav/Makefile.am b/tools/wav/Makefile.am
index 740046cf0..555ae0fbb 100644
--- a/tools/wav/Makefile.am
+++ b/tools/wav/Makefile.am
@@ -6,19 +6,13 @@ WAV_INCS=@WAV_INCS@
 
 INCLUDES= -I$(top_srcdir)/include $(WAV_INCS)
 
-if BUILD_WAV
-qfwavinfo=qfwavinfo
-else
-qfwavinfo=
-endif
+bin_PROGRAMS=	qfwavinfo
 
-bin_PROGRAMS=	$(qfwavinfo)
-EXTRA_PROGRAMS= qfwavinfo
-
-#man_MANS=	qfwavinfo.1
+mans=qfwavinfo.1
+man_MANS=	#$(mans)
 
 qfwavinfo_SOURCES=	qfwavinfo.c
 qfwavinfo_LDADD=	$(WAV_LIBS)
 qfwavinfo_DEPENDENCIES= $(WAV_DEPS)
 
-EXTRA_DIST=
+EXTRA_DIST=#$(mans)