Skip to content

Commit

Permalink
Merge pull request #995 from Kijewski/issue-993
Browse files Browse the repository at this point in the history
Make: exterminate 'clean' buildtarget clutter
  • Loading branch information
Kijewski committed Apr 18, 2014
2 parents 72df45e + 300d6b3 commit 542a2e5
Show file tree
Hide file tree
Showing 28 changed files with 3 additions and 102 deletions.
6 changes: 0 additions & 6 deletions Makefile.base
Expand Up @@ -21,8 +21,6 @@ ifeq ($(strip $(GIT_VERSION)),)
endif
export CFLAGS += -DVERSION=\"$(GIT_VERSION)\"

.PHONY: clean

$(BINDIR)$(MODULE).a: $(OBJ) $(ASMOBJ)
$(AD)$(AR) -rc $(BINDIR)$(MODULE).a $(OBJ) $(ASMOBJ)

Expand All @@ -44,7 +42,3 @@ $(BINDIR)$(MODULE)/%.o: %.s
$(BINDIR)$(MODULE)/%.o: %.S
@mkdir -p $(BINDIR)$(MODULE)
$(AD)$(CC) -c $(CFLAGS) $*.S -o $(BINDIR)$(MODULE)/$*.o

# remove compilation products
clean::
$(AD)rm -f $(BINDIR)$(MODULE).a $(OBJ) $(DEP) $(ASMOBJ)
4 changes: 1 addition & 3 deletions Makefile.include
Expand Up @@ -143,9 +143,7 @@ $(USEPKG:%=${BINDIR}%.a)::
"$(MAKE)" -C $(RIOTBASE)/pkg/$(patsubst ${BINDIR}%.a,%,$@)

clean:
@for i in $(USEPKG) ; do "$(MAKE)" -C $(RIOTBASE)/pkg/$$i clean || exit 1; done ;
"$(MAKE)" -C $(RIOTBOARD)/$(BOARD) clean
"$(MAKE)" -C $(RIOTBASE) clean
@for i in $(USEPKG) ; do "$(MAKE)" -C $(RIOTBASE)/pkg/$$i clean || exit 1; done
rm -rf $(BINDIR)

flash: all
Expand Down
3 changes: 2 additions & 1 deletion Makefile.unsupported
Expand Up @@ -3,4 +3,5 @@
all:
$(error Project $(PROJECT) currently not supported for $(BOARD))

clean: all
clean:
@true
3 changes: 0 additions & 3 deletions boards/avsextrem/Makefile
Expand Up @@ -6,6 +6,3 @@ all: $(BINDIR)$(MODULE).a
@for i in $(DIRS) ; do "$(MAKE)" -C $$i || exit 1; done ;

include $(RIOTBASE)/Makefile.base

clean::
@for i in $(DIRS) ; do "$(MAKE)" -C $$i clean || exit 1; done ;
3 changes: 0 additions & 3 deletions boards/chronos/Makefile
Expand Up @@ -7,6 +7,3 @@ all: $(BINDIR)$(MODULE).a
@for i in $(DIRS) ; do "$(MAKE)" -C $$i || exit 1; done ;

include $(RIOTBASE)/Makefile.base

clean::
@for i in $(DIRS) ; do "$(MAKE)" -C $$i clean || exit 1; done ;
3 changes: 0 additions & 3 deletions boards/msb-430-common/Makefile
Expand Up @@ -6,6 +6,3 @@ all: $(BINDIR)$(MODULE).a
@for i in $(DIRS) ; do "$(MAKE)" -C $$i || exit 1; done ;

include $(RIOTBASE)/Makefile.base

clean::
@for i in $(DIRS) ; do "$(MAKE)" -C $$i clean || exit 1; done ;
3 changes: 0 additions & 3 deletions boards/msb-430/Makefile
Expand Up @@ -6,6 +6,3 @@ all: $(BINDIR)$(MODULE).a
@for i in $(DIRS) ; do "$(MAKE)" -C $$i || exit 1; done ;

include $(RIOTBASE)/Makefile.base

clean::
@for i in $(DIRS) ; do "$(MAKE)" -C $$i clean || exit 1; done ;
3 changes: 0 additions & 3 deletions boards/msb-430h/Makefile
Expand Up @@ -6,6 +6,3 @@ all: $(BINDIR)$(MODULE).a
@for i in $(DIRS) ; do "$(MAKE)" -C $$i || exit 1; done ;

include $(RIOTBASE)/Makefile.base

