Makefile clean-ups for miniglx.

diff --git a/configs/linux-solo b/configs/linux-solo
index 730c245d90eb447e0dfc5bb44abeac72cf2ba0cd..a6cab8c9b3b4994c60234534667dba03224cb834 100644 (file)
--- a/configs/linux-solo
+++ b/configs/linux-solo
@@ -15,6 +15,13 @@ PIC_FLAGS  = -fPIC
 # Add '-DGLX_USE_TLS' to ARCH_FLAGS to enable TLS support.
 ARCH_FLAGS ?=
 
+# DRM and pciaccess
+LIBDRM_CFLAGS = `pkg-config --cflags libdrm`
+LIBDRM_LIB = `pkg-config --libs libdrm`
+PCIACCESS_CFLAGS = `pkg-config --cflags pciaccess`
+PCIACCESS_LIB = `pkg-config --libs pciaccess`
+
+
 DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \
        -D_BSD_SOURCE -D_GNU_SOURCE -DHAVE_POSIX_MEMALIGN \
        -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DDRM_USE_MALLOC -DIN_DRI_DRIVER
@@ -28,7 +35,7 @@ CXXFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES)
 ASM_SOURCES = 
 
 # Library/program dependencies
-DRI_LIB_DEPS = -lm -lpthread -lexpat -ldl -L$(TOP)/$(LIB_DIR) 
+DRI_LIB_DEPS = -lm -lpthread -lexpat -ldl -L$(TOP)/$(LIB_DIR) $(PCIACCESS_LIB)
 GL_LIB_DEPS = -lm -lpthread -ldl
 GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm
 GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lm
@@ -39,5 +46,5 @@ SRC_DIRS = glx/mini mesa glu glut/mini
 DRIVER_DIRS = dri
 PROGRAM_DIRS = miniglx
 
-#DRI_DIRS = ffb gamma sis savage
-DRI_DIRS = i810 i915 mach64 mga r128 r200 radeon tdfx unichrome fb
+#DRI_DIRS = ffb gamma sis savage tdfx unichrome fb
+DRI_DIRS = i810 i915tex i915 mach64 mga r128 r200 radeon

diff --git a/src/glx/mini/Makefile b/src/glx/mini/Makefile
index 72943105c25f65e755ac12cda6d9e87d5042863c..71f085d5cd96534edd2195912a269b259a5f8619 100644 (file)
--- 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 5261a4b55d1ef36628cbe7b349a685621870fab6..26f9bb74c87e0ffca38846aa52c7073ad4ed098f 100644 (file)
--- 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) \