Make sure USE_NEW_INTERFACE is defined if DRI_NEW_INTERFACE_ONLY is

[mesa.git] / Makefile

diff --git a/Makefile b/Makefile
index a2476770a73cf09964d8fa4103600eb9da2b5eea..e5d5aca8fd50ccc7812123597aeb96d7b2d762a8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -7,22 +7,19 @@ SUBDIRS = src progs
 
 default: $(TOP)/configs/current
        @for dir in $(SUBDIRS) ; do \
-               pushd $$dir ; \
-               make ; \
-               popd ; \
+               (cd $$dir ; $(MAKE)) || exit 1 ; \
        done
 
 
 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 +33,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)"
@@ -51,6 +48,7 @@ darwin-static \
 freebsd \
 hpux10 \
 hpux10-gcc \
+hpux10-static \
 hpux11-32-static \
 hpux11-32-static-nothreads \
 hpux11-64-static \
@@ -66,6 +64,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 +76,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 +100,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