summaryrefslogtreecommitdiff
path: root/src/glx
diff options
context:
space:
mode:
authorBrian <brian@yutani.localnet.net>2007-05-04 18:27:12 -0600
committerBrian <brian@yutani.localnet.net>2007-05-04 18:27:12 -0600
commitae5f67575d4696633a877e88e42499c42d8d5238 (patch)
tree13af613ddd794bea9bd366689b9ed9d334475bac /src/glx
parente75fbd3f918e86e545dfe6046b5d17a85be76f38 (diff)
Makefile clean-ups for miniglx.
Diffstat (limited to 'src/glx')
-rw-r--r--src/glx/mini/Makefile21
1 files changed, 13 insertions, 8 deletions
diff --git a/src/glx/mini/Makefile b/src/glx/mini/Makefile
index 72943105c2..71f085d5cd 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