Merge branch '7.8' into master

[mesa.git] / Makefile

diff --git a/Makefile b/Makefile
index 4a81312046830ed00bc884de52bb37d52c1591c4..81fe0d1e876cc7c5c974edfca1ed6a578e6ab82d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -243,7 +243,6 @@ MAIN_FILES = \
        $(DIRECTORY)/src/mesa/shader/descrip.mms                        \
        $(DIRECTORY)/src/mesa/shader/slang/*.[ch]                       \
        $(DIRECTORY)/src/mesa/shader/slang/descrip.mms                  \
-       $(DIRECTORY)/src/mesa/shader/slang/library/*.[ch]               \
        $(DIRECTORY)/src/mesa/shader/slang/library/*.gc                 \
        $(DIRECTORY)/src/mesa/shader/slang/library/Makefile             \
        $(DIRECTORY)/src/mesa/swrast/*.[ch]                             \
@@ -379,15 +378,6 @@ SGI_GLU_FILES = \
        $(DIRECTORY)/src/glu/sgi/libtess/*.[ch]                         \
        $(DIRECTORY)/src/glu/sgi/libutil/*.[ch]
 
-MESA_GLU_FILES = \
-       $(DIRECTORY)/src/glu/mesa/README[12]            \
-       $(DIRECTORY)/src/glu/mesa/Makefile*             \
-       $(DIRECTORY)/src/glu/mesa/descrip.mms           \
-       $(DIRECTORY)/src/glu/mesa/mms_depend            \
-       $(DIRECTORY)/src/glu/mesa/*.def                 \
-       $(DIRECTORY)/src/glu/mesa/depend                \
-       $(DIRECTORY)/src/glu/mesa/*.[ch]
-
 GLW_FILES = \
        $(DIRECTORY)/src/glw/*.[ch]                     \
        $(DIRECTORY)/src/glw/Makefile*                  \
@@ -450,11 +440,7 @@ GLUT_FILES = \
        $(DIRECTORY)/src/glut/glx/*.[ch]                \
        $(DIRECTORY)/src/glut/beos/*.[ch]               \
        $(DIRECTORY)/src/glut/beos/*.cpp                \
-       $(DIRECTORY)/src/glut/beos/Makefile             \
-       $(DIRECTORY)/src/glut/fbdev/Makefile            \
-       $(DIRECTORY)/src/glut/fbdev/*[ch]               \
-       $(DIRECTORY)/src/glut/mini/*[ch]                \
-       $(DIRECTORY)/src/glut/mini/glut.pc.in           \
+       $(DIRECTORY)/src/glut/beos/Makefile
 
 DEPEND_FILES = \
        $(TOP)/src/mesa/depend          \