Assorted fix-ups for the new linker.

[mesa.git] / src / mesa / Makefile

diff --git a/src/mesa/Makefile b/src/mesa/Makefile
index 16cf6709ea5c4ec0f740e8c01346647d7b022c49..1cd9e5b2bb77fc75d9a6ad03d5c12e42278272d6 100644 (file)
--- a/src/mesa/Makefile
+++ b/src/mesa/Makefile
@@ -32,7 +32,9 @@ default:
        elif [ "$(DRIVER_DIRS)" = "beos" ]; then \
                $(MAKE) beos ; \
        elif [ "$(DRIVER_DIRS)" = "directfb" ]; then \
-               $(MAKE) directfb; \
+               $(MAKE) directfb ; \
+       elif [ "$(DRIVER_DIRS)" = "fbdev osmesa" ]; then \
+               $(MAKE) fbdev ; $(MAKE) osmesa-only ; \
        else \
                $(MAKE) stand-alone ; \
        fi
@@ -65,26 +67,32 @@ linux-solo: depend subdirs libmesa.a
 libgl-core: $(CORE_OBJECTS)
        @ $(TOP)/bin/mklib -o $(GL_LIB) -linker '$(CC)' \
                -major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(MESA_TINY) \
-               -install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) $(CORE_OBJECTS) $(GL_LIB_DEPS)
+               -install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) $(CORE_OBJECTS) \
+               $(GL_LIB_DEPS)
 
 directfb: depend subdirs libgl-core
-       cd drivers/directfb; $(MAKE)
+       cd drivers/directfb ; $(MAKE)
+
+
+#####################################################################
+# fbdev Mesa driver (libGL.so)
+
+fbdev: $(CORE_OBJECTS) $(FBDEV_DRIVER_OBJECTS) $(COMMON_DRIVER_OBJECTS)
+       @ $(TOP)/bin/mklib -o $(GL_LIB) -linker '$(CC)' \
+               -major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(MESA_TINY) \
+               -install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \
+               $(CORE_OBJECTS) $(FBDEV_DRIVER_OBJECTS) \
+               $(COMMON_DRIVER_OBJECTS) $(GL_LIB_DEPS)
 
 
 ######################################################################
 # Stand-alone Mesa libGL and libOSMesa
-STAND_ALONE_DRIVER_SOURCES_A = \
+STAND_ALONE_DRIVER_SOURCES = \
        $(COMMON_DRIVER_SOURCES) \
+       $(X11_DRIVER_SOURCES) \
        $(GLIDE_DRIVER_SOURCES) \
        $(SVGA_DRIVER_SOURCES)
 
-# if x11 is not installed, compiling with x11 sources will not work for fbdev
-ifeq ($(DRIVER_DIRS), fbdev)
-STAND_ALONE_DRIVER_SOURCES = $(STAND_ALONE_DRIVER_SOURCES_A) $(FBDEV_DRIVER_SOURCES)
-else
-STAND_ALONE_DRIVER_SOURCES = $(STAND_ALONE_DRIVER_SOURCES_A) $(X11_DRIVER_SOURCES)
-endif
-
 STAND_ALONE_DRIVER_OBJECTS = $(STAND_ALONE_DRIVER_SOURCES:.c=.o)
 
 STAND_ALONE_OBJECTS = \
@@ -130,20 +138,10 @@ $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME): $(OSMESA_DRIVER_OBJECTS) $(OSMESA16_OBJECT
 ######################################################################
 # Generic stuff
 
-ALL_SOURCES = \
-       $(GLAPI_SOURCES)        \
-       $(SOLO_SOURCES)         \
-       $(X86_SOURCES)          \
-       $(COMMON_DRIVER_SOURCES)\
-       $(X11_DRIVER_SOURCES)   \
-       $(FBDEV_DRIVER_SOURCES) \
-       $(OSMESA_DRIVER_SOURCES)
-
-
 depend: $(ALL_SOURCES)
        @ echo "running $(MKDEP)"
        @ touch depend
-       $(MKDEP) $(MKDEP_OPTIONS) $(DEFINES) $(INCLUDE_DIRS) $(ALL_SOURCES) \
+       @$(MKDEP) $(MKDEP_OPTIONS) $(DEFINES) $(INCLUDE_DIRS) $(ALL_SOURCES) \
                > /dev/null 
 
 
@@ -156,15 +154,19 @@ install: default
        $(INSTALL) -d $(INSTALL_DIR)/include/GL
        $(INSTALL) -d $(INSTALL_DIR)/$(LIB_DIR)
        $(INSTALL) -m 644 $(TOP)/include/GL/*.h $(INSTALL_DIR)/include/GL
-       $(COPY_LIBS) $(TOP)/$(LIB_DIR)/libGL.* $(INSTALL_DIR)/$(LIB_DIR)
+       @if [ -e $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) ]; then \
+               $(INSTALL) $(TOP)/$(LIB_DIR)/libGL* $(INSTALL_DIR)/$(LIB_DIR); \
+       fi
+       @if [ -e $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME) ]; then \
+               $(INSTALL) $(TOP)/$(LIB_DIR)/libOSMesa* $(INSTALL_DIR)/$(LIB_DIR); \
+       fi
        @if [ "${DRIVER_DIRS}" = "dri" ] ; then \
                cd drivers/dri ; $(MAKE) install ; \
        fi
 
-
-       ## NOT YET:
-       ## $(INSTALL) -d $(INSTALL_DIR)/include/GLES
-       ## $(INSTALL) -m 644 include/GLES/*.h $(INSTALL_DIR)/include/GLES
+## NOT INSTALLED YET:
+## $(INSTALL) -d $(INSTALL_DIR)/include/GLES
+## $(INSTALL) -m 644 include/GLES/*.h $(INSTALL_DIR)/include/GLES
 
 
 # Emacs tags
@@ -180,4 +182,5 @@ clean:
        (cd x86 ; $(MAKE) clean)
        (cd x86-64 ; $(MAKE) clean)
 
+
 include depend