glapi: Move src/mesa/main/dispatch.c to glapi and rename.

[mesa.git] / Makefile

diff --git a/Makefile b/Makefile
index bf8debfd5b37a8aa465ad2f88e4bdd813d8ef4cf..3e92e1312ede1816319280a8f5ff32ad4527d896 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -80,8 +80,6 @@ catamount-osmesa-pgi \
 darwin \
 darwin-fat-32bit \
 darwin-fat-all \
-darwin-static \
-darwin-static-x86ppc \
 freebsd \
 freebsd-dri \
 freebsd-dri-amd64 \
@@ -175,11 +173,14 @@ sunos5-v9 \
 sunos5-v9-static \
 sunos5-v9-cc-g++ \
 ultrix-gcc:
-       @ if test -f configs/current || test -L configs/current ; then \
-               echo "Please run 'make realclean' before changing configs" ; \
-               exit 1 ; \
+       @ if test -f configs/current -o -L configs/current; then \
+               if ! cmp configs/$@ configs/current > /dev/null; then \
+                       echo "Please run 'make realclean' before changing configs" ; \
+                       exit 1 ; \
+               fi ; \
+       else \
+               cd configs && rm -f current && ln -s $@ current ; \
        fi
-       (cd configs && rm -f current && ln -s $@ current)
        $(MAKE) default
 
 
@@ -313,9 +314,9 @@ MAIN_FILES = \
 ES_FILES = \
        $(DIRECTORY)/include/GLES/*.h                                   \
        $(DIRECTORY)/include/GLES2/*.h                                  \
-       $(DIRECTORY)/src/mesa/glapi/*.xml                               \
-       $(DIRECTORY)/src/mesa/glapi/*.py                                \
-       $(DIRECTORY)/src/mesa/glapi/*.dtd                               \
+       $(DIRECTORY)/src/mesa/glapi/gen/*.xml                           \
+       $(DIRECTORY)/src/mesa/glapi/gen/*.py                            \
+       $(DIRECTORY)/src/mesa/glapi/gen/*.dtd                           \
        $(DIRECTORY)/src/mesa/es/glapi/Makefile                         \
        $(DIRECTORY)/src/mesa/es/glapi/*.xml                            \
        $(DIRECTORY)/src/mesa/es/glapi/*.py                             \
@@ -361,8 +362,8 @@ DRI_FILES = \
        $(DIRECTORY)/include/GL/internal/glcore.h                       \
        $(DIRECTORY)/include/GL/internal/sarea.h                        \
        $(DIRECTORY)/src/glx/Makefile                                   \
-       $(DIRECTORY)/src/glx/x11/Makefile                               \
-       $(DIRECTORY)/src/glx/x11/*.[ch]                                 \
+       $(DIRECTORY)/src/glx/Makefile                                   \
+       $(DIRECTORY)/src/glx/*.[ch]                                     \
        $(DIRECTORY)/src/mesa/drivers/dri/Makefile                      \
        $(DIRECTORY)/src/mesa/drivers/dri/Makefile.template             \
        $(DIRECTORY)/src/mesa/drivers/dri/dri.pc.in                     \
@@ -488,7 +489,7 @@ GLUT_FILES = \
 
 DEPEND_FILES = \
        $(TOP)/src/mesa/depend          \
-       $(TOP)/src/glx/x11/depend       \
+       $(TOP)/src/glx/depend           \
        $(TOP)/src/glw/depend           \
        $(TOP)/src/glut/glx/depend      \
        $(TOP)/src/glu/sgi/depend