From ae5f67575d4696633a877e88e42499c42d8d5238 Mon Sep 17 00:00:00 2001
From: Brian <brian@yutani.localnet.net>
Date: Fri, 4 May 2007 18:27:12 -0600
Subject: Makefile clean-ups for miniglx.

---
 src/glx/mini/Makefile                  | 21 +++++++++++++--------
 src/mesa/drivers/dri/Makefile.template |  3 ++-
 2 files changed, 15 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/glx/mini/Makefile b/src/glx/mini/Makefile
index 72943105c25..71f085d5cd9 100644
--- a/src/glx/mini/Makefile
+++ b/src/glx/mini/Makefile
@@ -1,5 +1,4 @@
-# Build a subset DRI-based libGL.so library.
-# Indirect rendering not supported, etc.
+# Build the MiniGLX libGL.so library.
 
 TOP = ../../..
 include $(TOP)/configs/current
@@ -29,7 +28,9 @@ INCLUDE_DIRS = \
 	-I$(TOP)/src/mesa/glapi \
 	-I$(TOP)/src/glx/x11 \
 	-I$(TOP)/src/mesa/drivers/dri/common \
-	`pkg-config --cflags libdrm`
+	$(LIBDRM_CFLAGS) \
+	$(PCIACCESS_CFLAGS)
+
 
 
 ##### RULES #####
@@ -43,16 +44,20 @@ INCLUDE_DIRS = \
 
 ##### TARGETS #####
 
-default: depend $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME)
+default: depend $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(TOP)/$(LIB_DIR)/miniglx.conf
 
 
 # Make libGL
 $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME):  $(OBJECTS) Makefile
-	$(TOP)/bin/mklib -o $(GL_LIB) -linker '$(CC)' \
+	@ $(TOP)/bin/mklib -o $(GL_LIB) -linker '$(CC)' \
 		-major 1 -minor 2 $(MKLIB_OPTIONS) \
-		-install $(TOP)/$(LIB_DIR) $(GL_LIB_DEPS) $(OBJECTS) `/usr/bin/pkg-config --libs libdrm` `/usr/bin/pkg-config --libs pciaccess`
-	rm -f $(TOP)/$(LIB_DIR)/miniglx.conf
-	install example.miniglx.conf $(TOP)/$(LIB_DIR)/miniglx.conf
+		-install $(TOP)/$(LIB_DIR) $(GL_LIB_DEPS) $(OBJECTS) \
+		$(LIBDRM_LIB) $(PCIACCESS_LIB)
+
+
+# install sample miniglx.conf
+$(TOP)/$(LIB_DIR)/miniglx.conf:
+	$(INSTALL) example.miniglx.conf $(TOP)/$(LIB_DIR)/miniglx.conf
 
 
 drmtest: xf86drm.o drmtest.o
diff --git a/src/mesa/drivers/dri/Makefile.template b/src/mesa/drivers/dri/Makefile.template
index 5261a4b55d1..26f9bb74c87 100644
--- a/src/mesa/drivers/dri/Makefile.template
+++ b/src/mesa/drivers/dri/Makefile.template
@@ -29,7 +29,8 @@ WINOBJ=
 WINLIB=-L$(MESA)/src/glx/mini
 MINIGLX_INCLUDES = -I$(TOP)/src/glx/mini
 INCLUDES = $(MINIGLX_INCLUDES) \
-	   $(SHARED_INCLUDES)
+	   $(SHARED_INCLUDES) \
+	   $(PCIACCESS_CFLAGS)
 
 OBJECTS = $(C_SOURCES:.c=.o) \
 	  $(MINIGLX_SOURCES:.c=.o) \
-- 
cgit v1.2.3