Merge remote-tracking branch 'origin/master' into pipe-video

[mesa.git] / Makefile

diff --git a/Makefile b/Makefile
index 41d1654b42a22c2962af1006a35f98b7e14b2c5b..fd23b300818dce3cc62e0cdac7d51aa85a67781f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -272,7 +272,6 @@ MAIN_FILES = \
        $(DIRECTORY)/src/mesa/tnl_dd/*.[ch]                             \
        $(DIRECTORY)/src/mesa/tnl_dd/imm/*.[ch]                         \
        $(DIRECTORY)/src/mesa/tnl_dd/imm/NOTES.imm                      \
-       $(DIRECTORY)/src/mesa/vf/*.[ch]                                 \
        $(DIRECTORY)/src/mesa/drivers/Makefile                          \
        $(DIRECTORY)/src/mesa/drivers/beos/*.cpp                        \
        $(DIRECTORY)/src/mesa/drivers/beos/Makefile                     \
@@ -323,6 +322,7 @@ MAPI_FILES = \
        $(DIRECTORY)/src/mapi/mapi/sources.mak                          \
        $(DIRECTORY)/src/mapi/mapi/*.[ch]                               \
        $(DIRECTORY)/src/mapi/shared-glapi/SConscript                   \
+       $(DIRECTORY)/src/mapi/shared-glapi/Makefile                     \
        $(DIRECTORY)/src/mapi/vgapi/Makefile                            \
        $(DIRECTORY)/src/mapi/vgapi/SConscript                          \
        $(DIRECTORY)/src/mapi/vgapi/vgapi.csv                           \