Move BeOS build into main Makefiles chain.

This commit is contained in:
Philippe Houdoin 2004-08-14 09:23:09 +00:00
parent af8031ce5c
commit 3184830487

View file

@ -24,11 +24,16 @@ default:
$(MAKE) linux-solo ; \
elif [ "${DRIVER_DIRS}" = "osmesa" ] ; then \
$(MAKE) osmesa-only ; \
elif [ "$(DRIVER_DIRS)" = "beos" ]; then \
$(MAKE) beos ; \
else \
$(MAKE) stand-alone ; \
fi
# BeOS driver target
beos: depend subdirs mesa.a
cd drivers/beos; $(MAKE)
######################################################################
# Linux solo DRI drivers
@ -45,19 +50,21 @@ SOLO_C_SOURCES = \
SOLO_OBJECTS = $(SOLO_C_SOURCES:.c=.o) \
$(ASM_SOURCES:.S=.o)
linux-solo: depend subdirs mesa.a driver-dirs
linux-solo: depend subdirs mesa.a drivers-dri
# Make archive of core object files
mesa.a: $(SOLO_OBJECTS)
rm -f $@
ar rcv $@ $(SOLO_OBJECTS)
ranlib $@
@if [ "${CONFIG_NAME}" = "beos" ] ; then \
mimeset -f "$@" ; \
fi
# note: cannot use the name of the directory ("drivers") as the
# target, otherwise make will look & see that the "drivers" directory
# already exists, so not try to rebuild it...
driver-dirs:
drivers-dri:
cd drivers/dri ; $(MAKE)
@ -95,7 +102,6 @@ OSMESA16_OBJECTS = \
$(OSMESA_DRIVER_OBJECTS)
stand-alone: depend subdirs $(LIB_DIR)/$(GL_LIB_NAME) $(LIB_DIR)/$(OSMESA_LIB_NAME)
osmesa-only: depend subdirs $(LIB_DIR)/$(OSMESA_LIB_NAME)