summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile18
-rw-r--r--src/egl/Makefile4
-rw-r--r--src/glu/Makefile4
-rw-r--r--src/glut/directfb/Makefile2
-rw-r--r--src/glut/fbdev/Makefile2
-rw-r--r--src/glut/glx/Makefile2
-rw-r--r--src/glut/mini/Makefile2
-rw-r--r--src/glw/Makefile2
-rw-r--r--src/glx/Makefile4
-rw-r--r--src/glx/mini/Makefile2
-rw-r--r--src/glx/x11/Makefile2
-rw-r--r--src/mesa/Makefile16
-rw-r--r--src/mesa/drivers/beos/Makefile8
13 files changed, 36 insertions, 32 deletions
diff --git a/Makefile b/Makefile
index fffc3f959f7..c69dfcec796 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ default: $(TOP)/configs/current
doxygen:
- (cd doxygen ; make) ; \
+ cd doxygen && $(MAKE)
clean:
@for dir in $(SUBDIRS) ; do \
@@ -31,10 +31,8 @@ realclean:
-rm -f $(TOP)/configs/current
-rm -f $(TOP)/configs/autoconf
-rm -rf autom4te.cache
- -rm -f `find . -name \*.o`
- -rm -f `find . -name \*.a`
- -rm -f `find . -name \*.so`
- -rm -f `find . -name depend`
+ -find . '(' -name '*.o' -o -name '*.a' -o -name '*.so' -o \
+ -name depend -o -name depend.bak ')' -exec rm -f '{}' ';'
@@ -52,10 +50,13 @@ linux-directfb-install:
# Xserver GLcore module
glcore:
- cd src/mesa/drivers/xorg ; $(MAKE)
+ cd src/mesa/drivers/xorg && $(MAKE)
glcore-install:
- cd src/mesa/drivers/xorg ; $(MAKE) install
+ cd src/mesa/drivers/xorg && $(MAKE) install
+
+.PHONY: default doxygen clean realclean install linux-directfb-install \
+ glcore glcore-install
# If there's no current configuration file
$(TOP)/configs/current:
@@ -531,3 +532,6 @@ md5:
@-md5sum $(GLUT_NAME).tar.gz
@-md5sum $(GLUT_NAME).tar.bz2
@-md5sum $(GLUT_NAME).zip
+
+.PHONY: tarballs rm_depend lib_gz demo_gz glut_gz lib_bz2 demo_bz2 \
+ glut_bz2 lib_zip demo_zip glut_zip md5
diff --git a/src/egl/Makefile b/src/egl/Makefile
index 931e9d0cb86..036bf1f01a1 100644
--- a/src/egl/Makefile
+++ b/src/egl/Makefile
@@ -11,7 +11,7 @@ default: subdirs
subdirs:
@for dir in $(SUBDIRS) ; do \
if [ -d $$dir ] ; then \
- (cd $$dir ; $(MAKE)) || exit 1 ; \
+ (cd $$dir && $(MAKE)) || exit 1 ; \
fi \
done
@@ -19,6 +19,6 @@ subdirs:
clean:
@for dir in $(SUBDIRS) ; do \
if [ -d $$dir ] ; then \
- (cd $$dir ; $(MAKE) clean) ; \
+ (cd $$dir && $(MAKE) clean) ; \
fi \
done
diff --git a/src/glu/Makefile b/src/glu/Makefile
index 836baa684cb..3ee5cfddd7a 100644
--- a/src/glu/Makefile
+++ b/src/glu/Makefile
@@ -10,7 +10,7 @@ SUBDIRS = $(GLU_DIRS)
default: $(TOP)/configs/current
@for dir in $(SUBDIRS) ; do \
- (cd $$dir ; $(MAKE)) ; \
+ (cd $$dir && $(MAKE)) || exit 1 ; \
done
# GLU pkg-config file
@@ -29,5 +29,5 @@ install: glu.pc
clean:
@for dir in $(SUBDIRS) ; do \
- (cd $$dir ; $(MAKE) clean) ; \
+ (cd $$dir && $(MAKE) clean) ; \
done
diff --git a/src/glut/directfb/Makefile b/src/glut/directfb/Makefile
index aa77db91c6c..36b0ea34ed5 100644
--- a/src/glut/directfb/Makefile
+++ b/src/glut/directfb/Makefile
@@ -80,7 +80,7 @@ tags:
# Remove .o and backup files
clean: depend
- -rm -f depend
+ -rm -f depend depend.bak
-rm -f *.o *~ *.o *~ *.so libglut.so.3.7
include depend
diff --git a/src/glut/fbdev/Makefile b/src/glut/fbdev/Makefile
index 948be0c7ba3..95893b7dd1b 100644
--- a/src/glut/fbdev/Makefile
+++ b/src/glut/fbdev/Makefile
@@ -87,7 +87,7 @@ tags:
# Remove .o and backup files
clean: depend
- -rm -f depend
+ -rm -f depend depend.bak
-rm -f *.o *~ *.o *~ *.so libglut.so.3.7
include depend
diff --git a/src/glut/glx/Makefile b/src/glut/glx/Makefile
index 46185cebbc0..674d5a5dcef 100644
--- a/src/glut/glx/Makefile
+++ b/src/glut/glx/Makefile
@@ -119,7 +119,7 @@ clean:
-rm -f *.lo
-rm -f *.la
-rm -rf .libs
- -rm -rf depend depend.bak
+ -rm -f depend depend.bak
depend: $(SOURCES)
diff --git a/src/glut/mini/Makefile b/src/glut/mini/Makefile
index a73198a68cc..d3860503901 100644
--- a/src/glut/mini/Makefile
+++ b/src/glut/mini/Makefile
@@ -91,7 +91,7 @@ install: glut.pc
# Remove .o and backup files
clean: depend
- -rm -f depend
+ -rm -f depend depend.bak
-rm -f *.o *~ *.o *~ *.so libglut.so.3.7
include depend
diff --git a/src/glw/Makefile b/src/glw/Makefile
index ce6a30e9de3..88bf99d44f3 100644
--- a/src/glw/Makefile
+++ b/src/glw/Makefile
@@ -42,7 +42,7 @@ install: glw.pc
$(INSTALL) -m 644 glw.pc $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR)/pkgconfig
clean:
- -rm depend depend.bak
+ -rm -f depend depend.bak
-rm -f *.o *~
diff --git a/src/glx/Makefile b/src/glx/Makefile
index bd486cf81b3..a96e0dadaa7 100644
--- a/src/glx/Makefile
+++ b/src/glx/Makefile
@@ -4,9 +4,9 @@ include $(TOP)/configs/current
default:
- cd mini ; $(MAKE)
+ cd mini && $(MAKE)
clean:
- cd mini ; $(MAKE) clean
+ cd mini && $(MAKE) clean
diff --git a/src/glx/mini/Makefile b/src/glx/mini/Makefile
index 7ed2146d562..69c3d683e8c 100644
--- a/src/glx/mini/Makefile
+++ b/src/glx/mini/Makefile
@@ -83,6 +83,6 @@ install:
clean:
-rm -f drmtest $(TOP)/$(LIB_DIR)/libGL.so*
-rm -f *.o *~
- -rm -f depend
+ -rm -f depend depend.bak
include depend
diff --git a/src/glx/x11/Makefile b/src/glx/x11/Makefile
index f12d1f70dc8..1d6bb2f1c95 100644
--- a/src/glx/x11/Makefile
+++ b/src/glx/x11/Makefile
@@ -91,6 +91,6 @@ install: $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME)
clean:
-rm -f $(TOP)/$(LIB_DIR)/libGL.so*
-rm -f *.o *~
- -rm -f depend
+ -rm -f depend depend.bak
-include depend
diff --git a/src/mesa/Makefile b/src/mesa/Makefile
index 633bfb19a3b..70d31ad6c18 100644
--- a/src/mesa/Makefile
+++ b/src/mesa/Makefile
@@ -24,7 +24,7 @@ GL_TINY = 0$(MESA_MAJOR)0$(MESA_MINOR)0$(MESA_TINY)
# Figure out what to make here
-default:
+default: depend
@for driver in $(DRIVER_DIRS) ; do \
case "$$driver" in \
x11) $(MAKE) stand-alone ;; \
@@ -42,7 +42,7 @@ default:
# BeOS driver target
beos: depend subdirs libmesa.a
- cd drivers/beos; $(MAKE)
+ cd drivers/beos && $(MAKE)
######################################################################
@@ -56,7 +56,7 @@ libmesa.a: $(SOLO_OBJECTS)
fi
linux-solo: depend subdirs libmesa.a
- cd drivers/dri ; $(MAKE)
+ cd drivers/dri && $(MAKE)
#####################################################################
@@ -69,7 +69,7 @@ libgl-core: $(CORE_OBJECTS)
$(GL_LIB_DEPS)
directfb: depend subdirs libgl-core
- cd drivers/directfb ; $(MAKE)
+ cd drivers/directfb && $(MAKE)
#####################################################################
@@ -145,11 +145,11 @@ depend: $(ALL_SOURCES)
subdirs:
@ if echo "$(ASM_FLAGS)" | grep -q USE_X86_ASM ; then \
- (cd x86 ; $(MAKE)) ; \
+ (cd x86 && $(MAKE)) || exit 1 ; \
fi
@ if echo "$(ASM_FLAGS)" | grep -q USE_X86_64_ASM ; then \
- (cd x86 ; $(MAKE)) ; \
- (cd x86-64 ; $(MAKE)) ; \
+ (cd x86 && $(MAKE)) || exit 1 ; \
+ (cd x86-64 && $(MAKE)) || exit 1 ; \
fi
pcedit = sed \
@@ -180,7 +180,7 @@ install-osmesa:
install-drivers:
@for target in $(DRIVER_DIRS); do \
case "$$target" in \
- dri) cd drivers/dri ; $(MAKE) install ;; \
+ dri) (cd drivers/dri && $(MAKE) install) || exit 1 ;; \
esac; \
done
diff --git a/src/mesa/drivers/beos/Makefile b/src/mesa/drivers/beos/Makefile
index 9c7d6affc3b..0448650a8c6 100644
--- a/src/mesa/drivers/beos/Makefile
+++ b/src/mesa/drivers/beos/Makefile
@@ -170,10 +170,10 @@ OBJECTS := $(DRIVER_OBJECTS:.cpp=.o)
default: depend $(TOP)/$(LIB_DIR) $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME)
$(MESA_MODULES):
- cd $(TOP)/src/mesa; $(MAKE) mesa.a ;
+ cd $(TOP)/src/mesa && $(MAKE) mesa.a ;
$(GLU_MODULES):
- cd $(GLU_DIR); $(MAKE) $(subst $(GLU_DIR)/,,$(GLU_MODULES)) ;
+ cd $(GLU_DIR) && $(MAKE) $(subst $(GLU_DIR)/,,$(GLU_MODULES)) ;
$(TOP)/$(LIB_DIR):
mkdir $(TOP)/$(LIB_DIR)
@@ -184,13 +184,13 @@ $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME): $(OBJECTS) $(MESA_MODULES) $(GLU_MODULES)
$(MKLIB_OPTIONS) $(GL_LIB_DEPS) $(OBJECTS) $(MESA_MODULES) $(GLU_MODULES)
# $(GLU_OBJECTS):
-# cd $(GLU_DIR); $(MAKE) $< ;
+# cd $(GLU_DIR) && $(MAKE) $< ;
depend: $(DRIVER_SOURCES) $(GLU_SOURCES)
touch depend
$(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(DRIVER_SOURCES) $(GLU_SOURCES) > /dev/null
clean:
- rm -f depend $(OBJECTS)
+ -rm -f depend depend.bak $(OBJECTS)
include depend
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-26 19:44:57 +0000