diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2004-03-26 20:31:05 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2004-03-26 20:31:05 +0000 |
| commit | 46727c74964faa1e165be81cdbe61c6dbd105b4c (patch) | |
| tree | c0e829cd551c8c77395dd79249fdb89dbcdfdaa9 | |
| parent | 7a5eb9a7606bd951cb9cba56b0ff96c121084d44 (diff) | |
Tweaks for make clean / realclean.
| -rw-r--r-- | Makefile | 5 | ||||
| -rw-r--r-- | progs/demos/Makefile | 3 | ||||
| -rw-r--r-- | progs/redbook/Makefile | 4 | ||||
| -rw-r--r-- | progs/samples/Makefile | 4 | ||||
| -rw-r--r-- | progs/xdemos/Makefile | 5 | ||||
| -rw-r--r-- | src/glw/Makefile | 2 | ||||
| -rw-r--r-- | src/mesa/Makefile | 1 |
7 files changed, 9 insertions, 15 deletions
@@ -21,8 +21,9 @@ clean: done -realclean: clean - #-rm -rf $(LIB_DIR) +realclean: + touch $(TOP)/configs/current + make clean -rm -rf lib* -rm -f $(TOP)/configs/current diff --git a/progs/demos/Makefile b/progs/demos/Makefile index 85cde5b916..ad0b47a2b9 100644 --- a/progs/demos/Makefile +++ b/progs/demos/Makefile @@ -73,9 +73,6 @@ default: readtex.c readtex.h $(PROGS) clean: - -rm -f *.o *~ - -realclean: -rm -f $(PROGS) -rm -f *.o *~ -rm -f readtex.[ch] diff --git a/progs/redbook/Makefile b/progs/redbook/Makefile index f423108188..5fbfde2ca4 100644 --- a/progs/redbook/Makefile +++ b/progs/redbook/Makefile @@ -32,10 +32,8 @@ PROGS = aaindex aapoly aargb accanti accpersp alpha alpha3D anti \ default: $(PROGS) -clean: - -rm -f *.o *~ -realclean: +clean: -rm -f $(PROGS) -rm -f *.o *~ diff --git a/progs/samples/Makefile b/progs/samples/Makefile index 464492de73..cf651b25a9 100644 --- a/progs/samples/Makefile +++ b/progs/samples/Makefile @@ -26,9 +26,7 @@ PROGS = accum bitmap1 bitmap2 blendeq blendxor copy cursor depth eval fog \ default: $(PROGS) -clean: - -rm -f *.o *~ -realclean: +clean: -rm -f $(PROGS) -rm -f *.o *~ diff --git a/progs/xdemos/Makefile b/progs/xdemos/Makefile index 0904ee3445..6462c8ee20 100644 --- a/progs/xdemos/Makefile +++ b/progs/xdemos/Makefile @@ -6,7 +6,7 @@ include $(TOP)/configs/current INCDIR = $(TOP)/include -LIBS = -L$(LIB_DIR) $(APP_LIB_DEPS) +LIBS = $(APP_LIB_DEPS) LIB_DEP = $(LIB_DIR)/$(GL_LIB) $(LIB_DIR)/$(GLU_LIB) @@ -44,9 +44,6 @@ default: $(PROGS) clean: - -rm -f *.o *~ - -realclean: -rm -f $(PROGS) -rm -f *.o *~ diff --git a/src/glw/Makefile b/src/glw/Makefile index d5ec4d9f25..0950e76fd9 100644 --- a/src/glw/Makefile +++ b/src/glw/Makefile @@ -27,8 +27,10 @@ default: $(LIB_DIR)/$(GLW_LIB_NAME) clean: + -rm depend -rm -f *.o *~ + # Make the library $(LIB_DIR)/$(GLW_LIB_NAME): $(OBJECTS) $(TOP)/bin/mklib -o $(GLW_LIB) -major $(MAJOR) -minor $(MINOR) \ diff --git a/src/mesa/Makefile b/src/mesa/Makefile index e61499609e..a90ac8275a 100644 --- a/src/mesa/Makefile +++ b/src/mesa/Makefile @@ -165,6 +165,7 @@ tags: clean: -rm -f */*.o + rm -f depend for dir in $(SUBDIRS) ; do \ pushd $$dir ; \ make clean ; \ |