summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2008-06-05 14:40:27 -0600
committerBrian Paul <[email protected]>2008-06-05 14:40:27 -0600
commitd607e30232add2358e915027d030ac094394b08e (patch)
tree56f7d0c8451612fa418bce038ea17d60f6f54e2b /src
parente7725e136f0fa64c75813a3b138dc81a8b19400d (diff)
mesa: always build libglapi.a, updated subdir, gl.pc rule code from master
Diffstat (limited to 'src')
-rw-r--r--src/mesa/Makefile22
1 files changed, 16 insertions, 6 deletions
diff --git a/src/mesa/Makefile b/src/mesa/Makefile
index d663cbabfe8..e1ff0b2fa2f 100644
--- a/src/mesa/Makefile
+++ b/src/mesa/Makefile
@@ -23,11 +23,8 @@ GL_TINY = 0$(MESA_MAJOR)0$(MESA_MINOR)0$(MESA_TINY)
$(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $< -o $@
-default: depend subdirs libmesa.a
+default: depend subdirs libmesa.a libglapi.a
-ifneq ($(DRIVER_DIRS),dri)
-default: libglapi.a
-endif
######################################################################
@@ -108,8 +105,21 @@ depend: $(ALL_SOURCES)
subdirs:
- @ (cd x86 ; $(MAKE))
- @ (cd x86-64 ; $(MAKE))
+ @ if echo "$(ASM_FLAGS)" | grep -q USE_X86_ASM ; then \
+ (cd x86 && $(MAKE)) || exit 1 ; \
+ fi
+ @ if echo "$(ASM_FLAGS)" | grep -q USE_X86_64_ASM ; then \
+ (cd x86 && $(MAKE)) || exit 1 ; \
+ (cd x86-64 && $(MAKE)) || exit 1 ; \
+ fi
+
+pcedit = sed \
+ -e 's,@INSTALL_DIR@,$(INSTALL_DIR),' \
+ -e 's,@LIB_DIR@,$(LIB_DIR),' \
+ -e 's,@VERSION@,$(MESA_MAJOR).$(MESA_MINOR).$(MESA_TINY),'
+
+gl.pc: gl.pc.in
+ $(pcedit) $< > $@
install: default
$(INSTALL) -d $(INSTALL_DIR)/include/GL