diff options
author | Philippe Houdoin <phoudoin@freedesktop.org> | 2004-08-14 09:23:09 +0000 |
---|---|---|
committer | Philippe Houdoin <phoudoin@freedesktop.org> | 2004-08-14 09:23:09 +0000 |
commit | 31848304870b5ddba91b82545a4ed7a097f7ec4c (patch) | |
tree | 7de1d104c96382f5624b9dd0be706a5727edfbd2 /src/mesa | |
parent | af8031ce5ca14f12f96da91c7c139887b3405673 (diff) |
Move BeOS build into main Makefiles chain.
Diffstat (limited to 'src/mesa')
-rw-r--r-- | src/mesa/Makefile | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/src/mesa/Makefile b/src/mesa/Makefile index 95ca042e74..42e05ada26 100644 --- a/src/mesa/Makefile +++ b/src/mesa/Makefile @@ -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) |