From 0d679d1648888e46d1ebed044b39a6e11892c928 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 30 Jan 2000 09:36:45 +0000
Subject: [PATCH] qw_client/Makefile.in: 	put the gl specific rules back
 in (some of us have GL in 	/usr/X11R6/include rather than
 /usr/local/include or /usr/include, 	nudge, nudge).

---
 qw_client/Makefile.in | 27 +++++++++++++++++++++++++--
 uquake/Makefile.in    |  2 +-
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/qw_client/Makefile.in b/qw_client/Makefile.in
index 6d8a09e..4223af5 100644
--- a/qw_client/Makefile.in
+++ b/qw_client/Makefile.in
@@ -23,6 +23,8 @@ BUILD_DIR	:= $(TARGET_DIR)/qw_client
 OBJ_PATTERN	:= $(BUILD_DIR)/common_lib/%.@OBJEXT@ \
                    $(BUILD_DIR)/%.@OBJEXT@
 DEP_PATTERN	:= $(BUILD_DIR)/%.d $(BUILD_DIR)/common_lib/%.d
+GL_OBJ_PATTERN	:= $(BUILD_DIR)/gl/%.@OBJEXT@
+GL_DEP_PATTERN	:= $(BUILD_DIR)/gl/%.d
 
 LDFLAGS = @LDFLAGS@ @SOUND_LIBS@ @NET_LIBS@ -lm
 LIBS = @LIBS@
@@ -259,9 +261,30 @@ $(OBJ_PATTERN): $(QW_COMMON_DIR)/%.c
 $(OBJ_PATTERN): $(QW_COMMON_DIR)/%.s
 	$(CC) $(CFLAGS) -x assembler-with-cpp -o $@ -c $<
 
+$(GL_OBJ_PATTERN): $(SRC_DIR)/%.c
+	$(CC) $(CFLAGS) $(GL_CFLAGS) -o $@ -c $<
+
+$(GL_OBJ_PATTERN): $(SRC_DIR)/%.s
+	$(CC) $(CFLAGS) $(GL_CFLAGS) -x assembler-with-cpp -o $@ -c $<
+
+$(GL_OBJ_PATTERN): $(COMMON_DIR)/%.c
+	$(CC) $(CFLAGS) $(GL_CFLAGS) -o $@ -c $<
+
+$(GL_OBJ_PATTERN): $(COMMON_DIR)/%.s
+	$(CC) $(CFLAGS) $(GL_CFLAGS) -x assembler-with-cpp -o $@ -c $<
+
+$(GL_OBJ_PATTERN): $(QW_COMMON_DIR)/%.c
+	$(CC) $(CFLAGS) $(GL_CFLAGS) -o $@ -c $<
+
+$(GL_OBJ_PATTERN): $(QW_COMMON_DIR)/%.s
+	$(CC) $(CFLAGS) $(GL_CFLAGS) -x assembler-with-cpp -o $@ -c $<
+
 client_DIR:
 	@DIR=client; $(MAKE_SURE_DIR)
 
+gl_DIR:
+	@DIR=gl; $(MAKE_SURE_DIR)
+
 ###########################################################################
 #
 # Specific target rules
@@ -423,7 +446,7 @@ ifneq ($(GLQUAKE),)
 GLX_GL_SRC = gl_vidglx.c dga_check.c
 ALL_GL_SRC = $(GL_REND_SRC) $(GLX_GL_SRC)
 
-GL_REND_OBJS = $(patsubst %,$(BUILD_DIR)/%,$(addsuffix .@OBJEXT@,\
+GL_REND_OBJS = $(patsubst %,$(BUILD_DIR)/gl/%,$(addsuffix .@OBJEXT@,\
               $(basename $(GL_REND_SRC) .c .s)))
 
 GLX_GL_OBJS = $(patsubst %,$(BUILD_DIR)/%,$(addsuffix .@OBJEXT@,\
@@ -441,7 +464,7 @@ $(BUILD_DIR)/gl_vidglx.@OBJEXT@: $(COMMON_DIR)/gl_vidglx.c
 $(BUILD_DIR)/dga_check.@OBJEXT@: $(COMMON_DIR)/dga_check.c
 	$(CC) $(CFLAGS) $(X11_CFLAGS) -o $@ -c $<
 
-$(GLQUAKE): $(BUILD_DIR)/../$(GLQUAKE)
+$(GLQUAKE): gl_DIR $(BUILD_DIR)/../$(GLQUAKE)
 
 $(BUILD_DIR)/../$(GLQUAKE): $(ALL_GL_OBJS)
 	$(CC) $(CFLAGS) $(ALL_GL_OBJS) $(GL_LDFLAGS) $(LDFLAGS) $(LIBS) \
diff --git a/uquake/Makefile.in b/uquake/Makefile.in
index 73f6c27..1632c91 100644
--- a/uquake/Makefile.in
+++ b/uquake/Makefile.in
@@ -20,7 +20,7 @@ mandir		= @mandir@
 TARGET_DIR	= $(PROJECT_ODIR)/targets
 BUILD_DIR	= $(TARGET_DIR)/uquake
 
-LDFLAGS = @LDFLAGS@ @NET_LIBS@ -lm
+LDFLAGS = @LDFLAGS@ @SOUND_LIBS@ @NET_LIBS@ -lm
 LIBS = @LIBS@
 CC = @CC@
 INTEL_ARCH = @INTEL_ARCH@