Merge commit 'origin/gallium-0.1' into gallium-0.2

[mesa.git] / src / mesa / Makefile

diff --git a/src/mesa/Makefile b/src/mesa/Makefile
index 061a7bf4f0d8be24ddbee5e6e0f0e224012b7303..2fba2e153b8d30c8650df2b48baaba4744a1521f 100644 (file)
--- a/src/mesa/Makefile
+++ b/src/mesa/Makefile
@@ -3,8 +3,7 @@
 TOP = ../..
 include $(TOP)/configs/current
 
-include sources
-
+include sources.mak
 
 .SUFFIXES : .cpp
 
@@ -19,33 +18,43 @@ include sources
 
 
 
-# Default: build dependencies, then mesa subdirs, then convenience
+# Default: build dependencies, then asm_subdirs, then convenience
 # libs (.a) and finally the device drivers:
-default: depend subdirs libmesa.a libglapi.a driver_subdirs
+default: depend asm_subdirs libmesa.a libglapi.a driver_subdirs
 
 
+# Default: build dependencies, then asm_subdirs, then convenience
+# libs (.a) and finally the device drivers:
+default: depend asm_subdirs libmesa.a $(GLAPI_LIB) driver_subdirs
 
 ######################################################################
 # Helper libraries used by many drivers:
 
 # Make archive of core mesa object files
-libmesa.a: $(SOLO_OBJECTS)
-       @ $(TOP)/bin/mklib -o mesa -static $(SOLO_OBJECTS)
+libmesa.a: $(MESA_OBJECTS)
+       @ $(MKLIB) -o mesa -static $(MESA_OBJECTS)
 
 # Make archive of gl* API dispatcher functions only
 libglapi.a: $(GLAPI_OBJECTS)
-       @ $(TOP)/bin/mklib -o glapi -static $(GLAPI_OBJECTS)
+       @ $(MKLIB) -o glapi -static $(GLAPI_OBJECTS)
 
+# Make archive of gl* API dispatcher functions only
+$(GLAPI_LIB): $(GLAPI_OBJECTS)
+       @if [ "${WINDOW_SYSTEM}" = "dri" ] ; then \
+               touch libglapi.a ; \
+       else \
+               $(TOP)/bin/mklib -o glapi -static $(GLAPI_OBJECTS) ; \
+       fi
 
 ######################################################################
 # Device drivers
-driver_subdirs:
+driver_subdirs: libmesa.a libglapi.a
        (cd drivers && $(MAKE))
 
 
 ######################################################################
 # Assembly subdirs
-subdirs:
+asm_subdirs:
        @ if echo "$(ASM_FLAGS)" | grep -q USE_X86_ASM ; then \
                (cd x86 && $(MAKE)) || exit 1 ; \
        fi
@@ -90,30 +99,31 @@ install: default
 
 pcedit = sed \
        -e 's,@INSTALL_DIR@,$(INSTALL_DIR),' \
-       -e 's,@LIB_DIR@,$(LIB_DIR),' \
+       -e 's,@INSTALL_LIB_DIR@,$(INSTALL_LIB_DIR),' \
+       -e 's,@INSTALL_INC_DIR@,$(INSTALL_INC_DIR),' \
        -e 's,@VERSION@,$(MESA_MAJOR).$(MESA_MINOR).$(MESA_TINY),'
 
 gl.pc: gl.pc.in
        $(pcedit) $< > $@
 
 install-headers:
-       $(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/include/GL
+       $(INSTALL) -d $(DESTDIR)$(INSTALL_INC_DIR)/GL
        $(INSTALL) -m 644 $(TOP)/include/GL/*.h \
-               $(DESTDIR)$(INSTALL_DIR)/include/GL
+               $(DESTDIR)$(INSTALL_INC_DIR)/GL
 
 install-libgl: default gl.pc install-headers
-       $(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR)
-       $(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR)/pkgconfig
-       $(INSTALL) $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME)* \
-               $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR)
-       $(INSTALL) -m 644 gl.pc $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR)/pkgconfig
+       $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)
+       $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
+       $(INSTALL) $(TOP)/$(LIB_DIR)/$(GL_LIB_GLOB) \
+               $(DESTDIR)$(INSTALL_LIB_DIR)
+       $(INSTALL) -m 644 gl.pc $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
 
 install-osmesa: default
-       $(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR)
-       $(INSTALL) $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME)* \
-               $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR)
+       $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)
+       $(INSTALL) $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_GLOB) \
+               $(DESTDIR)$(INSTALL_LIB_DIR)
 
-install-dri:
+install-dri: default
        cd drivers/dri && $(MAKE) install
 
 
@@ -128,8 +138,8 @@ clean:
        -rm -f */*/*.o
        -rm -f depend depend.bak libmesa.a libglapi.a
        -rm -f drivers/*/*.o
+       -rm -f *.pc
        -@cd drivers/dri && $(MAKE) clean
-       -@cd drivers/xorg && $(MAKE) clean
        -@cd drivers/x11 && $(MAKE) clean
        -@cd drivers/osmesa && $(MAKE) clean
        -@cd x86 && $(MAKE) clean