diff --git a/configure.in b/configure.in
index 9129f3576..5fa1b26ec 100644
--- a/configure.in
+++ b/configure.in
@@ -1372,6 +1372,7 @@ AC_ARG_WITH(server,
 CL_TARGETS=""
 QW_TARGETS=""
 NQ_TARGETS=""
+VID_TARGETS=""
 if test "x$HAVE_TDFXGL" = xyes -a "x$ENABLE_3DFX" = xyes; then
 	QW_TARGETS="$QW_TARGETS qw-client-3dfx\$(EXEEXT)"
 	NQ_TARGETS="$NQ_TARGETS nq-3dfx\$(EXEEXT)"
@@ -1436,6 +1437,7 @@ if test "x$SV_TARGETS" = xyes; then
 fi
 AC_SUBST(NQ_TARGETS)
 AC_SUBST(QW_TARGETS)
+AC_SUBST(VID_TARGETS)
 
 dnl Output files
 AC_OUTPUT(
diff --git a/libs/video/targets/Makefile.am b/libs/video/targets/Makefile.am
index b774de5c8..0a13409fe 100644
--- a/libs/video/targets/Makefile.am
+++ b/libs/video/targets/Makefile.am
@@ -1,6 +1,7 @@
-INCLUDES= -I$(top_srcdir)/include
+INCLUDES= -I$(top_srcdir)/include $(GGI_CFLAGS) $(MGL_CFLAGS) $(SDL_CFLAGS) $(SVGA_CFLAGS) $(X_CFLAGS) $(GLX_CFLAGS) $(TDFXGL_CFLAGS)
 
-lib_LTLIBRARIES =	libQFjs.la $(VID_TARGETS)
+lib_LTLIBRARIES =	libQFjs.la @VID_TARGETS@
+EXTRA_LTLIBRARIES = libQFfbdev.la libQFsvga.la libQFx11.la libQFglx.la libQFsdl.la libQFsgl.la libQFtdfx.la libQFwgl.la libQFmgl.la
 
 libQFjs_la_LDFLAGS=	-version-info 1:0:0
 
@@ -16,62 +17,45 @@ endif
 libQFjs_la_CFLAGS=       $(JOY_CFLAGS)
 
 # Linux FBdev
-if $(HAVE_FBDEV)
-	YFLAGS = -d
-	libQFfbdev_la_LDFLAGS=	-version-info 1:0:0
-	libQFfbdev_la_SOURCES=	fbset.c fbset_modes_y.y fbset_modes_l.l \
-				in_fbdev.c vid.c vid_fbdev.c
-	YACCLEX_CLEANFILES=	fbset_modes_y.c fbset_modes_y.h \
-				fbset_modes_y.tab.h fbset_modes_l.c
-	EXTRA_libQFfbdev_la_SOURCES=fbset_modes_y.h
+YFLAGS = -d
+libQFfbdev_la_LDFLAGS=	-version-info 1:0:0
+libQFfbdev_la_SOURCES=	fbset.c fbset_modes_y.y fbset_modes_l.l \
+			in_fbdev.c vid.c vid_fbdev.c
+YACCLEX_CLEANFILES=	fbset_modes_y.c fbset_modes_y.h \
+			fbset_modes_y.tab.h fbset_modes_l.c
+EXTRA_libQFfbdev_la_SOURCES=fbset_modes_y.h
 
-	fbset_modes_y.lo: $(srcdir)/fbset_modes_y.c
-		$(COMPILE) -Wno-error -c $<
-	fbset_modes_l.lo: $(srcdir)/fbset_modes_l.c
-		$(COMPILE) -Wno-error -c $<
-endif
+fbset_modes_y.lo: $(srcdir)/fbset_modes_y.c
+	$(COMPILE) -Wno-error -c $<
+fbset_modes_l.lo: $(srcdir)/fbset_modes_l.c
+	$(COMPILE) -Wno-error -c $<
 
-if $(HAVE_MGL)
-	libQFmgl_la_LDFLAGS=	-version-info 1:0:0
-	libQFmgl_la_SOURCES=	in_win.c vid.c vid_common_sw.c vid_mgl.c
-endif
+libQFmgl_la_LDFLAGS=	-version-info 1:0:0
+libQFmgl_la_SOURCES=	in_win.c vid.c vid_common_sw.c vid_mgl.c
 
-if $(HAVE_SDL)
-	libQFsdl_la_LDFLAGS=	-version-info 1:0:0
-	libQFsdl_la_SOURCES=	in_sdl.c vid.c vid_common_sw.c vid_sdl.c
-endif
+libQFsdl_la_LDFLAGS=	-version-info 1:0:0
+libQFsdl_la_SOURCES=	in_sdl.c vid.c vid_common_sw.c vid_sdl.c
 
-if $(HAVE_SVGA)
-	libQFsvga_la_LDFLAGS=	-version-info 1:0:0
-	libQFsvga_la_SOURCES=	d_copy.S in_svgalib.c vid.c vid_common_sw.c \
-				vid_svgalib.c
-endif
+libQFsvga_la_LDFLAGS=	-version-info 1:0:0
+libQFsvga_la_SOURCES=	d_copy.S in_svgalib.c vid.c vid_common_sw.c \
+			vid_svgalib.c
 
-if $(HAVE_X11)
-	libQFx11_la_LDFLAGS=	-version-info 1:0:0
-	libQFx11_la_SOURCES=	in_x11.c vid.c context_x11.c dga_check.c \
-				vid_common_sw.c vid_x11.c
+libQFx11_la_LDFLAGS=	-version-info 1:0:0
+libQFx11_la_SOURCES=	in_x11.c vid.c context_x11.c dga_check.c \
+			vid_common_sw.c vid_x11.c
 
-if $(HAVE_GLX)
-	libQFglx_la_LDFLAGS=	-version-info 1:0:0
-	libQFglx_la_SOURCES=	in_x11.c vid.c context_x11.c dga_check.c \
-				vid_common_gl.c vid_glx.c
-endif
+libQFglx_la_LDFLAGS=	-version-info 1:0:0
+libQFglx_la_SOURCES=	in_x11.c vid.c context_x11.c dga_check.c \
+			vid_common_gl.c vid_glx.c
 
-if $(HAVE_SGL)
-	libQFsgl_la_LDFLAGS=	-version-info 1:0:0
-	libQFsgl_la_SOURCES=	in_sdl.c vid.c vid_common_gl.c vid_sgl.c
-endif
+libQFsgl_la_LDFLAGS=	-version-info 1:0:0
+libQFsgl_la_SOURCES=	in_sdl.c vid.c vid_common_gl.c vid_sgl.c
 
-if $(HAVE_TDFX)
-	libQFtdfx_la_LDFLAGS=	-version-info 1:0:0
-	libQFtdfx_la_SOURCES=	in_svgalib.c vid.c vid_common_gl.c vid_3dfxsvga.c
-endif
+libQFtdfx_la_LDFLAGS=	-version-info 1:0:0
+libQFtdfx_la_SOURCES=	in_svgalib.c vid.c vid_common_gl.c vid_3dfxsvga.c
 
-if $(HAVE_WGL)
-	libQFwgl_la_LDFLAGS=	-version-info 1:0:0
-	libQFwgl_la_SOURCES=	in_win.c vid.c vid_wgl.c
-endif
+libQFwgl_la_LDFLAGS=	-version-info 1:0:0
+libQFwgl_la_SOURCES=	in_win.c vid.c vid_wgl.c
 
 LIBLIST =	$(lib_LTLIBRARIES) @LIBRARY_SEARCH_PATH@