diff options
Diffstat (limited to 'uisimulator')
-rw-r--r-- | uisimulator/common/Makefile | 8 | ||||
-rw-r--r-- | uisimulator/sdl/Makefile | 13 |
2 files changed, 8 insertions, 13 deletions
diff --git a/uisimulator/common/Makefile b/uisimulator/common/Makefile index aeec7c6951..ef68230153 100644 --- a/uisimulator/common/Makefile +++ b/uisimulator/common/Makefile | |||
@@ -47,12 +47,10 @@ all: $(OUTFILE) | |||
47 | include $(TOOLSDIR)/make.inc | 47 | include $(TOOLSDIR)/make.inc |
48 | 48 | ||
49 | clean: | 49 | clean: |
50 | @echo "cleaning commonsim" | 50 | $(call PRINTS,cleaning commonsim)$(RM) $(OBJS) *~ core $(DEPFILE) $(OUTFILE) |
51 | @$(RM) $(OBJS) *~ core $(DEPFILE) $(OUTFILE) | ||
52 | 51 | ||
53 | $(OUTFILE): $(OBJS) | 52 | $(OUTFILE): $(OBJS) |
54 | @echo "AR+RANLIB $(notdir $@)" | 53 | $(call PRINTS,AR+RANLIB $(@F))$(AR) ruv $@ $(OBJS) >/dev/null 2>&1 |
55 | @$(AR) ruv $@ $(OBJS) >/dev/null 2>&1 | 54 | $(SILENT)$(RANLIB) $@ |
56 | @$(RANLIB) $@ | ||
57 | 55 | ||
58 | -include $(DEPFILE) | 56 | -include $(DEPFILE) |
diff --git a/uisimulator/sdl/Makefile b/uisimulator/sdl/Makefile index 55b94cec5e..7946ef31a2 100644 --- a/uisimulator/sdl/Makefile +++ b/uisimulator/sdl/Makefile | |||
@@ -49,19 +49,16 @@ all: $(OUTFILE) | |||
49 | include $(TOOLSDIR)/make.inc | 49 | include $(TOOLSDIR)/make.inc |
50 | 50 | ||
51 | $(OUTFILE): $(OBJS) $(BUILDDIR)/UI256.bmp | 51 | $(OUTFILE): $(OBJS) $(BUILDDIR)/UI256.bmp |
52 | @echo "AR+RANLIB $(notdir $@)" | 52 | $(call PRINTS,AR+RANLIB $(@F))$(AR) ruv $@ $(OBJS) >/dev/null 2>&1 |
53 | @$(AR) ruv $@ $(OBJS) >/dev/null 2>&1 | 53 | $(SILENT)$(RANLIB) $@ |
54 | @$(RANLIB) $@ | ||
55 | 54 | ||
56 | clean: | 55 | clean: |
57 | @echo "cleaning sim" | 56 | $(call PRINTS,cleaning sim)$(RM) $(OBJS) *~ core $(OUTFILE) $(DEPFILE) \ |
58 | @$(RM) $(OBJS) *~ core $(OUTFILE) $(DEPFILE) \ | ||
59 | $(BUILDDIR)/UI256.bmp $(DEPFILE) | 57 | $(BUILDDIR)/UI256.bmp $(DEPFILE) |
60 | @$(MAKE) -C $(SIMCOMMON) clean | 58 | $(SILENT)$(MAKE) -C $(SIMCOMMON) clean |
61 | 59 | ||
62 | ################## Specific dependencies ################## | 60 | ################## Specific dependencies ################## |
63 | $(BUILDDIR)/UI256.bmp: UI-$(ARCHOS).bmp | 61 | $(BUILDDIR)/UI256.bmp: UI-$(ARCHOS).bmp |
64 | @echo UI | 62 | $(call PRINTS,UI)cp $< $@ |
65 | @cp $< $@ | ||
66 | 63 | ||
67 | -include $(DEPFILE) | 64 | -include $(DEPFILE) |