From 2e4d8d147307b68de2824a707e12d5fdd9b7faab Mon Sep 17 00:00:00 2001 From: Jeff Teunissen Date: Mon, 15 Oct 2001 22:32:28 +0000 Subject: [PATCH] Makefile fixes -- video driver libs are gone. --- configure.ac | 2 +- libs/video/targets/Makefile.am | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 5c7917673..b3cf163fc 100644 --- a/configure.ac +++ b/configure.ac @@ -1455,7 +1455,7 @@ if test "x$HAVE_SVGA" = xyes; then QW_TARGETS="$QW_TARGETS qw-client-svga\$(EXEEXT)" NQ_TARGETS="$NQ_TARGETS nq-svga\$(EXEEXT)" CL_TARGETS="$CL_TARGETS SVGAlib" - VID_TARGETS_NOINST="$VID_TARGETS_NOINST libQFsvga.la" + VID_TARGETS="$VID_TARGETS libQFsvga.la" BUILD_SW=yes fi CAN_BUILD_SW=yes diff --git a/libs/video/targets/Makefile.am b/libs/video/targets/Makefile.am index 3c78c0164..ecdeafb89 100644 --- a/libs/video/targets/Makefile.am +++ b/libs/video/targets/Makefile.am @@ -1,13 +1,11 @@ INCLUDES= -I$(top_srcdir)/include $(GGI_CFLAGS) $(MGL_CFLAGS) $(SDL_CFLAGS) $(SVGA_CFLAGS) $(X_CFLAGS) $(GLIDE_CFLAGS) -lib_LTLIBRARIES= @VID_TARGETS@ +noinst_LTLIBRARIES= libasm.la @VID_TARGETS@ EXTRA_LTLIBRARIES= \ libQFjs.la libQFfbdev.la libQFglx.la libQFsvga.la libQFx11.la \ libQFsdl.la libQFsdl32.la libQFsgl.la libQFwgl.la -noinst_LTLIBRARIES= libasm.la @VID_TARGETS_NOINST@ - if ASM_ARCH libasm_la_SOURCES= d_copy.S else