From 95c0a50665870bf647ecf0c717b28e26fc4825d1 Mon Sep 17 00:00:00 2001
From: Marcus Sundberg <mackan@stacken.kth.se>
Date: Wed, 12 Jan 2000 21:18:44 +0000
Subject: [PATCH] Added the not-so-useless ifneqs back - they prevents warnings
 from make

---
 qw_client/Makefile.in | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/qw_client/Makefile.in b/qw_client/Makefile.in
index f748452..58c9f73 100644
--- a/qw_client/Makefile.in
+++ b/qw_client/Makefile.in
@@ -259,6 +259,8 @@ $(BUILD_DIR)/gl/%.o: $(QW_COMMON_DIR)/%.c
 
 # X11 Software target
 
+ifneq ($(X11QUAKE),)
+
 ALL_X11_SRC  = $(GENERAL_SRC) $(CD_AUDIO_SRC) $(SW_REND_SRC) @X11_VID_SRC@\
                model.c
 ALL_X11_OBJS = $(patsubst %,$(BUILD_DIR)/soft/%,$(addsuffix .@OBJEXT@,\
@@ -281,9 +283,11 @@ $(BUILD_DIR)/../$(X11QUAKE): $(ALL_X11_OBJS)
 	$(CC) $(CFLAGS) $(ALL_X11_OBJS) $(X11_LDFLAGS) $(LDFLAGS) $(LIBS) \
 	-o $(BUILD_DIR)/../$(X11QUAKE)
 
+endif
 
 # SVGALib software target
 
+ifneq ($(SVGAQUAKE),)
 ALL_SVGA_SRC = $(GENERAL_SRC) $(CD_AUDIO_SRC) $(SW_REND_SRC) \
 		vid_svgalib.c in_svgalib.c d_copy.s model.c
 ALL_SVGA_OBJS = $(patsubst %,$(BUILD_DIR)/soft/%,$(addsuffix .@OBJEXT@,\
@@ -305,9 +309,12 @@ $(BUILD_DIR)/../$(SVGAQUAKE): $(ALL_SVGA_OBJS)
 	$(CC) $(CFLAGS) $(ALL_SVGA_OBJS) $(SVGA_LDFLAGS) $(LDFLAGS) $(LIBS) \
 	-o $(BUILD_DIR)/../$(SVGAQUAKE)
 
+endif
 
 # GGI software target
 
+ifneq ($(GGIQUAKE),)
+
 # Map the list of source files into a list of object files
 ALL_GGI_SRC   = $(GENERAL_SRC) $(CD_AUDIO_SRC) $(SW_REND_SRC) vid_ggi.c\
                 model.c
@@ -327,9 +334,11 @@ $(BUILD_DIR)/../$(GGIQUAKE): $(ALL_GGI_OBJS)
 	$(CC) $(CFLAGS) $(ALL_GGI_OBJS) $(GGI_LDFLAGS) $(LDFLAGS) $(LIBS) \
 	-o $(BUILD_DIR)/../$(GGIQUAKE)
 
+endif
 
 # SDL software target
 
+ifneq ($(SDLQUAKE),)
 ALL_SDL_SRC  = $(GENERAL_SRC) $(SW_REND_SRC) $(SDL_SRC) vid_sdl.c cd_sdl.c\
                model.c
 ALL_SDL_OBJS = $(patsubst %,$(BUILD_DIR)/soft/%,$(addsuffix .@OBJEXT@,\
@@ -350,9 +359,12 @@ $(BUILD_DIR)/../$(SDLQUAKE): $(ALL_SDL_OBJS)
 	$(CC) $(CFLAGS) $(ALL_SDL_OBJS) $(SDL_LDFLAGS) $(LDFLAGS) $(LIBS) \
 	-o $(BUILD_DIR)/../$(SDLQUAKE)
 
+endif
 
 # MGL software target
 
+ifneq ($(MGLQUAKE),)
+
 # Map the list of source files into a list of object files
 ALL_MGL_SRC = $(GENERAL_SRC) $(CD_AUDIO_SRC) $(SW_REND_SRC) \
 	vid_win.c in_win.c model.c
@@ -371,22 +383,23 @@ $(BUILD_DIR)/../$(MGLQUAKE): $(ALL_MGL_OBJS)
 	$(CC) $(CFLAGS) $(ALL_MGL_OBJS) $(MGL_LDFLAGS) $(LDFLAGS) $(LIBS) \
 	-o $(BUILD_DIR)/../$(MGLQUAKE)
 
+endif
 
 # X11 GL target
 
-ALL_GL_SRC  = $(GENERAL_SRC) $(CD_AUDIO_SRC) $(GL_REND_SRC) \
-		gl_vidlinuxglx.c
+ifneq ($(GLQUAKE),)
+ALL_GL_SRC  = $(GENERAL_SRC) $(CD_AUDIO_SRC) $(GL_REND_SRC) gl_vidlinuxglx.c
 ALL_GL_OBJS = $(patsubst %,$(BUILD_DIR)/gl/%,$(addsuffix .@OBJEXT@,\
               $(basename $(ALL_GL_SRC) .c .s)))
 
 GL_CFLAGS  = -DGLQUAKE @OGL_CFLAGS@
-GL_LDFLAGS = $(X11_LDFLAGS) @OGL_LIBS@
+GL_LDFLAGS = $(X11_LDFLAGS) @OGL_LIBS@ @DGA_LIBS@
 
 $(BUILD_DIR)/gl/vid_linuxglx.o: $(COMMON_DIR)/vid_linuxglx.c
 	$(CC) $(CFLAGS) $(GL_CFLAGS) -o $@ -c $<
 
 $(BUILD_DIR)/gl/dga_check.@OBJEXT@: $(COMMON_DIR)/dga_check.c
-	$(CC) $(CFLAGS) $(X11_CFLAGS) -o $@ -c $<
+       $(CC) $(CFLAGS) $(X11_CFLAGS) -o $@ -c $<
 
 $(GLQUAKE): gl_DIR $(BUILD_DIR)/../$(GLQUAKE)
 
@@ -394,9 +407,12 @@ $(BUILD_DIR)/../$(GLQUAKE): $(ALL_GL_OBJS)
 	$(CC) $(CFLAGS) $(ALL_GL_OBJS) $(GL_LDFLAGS) $(LDFLAGS) $(LIBS) \
 	-o $(BUILD_DIR)/../$(GLQUAKE)
 
+endif
+
 
 # 3Dfx GL MCD target
 
+ifneq ($(TDFXQUAKE),)
 ALL_TDFX_SRC  = $(GENERAL_SRC) $(CD_AUDIO_SRC) $(GL_REND_SRC) \
 		gl_vidlinux_3dfx.c in_svgalib.c
 ALL_TDFX_OBJS = $(patsubst %,$(BUILD_DIR)/gl/%,$(addsuffix .@OBJEXT@,\
@@ -414,6 +430,8 @@ $(BUILD_DIR)/../$(TDFXQUAKE): $(ALL_TDFX_OBJS)
 	$(CC) $(CFLAGS) $(ALL_TDFX_OBJS) $(TDFX_LDFLAGS) $(LDFLAGS) $(LIBS) \
 	-o $(BUILD_DIR)/../$(TDFXQUAKE)
 
+endif
+
 
 ###########################################################################
 #