diff --git a/common/Makefile.in b/common/Makefile.in
index c22ce47..1a5f05c 100644
--- a/common/Makefile.in
+++ b/common/Makefile.in
@@ -3,10 +3,18 @@
 # Quake general stuff
 #
 
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+datadir = @datadir@
+
 top_builddir	= ..
-PROJECT_DIR	:= @top_srcdir@
+PROJECT_DIR	:= ${top_srcdir}
 BIN_PREFIX	:= common
-SRC_DIR		:= @srcdir@
 MODULE		:= common
 OBJ_PATTERN	= $(BUILD_DIR)/sound_lib/%.o $(BUILD_DIR)/common_lib/%.o
 
@@ -15,11 +23,11 @@ include $(top_builddir)/Rules.mk
 SOUND_LIB	:= sound_lib.a
 
 lib_targets   = $(SOUND_LIB) $(CD_LIB) $(COMMON_LIB)
-targets       = $(lib_targets)
-CLEAN_TARGETS = $(patsubst %,clean-%, $(targets))
-.PHONY: $(targets) $(CLEAN_TARGETS)
+targets       =
+CLEAN_TARGETS = $(patsubst %,clean-%, $(lib_targets) $(targets))
+.PHONY: $(lib_targets) $(targets) $(CLEAN_TARGETS)
 
-all: $(targets)
+all: $(lib_targets) $(targets)
 ########################################################################
 #
 # Source files
diff --git a/qw_client/Makefile.in b/qw_client/Makefile.in
index 6bd2fc9..b42edd1 100644
--- a/qw_client/Makefile.in
+++ b/qw_client/Makefile.in
@@ -65,11 +65,11 @@ endif
 soft_targets  = $(SVGAQUAKE) $(GGIQUAKE) $(SDLQUAKE) $(X11QUAKE) $(MGLQUAKE)
 gl_targets    = $(GLQUAKE) $(TDFXQUAKE)
 lib_targets   = $(COMMON_LIB)
-targets       = $(lib_targets) $(soft_targets) $(gl_targets)
-CLEAN_TARGETS = $(patsubst %,clean-%, $(soft_targets) $(gl_targets))
-.PHONY: $(targets) $(CLEAN_TARGETS)
+targets       = $(soft_targets) $(gl_targets)
+CLEAN_TARGETS = $(patsubst %,clean-%, $(lib_targets) $(targets))
+.PHONY: $(lib_targets) $(targets) $(CLEAN_TARGETS)
 
-all: $(targets)
+all: $(lib_targets) $(targets)
 ########################################################################
 #
 # Source files
diff --git a/uquake/Makefile.in b/uquake/Makefile.in
index d80d40a..fbff926 100644
--- a/uquake/Makefile.in
+++ b/uquake/Makefile.in
@@ -63,11 +63,11 @@ soft_targets  = $(X11QUAKE) $(SVGAQUAKE) $(GGIQUAKE) $(SDLQUAKE) $(MGLQUAKE) \
 	$(VGAQUAKE)
 gl_targets    = $(GLQUAKE) $(TDFXQUAKE)
 lib_targets   = $(COMMON_LIB)
-targets       = $(lib_targets) $(gl_targets) $(soft_targets)
-CLEAN_TARGETS = $(patsubst %,clean-%, $(gl_targets) $(soft_targets))
-.PHONY: $(targets) $(CLEAN_TARGETS) clean-soft clean-gl
+targets       = $(gl_targets) $(soft_targets)
+CLEAN_TARGETS = $(patsubst %,clean-%, $(lib_targets) $(targets))
+.PHONY: $(lib_targets) $(targets) $(CLEAN_TARGETS) clean-soft clean-gl
 
-all: $(targets)
+all: $(lib_targets) $(targets)
 
 ########################################################################
 #