clean::
@for i in $(DIRS) ; do "$(MAKE)" -C $$i clean || exit 1; done ;
3 changes: 0 additions & 3 deletions boards/msba2-common/Makefile
Expand Up @@ -6,6 +6,3 @@ all: $(BINDIR)$(MODULE).a
@for i in $(DIRS) ; do "$(MAKE)" -C $$i || exit 1; done ;

include $(RIOTBASE)/Makefile.base

clean::
@for i in $(DIRS) ; do "$(MAKE)" -C $$i clean || exit 1; done ;
3 changes: 0 additions & 3 deletions boards/msba2/Makefile
Expand Up @@ -7,6 +7,3 @@ all: $(BINDIR)$(MODULE).a
@for i in $(DIRS) ; do "$(MAKE)" -C $$i || exit 1; done ;

include $(RIOTBASE)/Makefile.base

clean::
@for i in $(DIRS) ; do "$(MAKE)" -C $$i clean || exit 1; done ;
3 changes: 0 additions & 3 deletions boards/native/Makefile
Expand Up @@ -12,6 +12,3 @@ $(BINDIR)$(MODULE)/%.o: %.c
$(AD)$(CC) $(CFLAGS) $(NATIVEINCLUDES) -c $*.c -o $(BINDIR)$(MODULE)/$*.o
$(AD)$(CC) $(CFLAGS) $(NATIVEINCLUDES) -MM $*.c |\
sed -e "1s|^|$(BINDIR)$(MODULE)/|" > $(BINDIR)$(MODULE)/$*.d

clean::
@for i in $(DIRS) ; do "$(MAKE)" -C $$i clean || exit 1; done ;
3 changes: 0 additions & 3 deletions boards/pttu/Makefile
Expand Up @@ -7,6 +7,3 @@ all: $(BINDIR)$(MODULE).a
@for i in $(DIRS) ; do "$(MAKE)" -C $$i || exit 1; done ;

include $(RIOTBASE)/Makefile.base

clean::
@for i in $(DIRS) ; do "$(MAKE)" -C $$i clean || exit 1; done ;
3 changes: 0 additions & 3 deletions boards/redbee-econotag/Makefile
Expand Up @@ -6,6 +6,3 @@ all: $(BINDIR)$(MODULE).a
@for i in $(DIRS) ; do "$(MAKE)" -C $$i || exit 1; done ;

include $(RIOTBASE)/Makefile.base

clean::
@for i in $(DIRS) ; do "$(MAKE)" -C $$i clean || exit 1; done ;
3 changes: 0 additions & 3 deletions boards/wsn430-common/Makefile
Expand Up @@ -6,6 +6,3 @@ all: $(BINDIR)$(MODULE).a
@for i in $(DIRS) ; do "$(MAKE)" -C $$i || exit 1; done ;

include $(RIOTBASE)/Makefile.base

clean::
@for i in $(DIRS) ; do "$(MAKE)" -C $$i clean || exit 1; done ;
3 changes: 0 additions & 3 deletions boards/wsn430-v1_3b/Makefile
Expand Up @@ -6,6 +6,3 @@ all: $(BINDIR)$(MODULE).a
@for i in $(DIRS) ; do "$(MAKE)" -C $$i || exit 1; done ;

include $(RIOTBASE)/Makefile.base

clean::
@for i in $(DIRS) ; do "$(MAKE)" -C $$i clean || exit 1; done ;
3 changes: 0 additions & 3 deletions boards/wsn430-v1_4/Makefile
Expand Up @@ -9,6 +9,3 @@ all: $(BINDIR)$(MODULE).a
@for i in $(DIRS) ; do "$(MAKE)" -C $$i || exit 1; done ;

include $(RIOTBASE)/Makefile.base

clean::
@for i in $(DIRS) ; do "$(MAKE)" -C $$i clean || exit 1; done ;
3 changes: 0 additions & 3 deletions cpu/cc430/Makefile
Expand Up @@ -6,6 +6,3 @@ all: $(BINDIR)$(MODULE).a
@for i in $(DIRS) ; do "$(MAKE)" -C $$i || exit 1; done ;

include $(RIOTBASE)/Makefile.base

clean::
@for i in $(DIRS) ; do "$(MAKE)" -C $$i clean || exit 1; done ;
3 changes: 0 additions & 3 deletions cpu/lpc1768/Makefile
Expand Up @@ -11,9 +11,6 @@ all: $(BINDIR)$(MODULE).a

include $(RIOTBASE)/Makefile.base

clean::
@for i in $(DIRS) ; do "$(MAKE)" -C $$i clean || exit 1; done ;

# This is needed for NXP Cortex M devices
nxpsum:
$(CCLOCAL) nxpsum.c -std=c99 -o nxpsum
Expand Down
3 changes: 0 additions & 3 deletions cpu/lpc2387/Makefile
Expand Up @@ -20,6 +20,3 @@ all: $(BINDIR)$(MODULE).a
@for i in $(DIRS) ; do "$(MAKE)" -C $$i || exit 1; done ;

