re-org/prep for glBitmap

[mesa.git] / Makefile

diff --git a/Makefile b/Makefile
index ea86787cebe7aa0f84a2b18aede0ce4fd9fb1103..4f8cc20390310e5a12be493e8828e592076479f3 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,10 @@ default: $(TOP)/configs/current
 
 
 doxygen:
-       (cd doxygen ; make) ; \
+       cd doxygen && $(MAKE)
+
+.PHONY: doxygen
+
 
 clean:
        @for dir in $(SUBDIRS) ; do \
@@ -25,15 +28,13 @@ clean:
 
 
 realclean:
-       touch $(TOP)/configs/current
-       $(MAKE) clean
-       -rm -rf lib*
-       -rm -f $(TOP)/configs/current
        -rm -f `find . -name \*.o`
        -rm -f `find . -name \*.a`
        -rm -f `find . -name \*.so`
        -rm -f `find . -name depend`
-
+       -rm -rf lib*
+       $(MAKE) clean
+       -rm -f $(TOP)/configs/current
 
 
 install:
@@ -117,6 +118,7 @@ linux-osmesa16-static \
 linux-osmesa32 \
 linux-ppc \
 linux-ppc-static \
+linux-profile \
 linux-solo \
 linux-solo-x86 \
 linux-solo-ia64 \
@@ -288,17 +290,6 @@ MAIN_FILES = \
        $(DIRECTORY)/vms/analyze_map.com                                \
        $(DIRECTORY)/vms/xlib.opt                                       \
        $(DIRECTORY)/vms/xlib_share.opt                                 \
-       $(DIRECTORY)/windows/VC6/mesa/gdi/gdi.dsp                       \
-       $(DIRECTORY)/windows/VC6/mesa/glu/*.txt                         \
-       $(DIRECTORY)/windows/VC6/mesa/glu/glu.dsp                       \
-       $(DIRECTORY)/windows/VC6/mesa/mesa.dsw                          \
-       $(DIRECTORY)/windows/VC6/mesa/mesa/mesa.dsp                     \
-       $(DIRECTORY)/windows/VC6/mesa/osmesa/osmesa.dsp                 \
-       $(DIRECTORY)/windows/VC7/mesa/gdi/gdi.vcproj                    \
-       $(DIRECTORY)/windows/VC7/mesa/glu/glu.vcproj                    \
-       $(DIRECTORY)/windows/VC7/mesa/mesa.sln                          \
-       $(DIRECTORY)/windows/VC7/mesa/mesa/mesa.vcproj                  \
-       $(DIRECTORY)/windows/VC7/mesa/osmesa/osmesa.vcproj              \
        $(DIRECTORY)/windows/VC8/mesa/mesa.sln                          \
        $(DIRECTORY)/windows/VC8/mesa/gdi/gdi.vcproj                    \
        $(DIRECTORY)/windows/VC8/mesa/glu/glu.vcproj                    \
@@ -328,6 +319,7 @@ SGI_GLU_FILES = \
        $(DIRECTORY)/src/glu/Makefile                                   \
        $(DIRECTORY)/src/glu/descrip.mms                                \
        $(DIRECTORY)/src/glu/sgi/Makefile                               \
+       $(DIRECTORY)/src/glu/sgi/Makefile.mgw                           \
        $(DIRECTORY)/src/glu/sgi/Makefile.win                           \
        $(DIRECTORY)/src/glu/sgi/Makefile.DJ                            \
        $(DIRECTORY)/src/glu/sgi/glu.def                                \
@@ -372,6 +364,8 @@ DEMO_FILES = \
        $(DIRECTORY)/progs/demos/*.cxx                  \
        $(DIRECTORY)/progs/demos/*.dat                  \
        $(DIRECTORY)/progs/demos/README                 \
+       $(DIRECTORY)/progs/fbdev/Makefile               \
+       $(DIRECTORY)/progs/fbdev/glfbdevtest.c          \
        $(DIRECTORY)/progs/osdemos/Makefile             \
        $(DIRECTORY)/progs/osdemos/*.c                  \
        $(DIRECTORY)/progs/xdemos/Makefile*             \