make clean at root now clean the glu/$(GLU_DIRS) too.

[mesa.git] / Makefile

diff --git a/Makefile b/Makefile
index a2476770a73cf09964d8fa4103600eb9da2b5eea..c2963732d58ad7a612c89aa1ede4f306a41d05b7 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -7,22 +7,22 @@ SUBDIRS = src progs
 
 default: $(TOP)/configs/current
        @for dir in $(SUBDIRS) ; do \
-               pushd $$dir ; \
-               make ; \
-               popd ; \
+               (cd $$dir ; $(MAKE)) || exit 1 ; \
        done
 
 
+doxygen:
+       (cd doxygen ; make) ; \
+
 clean:
        @for dir in $(SUBDIRS) ; do \
-               pushd $$dir ; \
-               make clean; \
-               popd ; \
+               (cd $$dir ; $(MAKE) clean) ; \
        done
 
 
-realclean: clean
-       #-rm -rf $(LIB_DIR)
+realclean:
+       touch $(TOP)/configs/current
+       $(MAKE) clean
        -rm -rf lib*
        -rm -f $(TOP)/configs/current
 
@@ -36,7 +36,7 @@ $(TOP)/configs/current:
        @echo
        @echo
        @echo "Please choose a configuration from the following list:"
-       @ls -1 $(TOP)/configs | grep -v current | grep -v default
+       @ls -1 $(TOP)/configs | grep -v "current\|default\|CVS"
        @echo
        @echo "Then type 'make <config>' (ex: 'make linux-x86')"
        @echo "(ignore the following error message)"
@@ -46,11 +46,14 @@ $(TOP)/configs/current:
 # Rules to set/install a specific build configuration
 aix \
 aix-gcc \
+aix-static \
+beos \
 darwin \
 darwin-static \
 freebsd \
 hpux10 \
 hpux10-gcc \
+hpux10-static \
 hpux11-32-static \
 hpux11-32-static-nothreads \
 hpux11-64-static \
@@ -66,6 +69,10 @@ linux \
 linux-alpha \
 linux-alpha-static \
 linux-debug \
+linux-dri \
+linux-dri-x86 \
+linux-dri-x86-64 \
+linux-glide \
 linux-icc \
 linux-icc-static \
 linux-osmesa16 \
@@ -74,13 +81,17 @@ linux-osmesa32 \
 linux-ppc \
 linux-ppc-static \
 linux-solo \
+linux-solo-ia64 \
 linux-sparc \
 linux-sparc5 \
 linux-static \
 linux-ultrasparc \
+linux-tcc \
 linux-x86 \
+linux-x86-debug \
 linux-x86-64 \
 linux-x86-64-static \
+linux-x86-glide \
 linux-x86-static \
 netbsd \
 openbsd \
@@ -94,8 +105,8 @@ sunos5 \
 sunos5-gcc \
 sunos5-smp \
 ultrix-gcc:
-       cp $(TOP)/configs/$@ $(TOP)/configs/current
-       make default
+       (cd configs && rm -f current && ln -s $@ current)
+       $(MAKE) default
 
 
 # Rules for making release tarballs
@@ -159,13 +170,16 @@ LIB_FILES =       \
        $(DIRECTORY)/src/mesa/math/*.[ch]                               \
        $(DIRECTORY)/src/mesa/math/math.dsp                             \
        $(DIRECTORY)/src/mesa/math/descrip.mms                          \
+       $(DIRECTORY)/src/mesa/shader/*.[ch]                             \
+       $(DIRECTORY)/src/mesa/shader/shader.dsp                         \
+       $(DIRECTORY)/src/mesa/shader/descrip.mms                        \
        $(DIRECTORY)/src/mesa/swrast/*.[ch]                             \
        $(DIRECTORY)/src/mesa/swrast/swrast.dsp                         \
        $(DIRECTORY)/src/mesa/swrast/descrip.mms                        \
        $(DIRECTORY)/src/mesa/swrast_setup/*.[ch]                       \
        $(DIRECTORY)/src/mesa/swrast_setup/swrast_setup.dsp             \
        $(DIRECTORY)/src/mesa/swrast_setup/descrip.mms                  \
-       $(DIRECTORY)/src/mesa/tnl/*.[ch]                                \
+       $(DIRECTORY)/src/mesa/tnl/*.[chS]                               \
        $(DIRECTORY)/src/mesa/tnl/tnl.dsp                               \
        $(DIRECTORY)/src/mesa/tnl/descrip.mms                           \
        $(DIRECTORY)/src/mesa/tnl_dd/*.[ch]                             \
@@ -173,6 +187,7 @@ LIB_FILES = \
        $(DIRECTORY)/src/mesa/tnl_dd/imm/NOTES.imm                      \
        $(DIRECTORY)/src/mesa/drivers/beos/*.cpp                        \
        $(DIRECTORY)/src/mesa/drivers/beos/*.h                          \
+       $(DIRECTORY)/src/mesa/drivers/beos/Makefile                     \
        $(DIRECTORY)/src/mesa/drivers/common/*.[ch]                     \
        $(DIRECTORY)/src/mesa/drivers/common/descrip.mms                \
        $(DIRECTORY)/src/mesa/drivers/dos/*.[chS]                       \
@@ -253,13 +268,14 @@ DEMO_FILES =      \
        $(DIRECTORY)/src/glut/glx/mms_depend            \
        $(DIRECTORY)/src/glut/glx/glut.dsp              \
        $(DIRECTORY)/src/glut/glx/*.[ch]                \
-       $(DIRECTORY)/src/glut/beos/*.h                  \
+       $(DIRECTORY)/src/glut/beos/*.[ch]               \
        $(DIRECTORY)/src/glut/beos/*.cpp                \
-       $(DIRECTORY)/src/glut/beos/libglut.def          \
-       $(DIRECTORY)/src/glut/beos/Makefile*            \
+       $(DIRECTORY)/src/glut/beos/Makefile             \
        $(DIRECTORY)/src/glut/dos/*.[ch]                \
        $(DIRECTORY)/src/glut/dos/Makefile.DJ           \
        $(DIRECTORY)/src/glut/dos/PC_HW/*.[chS]         \
+       $(DIRECTORY)/progs/beos/*.cpp                   \
+       $(DIRECTORY)/progs/beos/Makefile                \
        $(DIRECTORY)/progs/images/*.rgb                 \
        $(DIRECTORY)/progs/images/*.rgba                \
        $(DIRECTORY)/progs/demos/Makefile*              \