include $(RIOTBASE)/Makefile.base

clean::
@for i in $(DIRS) ; do "$(MAKE)" -C $$i clean || exit 1; done ;
3 changes: 0 additions & 3 deletions cpu/mc1322x/Makefile
Expand Up @@ -12,6 +12,3 @@ all: $(BINDIR)$(MODULE).a
@for i in $(DIRS) ; do "$(MAKE)" -C $$i || exit 1; done ;

include $(RIOTBASE)/Makefile.base

clean::
@for i in $(DIRS) ; do "$(MAKE)" -C $$i clean || exit 1; done ;
8 changes: 0 additions & 8 deletions cpu/msp430-common/Makefile
@@ -1,11 +1,3 @@
MODULE =msp430_common

DIRS =

all: $(BINDIR)$(MODULE).a
@for i in $(DIRS) ; do "$(MAKE)" -C $$i || exit 1; done ;

include $(RIOTBASE)/Makefile.base

clean::
@for i in $(DIRS) ; do "$(MAKE)" -C $$i clean || exit 1; done ;
3 changes: 0 additions & 3 deletions cpu/msp430x16x/Makefile
Expand Up @@ -8,6 +8,3 @@ all: $(BINDIR)$(MODULE).a
@for i in $(DIRS) ; do "$(MAKE)" -C $$i || exit 1; done ;

include $(RIOTBASE)/Makefile.base

clean::
@for i in $(DIRS) ; do "$(MAKE)" -C $$i clean || exit 1; done ;
3 changes: 0 additions & 3 deletions cpu/native/Makefile
Expand Up @@ -18,6 +18,3 @@ $(BINDIR)$(MODULE)/%.o: %.c
$(AD)$(CC) $(CFLAGS) $(NATIVEINCLUDES) -c $*.c -o $(BINDIR)$(MODULE)/$*.o
$(AD)$(CC) $(CFLAGS) $(NATIVEINCLUDES) -MM $*.c |\
sed -e "1s|^|$(BINDIR)$(MODULE)/|" > $(BINDIR)$(MODULE)/$*.d

clean::
@for i in $(DIRS) ; do "$(MAKE)" -C $$i clean || exit 1; done ;
4 changes: 0 additions & 4 deletions drivers/Makefile
Expand Up @@ -39,7 +39,3 @@ all:
@for i in $(DIRS) ; do "$(MAKE)" -C $$i || exit 1; done ;

include $(RIOTBASE)/Makefile.base

# remove compilation products
clean::
@for i in $(DIRS) ; do "$(MAKE)" -C $$i clean || exit 1; done ;
8 changes: 0 additions & 8 deletions drivers/at86rf231/Makefile
@@ -1,11 +1,3 @@
MODULE =at86rf231

DIRS =

all: $(BINDIR)$(MODULE).a
@for i in $(DIRS) ; do "$(MAKE)" -C $$i || exit 1; done ;

include $(RIOTBASE)/Makefile.base

clean::
@for i in $(DIRS) ; do "$(MAKE)" -C $$i clean || exit 1; done ;
3 changes: 0 additions & 3 deletions drivers/cc110x_ng/Makefile
Expand Up @@ -15,6 +15,3 @@ all: $(BINDIR)$(MODULE).a
@for i in $(DIRS) ; do "$(MAKE)" -C $$i || exit 1; done ;

include $(RIOTBASE)/Makefile.base

clean::
@for i in $(DIRS) ; do "$(MAKE)" -C $$i clean || exit 1; done ;
8 changes: 0 additions & 8 deletions drivers/cc2420/Makefile
@@ -1,11 +1,3 @@
MODULE =cc2420

DIRS =

all: $(BINDIR)$(MODULE).a
@for i in $(DIRS) ; do "$(MAKE)" -C $$i || exit 1; done ;

include $(RIOTBASE)/Makefile.base

clean::
@for i in $(DIRS) ; do "$(MAKE)" -C $$i clean || exit 1; done ;
4 changes: 0 additions & 4 deletions sys/Makefile
Expand Up @@ -106,7 +106,3 @@ all: $(BINDIR)$(MODULE).a
@for i in $(DIRS) ; do "$(MAKE)" -C $$i || exit 1; done ;

include $(RIOTBASE)/Makefile.base

# remove compilation products
clean::
@for i in $(DIRS) ; do "$(MAKE)" -C $$i clean || exit 1; done ;

0 comments on commit 542a2e5

Please sign in to comment.