summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2008-06-06 12:24:44 -0600
committerBrian Paul <brian.paul@tungstengraphics.com>2008-06-06 12:24:44 -0600
commit847f54e2fa3e1b92ee97e7c2895a71ed20ce227b (patch)
treec10eef974ee1dceed593517a9416a5381bff8dbe
parentdd750e0763d4a03a41d8a4ebde9489ad9c4aa82f (diff)
move a beos-ism down into drivers/beos/Makefile
-rw-r--r--src/mesa/Makefile3
-rw-r--r--src/mesa/drivers/beos/Makefile2
2 files changed, 2 insertions, 3 deletions
diff --git a/src/mesa/Makefile b/src/mesa/Makefile
index 06b4e9cceb..8c5e3c894e 100644
--- a/src/mesa/Makefile
+++ b/src/mesa/Makefile
@@ -51,9 +51,6 @@ install: default
# Make archive of core mesa object files
libmesa.a: $(SOLO_OBJECTS)
@ $(TOP)/bin/mklib -o mesa -static $(SOLO_OBJECTS);
- @if [ "${CONFIG_NAME}" = "beos" ] ; then \
- mimeset -f "$@" ; \
- fi
# Make archive of gl* API dispatcher functions only
libglapi.a: $(GLAPI_OBJECTS)
diff --git a/src/mesa/drivers/beos/Makefile b/src/mesa/drivers/beos/Makefile
index 0448650a8c..342d7ce024 100644
--- a/src/mesa/drivers/beos/Makefile
+++ b/src/mesa/drivers/beos/Makefile
@@ -169,8 +169,10 @@ OBJECTS := $(DRIVER_OBJECTS:.cpp=.o)
default: depend $(TOP)/$(LIB_DIR) $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME)
+# XXX FIXME: mesa.a might be libmesa.a now
$(MESA_MODULES):
cd $(TOP)/src/mesa && $(MAKE) mesa.a ;
+ mimeset -f "$@"
$(GLU_MODULES):
cd $(GLU_DIR) && $(MAKE) $(subst $(GLU_DIR)/,,$(GLU_MODULES)) ;