Skip to content

Commit 011469d

Browse files
committed
Fix broken logic in the clean target
1 parent 6d2e7e4 commit 011469d

7 files changed

Lines changed: 34 additions & 53 deletions

File tree

Makefile

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -312,13 +312,10 @@ uninstall:
312312
rm -rf $(DESTDIR)$(ASSETS_DIR)
313313

314314
clean:
315-
ifneq ($(V),1)
316-
@echo RM
317-
else
318-
rm -rf $(OBJDIR_BASE)
319-
rm -f $(TARGET)
320-
rm -f *.d
321-
endif
315+
@$(if $(Q), echo $@,)
316+
$(Q)rm -rf $(OBJDIR_BASE)
317+
$(Q)rm -f $(TARGET)
318+
$(Q)rm -f *.d
322319

323320
.PHONY: all install uninstall clean
324321

Makefile.miyoo

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -223,13 +223,10 @@ $(OBJDIR)/%.o: %.S $(HEADERS)
223223
$(Q)$(CC) $(CFLAGS) $(ASFLAGS) $(DEFINES) -c -o $@ $<
224224

225225
clean:
226-
ifneq ($(V),1)
227-
@echo RM
228-
else
229-
rm -rf $(OBJDIR_BASE)
230-
rm -f $(TARGET)
231-
rm -f *.d
232-
endif
226+
@$(if $(Q), echo $@,)
227+
$(Q)rm -rf $(OBJDIR_BASE)
228+
$(Q)rm -f $(TARGET)
229+
$(Q)rm -f *.d
233230

234231
.PHONY: all clean
235232

Makefile.ngc

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -288,13 +288,10 @@ $(EXT_INTER_TARGET): $(OBJ)
288288
$(Q)$(LD) -r -b binary $(OBJOUT)$@ $<
289289

290290
clean:
291-
ifneq ($(V),1)
292-
@echo RM
293-
else
294-
rm -f $(EXT_TARGET)
295-
rm -f $(EXT_INTER_TARGET)
296-
rm -f $(OBJ)
297-
endif
291+
@$(if $(Q), echo $@,)
292+
$(Q)rm -f $(EXT_TARGET)
293+
$(Q)rm -f $(EXT_INTER_TARGET)
294+
$(Q)rm -f $(OBJ)
298295

299296
.PHONY: clean
300297

Makefile.retrofw

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -237,14 +237,11 @@ $(OBJDIR)/%.o: %.S $(HEADERS)
237237
$(Q)$(CC) $(CFLAGS) $(ASFLAGS) $(DEFINES) -c -o $@ $<
238238

239239
clean:
240-
ifneq ($(V),1)
241-
@echo RM
242-
else
243-
rm -rf $(OBJDIR_BASE)
244-
rm -f $(TARGET)
245-
rm -f *.d
246-
rm -rf $(OPK_NAME)
247-
endif
240+
@$(if $(Q), echo $@,)
241+
$(Q)rm -rf $(OBJDIR_BASE)
242+
$(Q)rm -f $(TARGET)
243+
$(Q)rm -f *.d
244+
$(Q)rm -rf $(OPK_NAME)
248245

249246
opk: $(TARGET)
250247
echo "$$DESKTOP_ENTRY" > default.retrofw.desktop

Makefile.rs90

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -239,12 +239,11 @@ $(OBJDIR)/%.o: %.S $(HEADERS)
239239
$(Q)$(CC) $(CFLAGS) $(ASFLAGS) $(DEFINES) -c -o $@ $<
240240

241241
clean:
242-
ifneq ($(V),1)
243-
rm -rf $(OBJDIR_BASE)
244-
rm -f $(TARGET)
245-
rm -f *.d
246-
rm -rf $(OPK_NAME)
247-
endif
242+
@$(if $(Q), echo $@,)
243+
$(Q)rm -rf $(OBJDIR_BASE)
244+
$(Q)rm -f $(TARGET)
245+
$(Q)rm -f *.d
246+
$(Q)rm -rf $(OPK_NAME)
248247

249248
opk: $(TARGET)
250249
echo "$$DESKTOP_ENTRY" > default.rs90.desktop

Makefile.webos

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -257,16 +257,13 @@ $(OBJDIR)/%.o: %.S $(HEADERS)
257257
$(Q)$(CC) $(CFLAGS) $(ASFLAGS) $(DEFINES) -c -o $@ $<
258258

259259
clean:
260-
ifneq ($(V),1)
261-
@echo RM
262-
else
263-
rm -rf $(OBJDIR_BASE)
264-
rm -f $(TARGET)
265-
rm -f *.d
266-
rm -rf SDL
267-
rm -rf webos/*.ipk
268-
rm -rf webos/dist
269-
endif
260+
@$(if $(Q), echo $@,)
261+
$(Q)rm -rf $(OBJDIR_BASE)
262+
$(Q)rm -f $(TARGET)
263+
$(Q)rm -f *.d
264+
$(Q)rm -rf SDL
265+
$(Q)rm -rf webos/*.ipk
266+
$(Q)rm -rf webos/dist
270267

271268
sdl2: $(TARGET)
272269
ifeq ($(ADD_SDL2_LIB), 1)

Makefile.wii

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -312,14 +312,11 @@ $(APP_BOOTER_DIR)/app_booter.bin:
312312
$(MAKE) -C $(APP_BOOTER_DIR)
313313

314314
clean:
315-
ifneq ($(V),1)
316-
@echo RM
317-
else
318-
rm -f $(EXT_TARGET)
319-
rm -f $(EXT_INTER_TARGET)
320-
rm -f $(OBJ)
321-
$(MAKE) -C $(APP_BOOTER_DIR) clean
322-
endif
315+
@$(if $(Q), echo $@,)
316+
$(Q)rm -f $(EXT_TARGET)
317+
$(Q)rm -f $(EXT_INTER_TARGET)
318+
$(Q)rm -f $(OBJ)
319+
$(Q)$(MAKE) -C $(APP_BOOTER_DIR) clean
323320

324321
.PHONY: clean
325322

0 commit comments

Comments
 (0)