diff options
Diffstat (limited to 'apps/plugins')
-rw-r--r-- | apps/plugins/Makefile | 48 | ||||
-rw-r--r-- | apps/plugins/bitmaps/Makefile | 34 | ||||
-rw-r--r-- | apps/plugins/bitmaps/mono/Makefile | 3 | ||||
-rw-r--r-- | apps/plugins/bitmaps/native/Makefile | 3 | ||||
-rw-r--r-- | apps/plugins/bitmaps/remote_mono/Makefile | 3 | ||||
-rw-r--r-- | apps/plugins/bitmaps/remote_native/Makefile | 3 | ||||
-rw-r--r-- | apps/plugins/chessbox/Makefile | 25 | ||||
-rw-r--r-- | apps/plugins/databox/Makefile | 25 | ||||
-rw-r--r-- | apps/plugins/doom/Makefile | 30 | ||||
-rw-r--r-- | apps/plugins/lib/Makefile | 8 | ||||
-rw-r--r-- | apps/plugins/mpegplayer/Makefile | 25 | ||||
-rw-r--r-- | apps/plugins/pacbox/Makefile | 25 | ||||
-rw-r--r-- | apps/plugins/rockboy/Makefile | 25 | ||||
-rw-r--r-- | apps/plugins/searchengine/Makefile | 25 | ||||
-rw-r--r-- | apps/plugins/sudoku/Makefile | 25 | ||||
-rw-r--r-- | apps/plugins/zxbox/Makefile | 17 |
16 files changed, 112 insertions, 212 deletions
diff --git a/apps/plugins/Makefile b/apps/plugins/Makefile index a35bcf7dfd..371a04ef4b 100644 --- a/apps/plugins/Makefile +++ b/apps/plugins/Makefile | |||
@@ -67,27 +67,32 @@ $(DEPFILE): $(BITMAPLIBS) | |||
67 | dep: $(DEPFILE) | 67 | dep: $(DEPFILE) |
68 | 68 | ||
69 | $(BUILDDIR)/credits.raw: $(DOCSDIR)/CREDITS | 69 | $(BUILDDIR)/credits.raw: $(DOCSDIR)/CREDITS |
70 | @echo "create credits.raw" | 70 | $(call PRINTS,create credits.raw)perl credits.pl < $< > $@ |
71 | $(SILENT)perl credits.pl < $< > $@ | ||
72 | 71 | ||
73 | $(OBJDIR)/credits.o: credits.c $(BUILDDIR)/credits.raw | 72 | $(OBJDIR)/credits.o: credits.c $(BUILDDIR)/credits.raw |
74 | $(SILENT)mkdir -p $(dir $@) | 73 | $(SILENT)mkdir -p $(dir $@) |
75 | @echo "CC $<" | 74 | $(call PRINTS,CC $(<F))$(CC) $(CFLAGS) -I$(OBJDIR) -c $< -o $@ |
76 | $(SILENT)$(CC) $(CFLAGS) -I$(OBJDIR) -c $< -o $@ | ||
77 | 75 | ||
78 | build-bitmaps: | 76 | build-bitmapsmono: |
79 | $(SILENT)$(MAKE) -C bitmaps OBJDIR=$(OBJDIR)/bitmaps | 77 | $(call PRINTS,MAKE in plugins/bitmaps/mono)$(MAKE) -C bitmaps/mono OBJDIR=$(OBJDIR)/bitmaps/mono |
80 | 78 | ||
81 | $(BITMAPLIBS): build-bitmaps | 79 | build-bitmapsnative: |
80 | $(call PRINTS,MAKE in plugins/bitmaps/native)$(MAKE) -C bitmaps/native OBJDIR=$(OBJDIR)/bitmaps/native | ||
81 | |||
82 | build-bitmapsremotemono: | ||
83 | $(call PRINTS,MAKE in plugins/bitmaps/remote_mono)$(MAKE) -C bitmaps/remote_mono OBJDIR=$(OBJDIR)/bitmaps/remote_mono | ||
84 | |||
85 | build-bitmapsremotenative: | ||
86 | $(call PRINTS,MAKE in plugins/bitmaps/remote_native)$(MAKE) -C bitmaps/remote_native OBJDIR=$(OBJDIR)/bitmaps/remote_native | ||
87 | |||
88 | $(BITMAPLIBS): $(BUILDDIR)/libplugin%.a: build-% | ||
82 | 89 | ||
83 | ifndef SIMVER | 90 | ifndef SIMVER |
84 | $(OBJDIR)/%.elf: $(OBJDIR)/%.o $(LINKFILE) $(BUILDDIR)/libplugin.a $(BITMAPLIBS) | 91 | $(OBJDIR)/%.elf: $(OBJDIR)/%.o $(LINKFILE) $(BUILDDIR)/libplugin.a $(BITMAPLIBS) |
85 | @echo "LD $(notdir $@)" | 92 | $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -O -nostdlib -o $@ $< -L$(BUILDDIR) $(CODECLIBS) -lplugin $(LINKBITMAPS) -lgcc -T$(LINKFILE) -Wl,--gc-sections -Wl,-Map,$(OBJDIR)/$*.map |
86 | $(SILENT)$(CC) $(GCCOPTS) -O -nostdlib -o $@ $< -L$(BUILDDIR) $(CODECLIBS) -lplugin $(LINKBITMAPS) -lgcc -T$(LINKFILE) -Wl,--gc-sections -Wl,-Map,$(OBJDIR)/$*.map | ||
87 | 93 | ||
88 | $(OBJDIR)/%.rock : $(OBJDIR)/%.elf | 94 | $(OBJDIR)/%.rock : $(OBJDIR)/%.elf |
89 | @echo "OBJCOPY $(notdir $@)" | 95 | $(call PRINTS,OBJCOPY $(@F))$(OC) -O binary $< $@ |
90 | $(SILENT)$(OC) -O binary $< $@ | ||
91 | else | 96 | else |
92 | 97 | ||
93 | ifeq ($(SIMVER), x11) | 98 | ifeq ($(SIMVER), x11) |
@@ -95,8 +100,7 @@ ifeq ($(SIMVER), x11) | |||
95 | # This is the X11 simulator version | 100 | # This is the X11 simulator version |
96 | 101 | ||
97 | $(OBJDIR)/%.rock : $(OBJDIR)/%.o $(BUILDDIR)/libplugin.a $(BITMAPLIBS) | 102 | $(OBJDIR)/%.rock : $(OBJDIR)/%.o $(BUILDDIR)/libplugin.a $(BITMAPLIBS) |
98 | @echo "LD $(notdir $@)" | 103 | $(call PRINTS,LD $(@F))$(CC) $(CFLAGS) $(SHARED_FLAG) $< -L$(BUILDDIR) $(CODECLIBS) -lplugin $(LINKBITMAPS) -o $@ |
99 | $(SILENT)$(CC) $(CFLAGS) $(SHARED_FLAG) $< -L$(BUILDDIR) $(CODECLIBS) -lplugin $(LINKBITMAPS) -o $@ | ||
100 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) | 104 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) |
101 | # 'x' must be kept or you'll have "Win32 error 5" | 105 | # 'x' must be kept or you'll have "Win32 error 5" |
102 | # $ fgrep 5 /usr/include/w32api/winerror.h | head -1 | 106 | # $ fgrep 5 /usr/include/w32api/winerror.h | head -1 |
@@ -111,8 +115,7 @@ ifeq ($(SIMVER), sdl) | |||
111 | # This is the SDL simulator version | 115 | # This is the SDL simulator version |
112 | 116 | ||
113 | $(OBJDIR)/%.rock : $(OBJDIR)/%.o $(BUILDDIR)/libplugin.a $(BITMAPLIBS) | 117 | $(OBJDIR)/%.rock : $(OBJDIR)/%.o $(BUILDDIR)/libplugin.a $(BITMAPLIBS) |
114 | @echo "LD $(notdir $@)" | 118 | $(call PRINTS,LD $(@F))$(CC) $(CFLAGS) $(SHARED_FLAG) $< -L$(BUILDDIR) $(CODECLIBS) -lplugin $(LINKBITMAPS) -o $@ |
115 | $(SILENT)$(CC) $(CFLAGS) $(SHARED_FLAG) $< -L$(BUILDDIR) $(CODECLIBS) -lplugin $(LINKBITMAPS) -o $@ | ||
116 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) | 119 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) |
117 | # 'x' must be kept or you'll have "Win32 error 5" | 120 | # 'x' must be kept or you'll have "Win32 error 5" |
118 | # $ fgrep 5 /usr/include/w32api/winerror.h | head -1 | 121 | # $ fgrep 5 /usr/include/w32api/winerror.h | head -1 |
@@ -128,8 +131,7 @@ DLLTOOLFLAGS = --export-all | |||
128 | DLLWRAPFLAGS = -s --entry _DllMain@12 --target=i386-mingw32 -mno-cygwin | 131 | DLLWRAPFLAGS = -s --entry _DllMain@12 --target=i386-mingw32 -mno-cygwin |
129 | 132 | ||
130 | $(OBJDIR)/%.rock : $(OBJDIR)/%.o $(BUILDDIR)/libplugin.a $(BITMAPLIBS) | 133 | $(OBJDIR)/%.rock : $(OBJDIR)/%.o $(BUILDDIR)/libplugin.a $(BITMAPLIBS) |
131 | @echo "DLL $(notdir $@)" | 134 | $(call PRINTS,DLL $(@F))$(DLLTOOL) $(DLLTOOLFLAGS) -z $(OBJDIR)/$*.def $< |
132 | $(SILENT)$(DLLTOOL) $(DLLTOOLFLAGS) -z $(OBJDIR)/$*.def $< | ||
133 | $(SILENT)$(DLLWRAP) $(DLLWRAPFLAGS) --def $(OBJDIR)/$*.def $< $(BUILDDIR)/libplugin.a $(BITMAPLIBS) \ | 135 | $(SILENT)$(DLLWRAP) $(DLLWRAPFLAGS) --def $(OBJDIR)/$*.def $< $(BUILDDIR)/libplugin.a $(BITMAPLIBS) \ |
134 | $(patsubst -l%,$(BUILDDIR)/lib%.a,$(CODECLIBS)) -o $@ | 136 | $(patsubst -l%,$(BUILDDIR)/lib%.a,$(CODECLIBS)) -o $@ |
135 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) | 137 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) |
@@ -147,23 +149,19 @@ endif # end of simulator section | |||
147 | include $(TOOLSDIR)/make.inc | 149 | include $(TOOLSDIR)/make.inc |
148 | 150 | ||
149 | $(BUILDDIR)/libplugin.a: | 151 | $(BUILDDIR)/libplugin.a: |
150 | @echo "MAKE in plugin/lib" | ||
151 | $(SILENT)mkdir -p $(OBJDIR)/lib | 152 | $(SILENT)mkdir -p $(OBJDIR)/lib |
152 | $(SILENT)$(MAKE) -C lib OBJDIR=$(OBJDIR)/lib | 153 | $(call PRINTS,MAKE in plugin/lib)$(MAKE) -C lib OBJDIR=$(OBJDIR)/lib |
153 | 154 | ||
154 | $(LINKFILE): $(LDS) | 155 | $(LINKFILE): $(LDS) |
155 | @echo "build $(notdir $@)" | 156 | $(call PRINTS,build $(@F))cat $< | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) $(TARGET) $(DEFINES) -E -P - >$@ |
156 | $(SILENT)cat $< | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) $(TARGET) $(DEFINES) -E -P - >$@ | ||
157 | 157 | ||
158 | $(SUBDIRS): $(BITMAPLIBS) | 158 | $(SUBDIRS): $(BITMAPLIBS) |
159 | @echo "MAKE in $@" | ||
160 | $(SILENT)mkdir -p $(OBJDIR)/$@ | 159 | $(SILENT)mkdir -p $(OBJDIR)/$@ |
161 | $(SILENT)$(MAKE) -C $@ OUTDIR=$(OBJDIR) OBJDIR=$(OBJDIR)/$@ \ | 160 | $(call PRINTS,MAKE in $@)$(MAKE) -C $@ OUTDIR=$(OBJDIR) OBJDIR=$(OBJDIR)/$@ \ |
162 | LINKBITMAPS="$(LINKBITMAPS)" BITMAPLIBS="$(BITMAPLIBS)" | 161 | LINKBITMAPS="$(LINKBITMAPS)" BITMAPLIBS="$(BITMAPLIBS)" |
163 | 162 | ||
164 | clean: | 163 | clean: |
165 | @echo "cleaning plugins" | 164 | $(call PRINTS,cleaning plugins)rm -f $(ROCKS) $(LINKFILE) $(OBJDIR)/*.rock $(DEPFILE) $(ELFS) \ |
166 | $(SILENT)rm -f $(ROCKS) $(LINKFILE) $(OBJDIR)/*.rock $(DEPFILE) $(ELFS) \ | ||
167 | $(BUILDDIR)/credits.raw $(OBJS) $(DEFS) | 165 | $(BUILDDIR)/credits.raw $(OBJS) $(DEFS) |
168 | $(SILENT)$(MAKE) -C lib clean OBJDIR=$(OBJDIR)/lib | 166 | $(SILENT)$(MAKE) -C lib clean OBJDIR=$(OBJDIR)/lib |
169 | $(SILENT)$(MAKE) -C bitmaps/mono clean OBJDIR=$(OBJDIR)/bitmaps/mono | 167 | $(SILENT)$(MAKE) -C bitmaps/mono clean OBJDIR=$(OBJDIR)/bitmaps/mono |
diff --git a/apps/plugins/bitmaps/Makefile b/apps/plugins/bitmaps/Makefile deleted file mode 100644 index abc8fd66bf..0000000000 --- a/apps/plugins/bitmaps/Makefile +++ /dev/null | |||
@@ -1,34 +0,0 @@ | |||
1 | # __________ __ ___. | ||
2 | # Open \______ \ ____ ____ | | _\_ |__ _______ ___ | ||
3 | # Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / | ||
4 | # Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < | ||
5 | # Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ | ||
6 | # \/ \/ \/ \/ \/ | ||
7 | # $Id$ | ||
8 | # | ||
9 | |||
10 | ifndef V | ||
11 | SILENT=@ | ||
12 | endif | ||
13 | |||
14 | all: | ||
15 | ifneq ($(strip $(BMP2RB_NATIVE)),) | ||
16 | @echo "MAKE in plugins/bitmaps/native" | ||
17 | $(SILENT)mkdir -p $(OBJDIR)/native | ||
18 | @$(MAKE) -C native OBJDIR=$(OBJDIR)/native | ||
19 | endif | ||
20 | ifneq ($(strip $(BMP2RB_MONO)),) | ||
21 | @echo "MAKE in plugins/bitmaps/mono" | ||
22 | $(SILENT)mkdir -p $(OBJDIR)/mono | ||
23 | @$(MAKE) -C mono OBJDIR=$(OBJDIR)/mono | ||
24 | endif | ||
25 | ifneq ($(strip $(BMP2RB_REMOTENATIVE)),) | ||
26 | @echo "MAKE in plugins/bitmaps/remote_native" | ||
27 | $(SILENT)mkdir -p $(OBJDIR)/remote_native | ||
28 | @$(MAKE) -C remote_native OBJDIR=$(OBJDIR)/remote_native | ||
29 | endif | ||
30 | ifneq ($(strip $(BMP2RB_REMOTEMONO)),) | ||
31 | @echo "MAKE in plugins/bitmaps/remote_mono" | ||
32 | $(SILENT)mkdir -p $(OBJDIR)/remote_mono | ||
33 | @$(MAKE) -C remote_mono OBJDIR=$(OBJDIR)/remote_mono | ||
34 | endif | ||
diff --git a/apps/plugins/bitmaps/mono/Makefile b/apps/plugins/bitmaps/mono/Makefile index 7b7e052117..03eb77a55b 100644 --- a/apps/plugins/bitmaps/mono/Makefile +++ b/apps/plugins/bitmaps/mono/Makefile | |||
@@ -26,8 +26,7 @@ BMPINCDIR = $(BUILDDIR)/pluginbitmaps | |||
26 | include $(TOOLSDIR)/makebmp.inc | 26 | include $(TOOLSDIR)/makebmp.inc |
27 | 27 | ||
28 | clean: | 28 | clean: |
29 | @echo "cleaning plugins/bitmaps/mono" | 29 | $(call PRINTS,cleaning plugins/bitmaps/mono)rm -f $(CSRC) $(OBJS) $(OUTPUT) $(DEPFILE) |
30 | @rm -f $(CSRC) $(OBJS) $(OUTPUT) $(DEPFILE) | ||
31 | @rmdir $(OBJDIR) | 30 | @rmdir $(OBJDIR) |
32 | 31 | ||
33 | -include $(DEPFILE) | 32 | -include $(DEPFILE) |
diff --git a/apps/plugins/bitmaps/native/Makefile b/apps/plugins/bitmaps/native/Makefile index d7745ee9e2..071f0d4ba1 100644 --- a/apps/plugins/bitmaps/native/Makefile +++ b/apps/plugins/bitmaps/native/Makefile | |||
@@ -26,8 +26,7 @@ BMPINCDIR = $(BUILDDIR)/pluginbitmaps | |||
26 | include $(TOOLSDIR)/makebmp.inc | 26 | include $(TOOLSDIR)/makebmp.inc |
27 | 27 | ||
28 | clean: | 28 | clean: |
29 | @echo "cleaning plugins/bitmaps/native" | 29 | $(call PRINTS,cleaning plugins/bitmaps/native)rm -f $(CSRC) $(OBJS) $(OUTPUT) $(DEPFILE) |
30 | @rm -f $(CSRC) $(OBJS) $(OUTPUT) $(DEPFILE) | ||
31 | @rmdir $(OBJDIR) | 30 | @rmdir $(OBJDIR) |
32 | 31 | ||
33 | -include $(DEPFILE) | 32 | -include $(DEPFILE) |
diff --git a/apps/plugins/bitmaps/remote_mono/Makefile b/apps/plugins/bitmaps/remote_mono/Makefile index db846e23a7..d3858fa46a 100644 --- a/apps/plugins/bitmaps/remote_mono/Makefile +++ b/apps/plugins/bitmaps/remote_mono/Makefile | |||
@@ -26,8 +26,7 @@ BMPINCDIR = $(BUILDDIR)/pluginbitmaps | |||
26 | include $(TOOLSDIR)/makebmp.inc | 26 | include $(TOOLSDIR)/makebmp.inc |
27 | 27 | ||
28 | clean: | 28 | clean: |
29 | @echo "cleaning plugins/bitmaps/remotemono" | 29 | $(call PRINTS,cleaning plugins/bitmaps/remotemono)rm -f $(CSRC) $(OBJS) $(OUTPUT) $(DEPFILE) |
30 | @rm -f $(CSRC) $(OBJS) $(OUTPUT) $(DEPFILE) | ||
31 | @rmdir $(OBJDIR) | 30 | @rmdir $(OBJDIR) |
32 | 31 | ||
33 | -include $(DEPFILE) | 32 | -include $(DEPFILE) |
diff --git a/apps/plugins/bitmaps/remote_native/Makefile b/apps/plugins/bitmaps/remote_native/Makefile index 405f3fd5af..3802e75781 100644 --- a/apps/plugins/bitmaps/remote_native/Makefile +++ b/apps/plugins/bitmaps/remote_native/Makefile | |||
@@ -26,8 +26,7 @@ BMPINCDIR = $(BUILDDIR)/pluginbitmaps | |||
26 | include $(TOOLSDIR)/makebmp.inc | 26 | include $(TOOLSDIR)/makebmp.inc |
27 | 27 | ||
28 | clean: | 28 | clean: |
29 | @echo "cleaning plugins/bitmaps/remote_native" | 29 | $(call PRINTS,cleaning plugins/bitmaps/remote_native)rm -f $(CSRC) $(OBJS) $(OUTPUT) $(DEPFILE) |
30 | @rm -f $(CSRC) $(OBJS) $(OUTPUT) $(DEPFILE) | ||
31 | @rmdir $(OBJDIR) | 30 | @rmdir $(OBJDIR) |
32 | 31 | ||
33 | -include $(DEPFILE) | 32 | -include $(DEPFILE) |
diff --git a/apps/plugins/chessbox/Makefile b/apps/plugins/chessbox/Makefile index 7b3ade24e4..5f1a855082 100644 --- a/apps/plugins/chessbox/Makefile +++ b/apps/plugins/chessbox/Makefile | |||
@@ -40,13 +40,11 @@ all: $(OUTPUT) | |||
40 | 40 | ||
41 | ifndef SIMVER | 41 | ifndef SIMVER |
42 | $(OBJDIR)/chessbox.elf: $(OBJS) $(LINKFILE) $(BITMAPLIBS) | 42 | $(OBJDIR)/chessbox.elf: $(OBJS) $(LINKFILE) $(BITMAPLIBS) |
43 | @echo "LD $(notdir $@)" | 43 | $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -O -nostdlib -o $@ $(OBJS) -L$(BUILDDIR) -lplugin -lgcc \ |
44 | @$(CC) $(GCCOPTS) -O -nostdlib -o $@ $(OBJS) -L$(BUILDDIR) -lplugin -lgcc \ | ||
45 | $(LINKBITMAPS) -T$(LINKFILE) -Wl,-Map,$(OBJDIR)/chessbox.map | 44 | $(LINKBITMAPS) -T$(LINKFILE) -Wl,-Map,$(OBJDIR)/chessbox.map |
46 | 45 | ||
47 | $(OUTPUT): $(OBJDIR)/chessbox.elf | 46 | $(OUTPUT): $(OBJDIR)/chessbox.elf |
48 | @echo "OBJCOPY $(notdir $@)" | 47 | $(call PRINTS,OBJCOPY $(@F))$(OC) -O binary $< $@ |
49 | @$(OC) -O binary $< $@ | ||
50 | else | 48 | else |
51 | 49 | ||
52 | ifeq ($(SIMVER), x11) | 50 | ifeq ($(SIMVER), x11) |
@@ -54,8 +52,7 @@ ifeq ($(SIMVER), x11) | |||
54 | # This is the X11 simulator version | 52 | # This is the X11 simulator version |
55 | 53 | ||
56 | $(OUTPUT): $(OBJS) | 54 | $(OUTPUT): $(OBJS) |
57 | @echo "LD $(notdir $@)" | 55 | $(call PRINTS,LD $(@F))$(CC) $(CFLAGS) $(SHARED_FLAG) $(OBJS) -L$(BUILDDIR) -lplugin $(LINKBITMAPS) -o $@ |
58 | @$(CC) $(CFLAGS) $(SHARED_FLAG) $(OBJS) -L$(BUILDDIR) -lplugin $(LINKBITMAPS) -o $@ | ||
59 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) | 56 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) |
60 | # 'x' must be kept or you'll have "Win32 error 5" | 57 | # 'x' must be kept or you'll have "Win32 error 5" |
61 | # $ fgrep 5 /usr/include/w32api/winerror.h | head -1 | 58 | # $ fgrep 5 /usr/include/w32api/winerror.h | head -1 |
@@ -70,8 +67,7 @@ ifeq ($(SIMVER), sdl) | |||
70 | # This is the SDL simulator version | 67 | # This is the SDL simulator version |
71 | 68 | ||
72 | $(OUTPUT): $(OBJS) | 69 | $(OUTPUT): $(OBJS) |
73 | @echo "LD $(notdir $@)" | 70 | $(call PRINTS,LD $(@F))$(CC) $(CFLAGS) $(SHARED_FLAG) $(OBJS) -L$(BUILDDIR) -lplugin $(LINKBITMAPS) -o $@ |
74 | @$(CC) $(CFLAGS) $(SHARED_FLAG) $(OBJS) -L$(BUILDDIR) -lplugin $(LINKBITMAPS) -o $@ | ||
75 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) | 71 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) |
76 | # 'x' must be kept or you'll have "Win32 error 5" | 72 | # 'x' must be kept or you'll have "Win32 error 5" |
77 | # $ fgrep 5 /usr/include/w32api/winerror.h | head -1 | 73 | # $ fgrep 5 /usr/include/w32api/winerror.h | head -1 |
@@ -87,9 +83,8 @@ DLLTOOLFLAGS = --export-all | |||
87 | DLLWRAPFLAGS = -s --entry _DllMain@12 --target=i386-mingw32 -mno-cygwin | 83 | DLLWRAPFLAGS = -s --entry _DllMain@12 --target=i386-mingw32 -mno-cygwin |
88 | 84 | ||
89 | $(OUTPUT): $(OBJS) | 85 | $(OUTPUT): $(OBJS) |
90 | @echo "DLL $(notdir $@)" | 86 | $(call PRINTS,DLL $(@F))$(DLLTOOL) $(DLLTOOLFLAGS) -z $(OBJDIR)/$*.def $(OBJS) |
91 | @$(DLLTOOL) $(DLLTOOLFLAGS) -z $(OBJDIR)/$*.def $(OBJS) | 87 | $(SILENT)$(DLLWRAP) $(DLLWRAPFLAGS) --def $(OBJDIR)/$*.def $(OBJS) \ |
92 | @$(DLLWRAP) $(DLLWRAPFLAGS) --def $(OBJDIR)/$*.def $(OBJS) \ | ||
93 | $(BUILDDIR)/libplugin.a $(BITMAPLIBS) -o $@ | 88 | $(BUILDDIR)/libplugin.a $(BITMAPLIBS) -o $@ |
94 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) | 89 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) |
95 | # 'x' must be kept or you'll have "Win32 error 5" | 90 | # 'x' must be kept or you'll have "Win32 error 5" |
@@ -108,13 +103,11 @@ include $(TOOLSDIR)/make.inc | |||
108 | # MEMORYSIZE should be passed on to this makefile with the chosen memory size | 103 | # MEMORYSIZE should be passed on to this makefile with the chosen memory size |
109 | # given in number of MB | 104 | # given in number of MB |
110 | $(LINKFILE): $(LDS) | 105 | $(LINKFILE): $(LDS) |
111 | @echo "build $(notdir $@)" | 106 | $(call PRINTS,build $(@F))cat $< | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) $(TARGET) \ |
112 | @cat $< | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) $(TARGET) \ | ||
113 | $(DEFINES) -E -P - >$@ | 107 | $(DEFINES) -E -P - >$@ |
114 | 108 | ||
115 | clean: | 109 | clean: |
116 | @echo "cleaning chessbox" | 110 | $(call PRINTS,cleaning chessbox)rm -rf $(OBJDIR)/chessbox |
117 | @rm -rf $(OBJDIR)/chessbox | 111 | $(SILENT)rm -f $(OBJDIR)/chessbox.* $(DEPFILE) |
118 | @rm -f $(OBJDIR)/chessbox.* $(DEPFILE) | ||
119 | 112 | ||
120 | -include $(DEPFILE) | 113 | -include $(DEPFILE) |
diff --git a/apps/plugins/databox/Makefile b/apps/plugins/databox/Makefile index 818ceb450c..3e026757c4 100644 --- a/apps/plugins/databox/Makefile +++ b/apps/plugins/databox/Makefile | |||
@@ -31,13 +31,11 @@ all: $(OUTPUT) | |||
31 | 31 | ||
32 | ifndef SIMVER | 32 | ifndef SIMVER |
33 | $(OBJDIR)/databox.elf: $(OBJS) $(LINKFILE) | 33 | $(OBJDIR)/databox.elf: $(OBJS) $(LINKFILE) |
34 | @echo "LD $(notdir $@)" | 34 | $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -O -nostdlib -o $@ $(OBJS) -L$(BUILDDIR) -lplugin -lgcc \ |
35 | @$(CC) $(GCCOPTS) -O -nostdlib -o $@ $(OBJS) -L$(BUILDDIR) -lplugin -lgcc \ | ||
36 | -T$(LINKFILE) -Wl,-Map,$(OBJDIR)/databox.map | 35 | -T$(LINKFILE) -Wl,-Map,$(OBJDIR)/databox.map |
37 | 36 | ||
38 | $(OUTPUT): $(OBJDIR)/databox.elf | 37 | $(OUTPUT): $(OBJDIR)/databox.elf |
39 | @echo "OBJCOPY $(notdir $@)" | 38 | $(call PRINTS,OBJCOPY $(@F))$(OC) -O binary $< $@ |
40 | @$(OC) -O binary $< $@ | ||
41 | else | 39 | else |
42 | 40 | ||
43 | ifeq ($(SIMVER), x11) | 41 | ifeq ($(SIMVER), x11) |
@@ -45,8 +43,7 @@ ifeq ($(SIMVER), x11) | |||
45 | # This is the X11 simulator version | 43 | # This is the X11 simulator version |
46 | 44 | ||
47 | $(OUTPUT): $(OBJS) | 45 | $(OUTPUT): $(OBJS) |
48 | @echo "LD $(notdir $@)" | 46 | $(call PRINTS,LD $(@F))$(CC) $(CFLAGS) $(SHARED_FLAG) $(OBJS) -L$(BUILDDIR) -lplugin -o $@ |
49 | @$(CC) $(CFLAGS) $(SHARED_FLAG) $(OBJS) -L$(BUILDDIR) -lplugin -o $@ | ||
50 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) | 47 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) |
51 | # 'x' must be kept or you'll have "Win32 error 5" | 48 | # 'x' must be kept or you'll have "Win32 error 5" |
52 | # $ fgrep 5 /usr/include/w32api/winerror.h | head -1 | 49 | # $ fgrep 5 /usr/include/w32api/winerror.h | head -1 |
@@ -61,8 +58,7 @@ ifeq ($(SIMVER), sdl) | |||
61 | # This is the SDL simulator version | 58 | # This is the SDL simulator version |
62 | 59 | ||
63 | $(OUTPUT): $(OBJS) | 60 | $(OUTPUT): $(OBJS) |
64 | @echo "LD $(notdir $@)" | 61 | $(call PRINTS,LD $(@F))$(CC) $(CFLAGS) $(SHARED_FLAG) $(OBJS) -L$(BUILDDIR) -lplugin -o $@ |
65 | @$(CC) $(CFLAGS) $(SHARED_FLAG) $(OBJS) -L$(BUILDDIR) -lplugin -o $@ | ||
66 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) | 62 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) |
67 | # 'x' must be kept or you'll have "Win32 error 5" | 63 | # 'x' must be kept or you'll have "Win32 error 5" |
68 | # $ fgrep 5 /usr/include/w32api/winerror.h | head -1 | 64 | # $ fgrep 5 /usr/include/w32api/winerror.h | head -1 |
@@ -78,9 +74,8 @@ DLLTOOLFLAGS = --export-all | |||
78 | DLLWRAPFLAGS = -s --entry _DllMain@12 --target=i386-mingw32 -mno-cygwin | 74 | DLLWRAPFLAGS = -s --entry _DllMain@12 --target=i386-mingw32 -mno-cygwin |
79 | 75 | ||
80 | $(OUTPUT): $(OBJS) | 76 | $(OUTPUT): $(OBJS) |
81 | @echo "DLL $(notdir $@)" | 77 | $(call PRINTS,DLL $(@F))$(DLLTOOL) $(DLLTOOLFLAGS) -z $(OBJDIR)/$*.def $(OBJS) |
82 | @$(DLLTOOL) $(DLLTOOLFLAGS) -z $(OBJDIR)/$*.def $(OBJS) | 78 | $(SILENT)$(DLLWRAP) $(DLLWRAPFLAGS) --def $(OBJDIR)/$*.def $(OBJS) \ |
83 | @$(DLLWRAP) $(DLLWRAPFLAGS) --def $(OBJDIR)/$*.def $(OBJS) \ | ||
84 | $(BUILDDIR)/libplugin.a -o $@ | 79 | $(BUILDDIR)/libplugin.a -o $@ |
85 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) | 80 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) |
86 | # 'x' must be kept or you'll have "Win32 error 5" | 81 | # 'x' must be kept or you'll have "Win32 error 5" |
@@ -99,14 +94,12 @@ include $(TOOLSDIR)/make.inc | |||
99 | # MEMORYSIZE should be passed on to this makefile with the chosen memory size | 94 | # MEMORYSIZE should be passed on to this makefile with the chosen memory size |
100 | # given in number of MB | 95 | # given in number of MB |
101 | $(LINKFILE): $(LDS) | 96 | $(LINKFILE): $(LDS) |
102 | @echo "build $(notdir $@)" | 97 | $(call PRINTS,build $(@F))cat $< | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) $(TARGET) \ |
103 | @cat $< | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) $(TARGET) \ | ||
104 | $(DEFINES) -E -P - >$@ | 98 | $(DEFINES) -E -P - >$@ |
105 | 99 | ||
106 | clean: | 100 | clean: |
107 | @echo "cleaning databox" | 101 | $(call PRINTS,cleaning databox)rm -rf $(OBJDIR)/databox |
108 | @rm -rf $(OBJDIR)/databox | 102 | $(SILENT)rm -f $(OBJDIR)/databox.* $(DEPFILE) |
109 | @rm -f $(OBJDIR)/databox.* $(DEPFILE) | ||
110 | 103 | ||
111 | -include $(DEPFILE) | 104 | -include $(DEPFILE) |
112 | 105 | ||
diff --git a/apps/plugins/doom/Makefile b/apps/plugins/doom/Makefile index e1564a773b..f0e858a393 100644 --- a/apps/plugins/doom/Makefile +++ b/apps/plugins/doom/Makefile | |||
@@ -3,7 +3,10 @@ | |||
3 | # $Id$ | 3 | # $Id$ |
4 | # | 4 | # |
5 | # $Log$ | 5 | # $Log$ |
6 | # Revision 1.9 2006/10/23 22:33:36 amiconn | 6 | # Revision 1.10 2006/10/27 21:47:55 amiconn |
7 | # Next step of Makefile tuning: * Use 'make' internal commands for printing messages. Saves build time especially on cygwin. * SILENT variable used in more places. * Bitmap build system uses one Makefille less. | ||
8 | # | ||
9 | # Revision 1.9 2006-10-23 22:33:36 amiconn | ||
7 | # Consistent style of 'make' messages. Always use ranlib after ar. | 10 | # Consistent style of 'make' messages. Always use ranlib after ar. |
8 | # | 11 | # |
9 | # Revision 1.8 2006-10-23 14:09:28 markun | 12 | # Revision 1.8 2006-10-23 14:09:28 markun |
@@ -85,13 +88,11 @@ all: $(OUTPUT) | |||
85 | 88 | ||
86 | ifndef SIMVER | 89 | ifndef SIMVER |
87 | $(OBJDIR)/doom.elf: $(OBJS) $(LINKFILE) | 90 | $(OBJDIR)/doom.elf: $(OBJS) $(LINKFILE) |
88 | @echo "LD $(notdir $@)" | 91 | $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) $(LDFLAGS) -nostdlib -o $@ $(OBJS) -L$(BUILDDIR) -lplugin -lgcc\ |
89 | @$(CC) $(GCCOPTS) $(LDFLAGS) -nostdlib -o $@ $(OBJS) -L$(BUILDDIR) -lplugin -lgcc\ | ||
90 | -T$(LINKFILE) -Wl,-Map,$(OBJDIR)/doom.map | 92 | -T$(LINKFILE) -Wl,-Map,$(OBJDIR)/doom.map |
91 | 93 | ||
92 | $(OUTPUT): $(OBJDIR)/doom.elf | 94 | $(OUTPUT): $(OBJDIR)/doom.elf |
93 | @echo "OBJCOPY $(notdir $@)" | 95 | $(call PRINTS,OBJCOPY $(@F))$(OC) -O binary $< $@ |
94 | @$(OC) -O binary $< $@ | ||
95 | else | 96 | else |
96 | 97 | ||
97 | ifeq ($(SIMVER), x11) | 98 | ifeq ($(SIMVER), x11) |
@@ -99,8 +100,7 @@ ifeq ($(SIMVER), x11) | |||
99 | # This is the X11 simulator version | 100 | # This is the X11 simulator version |
100 | 101 | ||
101 | $(OUTPUT): $(OBJS) | 102 | $(OUTPUT): $(OBJS) |
102 | @echo "LD $(notdir $@)" | 103 | $(call PRINTS,LD $(@F))$(CC) $(CFLAGS) $(SHARED_FLAG) $(OBJS) -L$(BUILDDIR) -lplugin -o $@ |
103 | @$(CC) $(CFLAGS) $(SHARED_FLAG) $(OBJS) -L$(BUILDDIR) -lplugin -o $@ | ||
104 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) | 104 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) |
105 | # 'x' must be kept or you'll have "Win32 error 5" | 105 | # 'x' must be kept or you'll have "Win32 error 5" |
106 | # $ fgrep 5 /usr/include/w32api/winerror.h | head -1 | 106 | # $ fgrep 5 /usr/include/w32api/winerror.h | head -1 |
@@ -115,8 +115,7 @@ ifeq ($(SIMVER), sdl) | |||
115 | # This is the sdl simulator version | 115 | # This is the sdl simulator version |
116 | 116 | ||
117 | $(OUTPUT): $(OBJS) | 117 | $(OUTPUT): $(OBJS) |
118 | @echo "LD $(notdir $@)" | 118 | $(call PRINTS,LD $(@F))$(CC) $(CFLAGS) $(SHARED_FLAG) $(OBJS) -L$(BUILDDIR) -lplugin -o $@ |
119 | @$(CC) $(CFLAGS) $(SHARED_FLAG) $(OBJS) -L$(BUILDDIR) -lplugin -o $@ | ||
120 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) | 119 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) |
121 | # 'x' must be kept or you'll have "Win32 error 5" | 120 | # 'x' must be kept or you'll have "Win32 error 5" |
122 | # $ fgrep 5 /usr/include/w32api/winerror.h | head -1 | 121 | # $ fgrep 5 /usr/include/w32api/winerror.h | head -1 |
@@ -132,9 +131,8 @@ DLLTOOLFLAGS = --export-all | |||
132 | DLLWRAPFLAGS = -s --entry _DllMain@12 --target=i386-mingw32 -mno-cygwin | 131 | DLLWRAPFLAGS = -s --entry _DllMain@12 --target=i386-mingw32 -mno-cygwin |
133 | 132 | ||
134 | $(OUTPUT): $(OBJS) | 133 | $(OUTPUT): $(OBJS) |
135 | @echo "DLL $(notdir $@)" | 134 | $(call PRINTS,DLL $(@F))$(DLLTOOL) $(DLLTOOLFLAGS) -z $(OBJDIR)/$*.def $(OBJS) |
136 | @$(DLLTOOL) $(DLLTOOLFLAGS) -z $(OBJDIR)/$*.def $(OBJS) | 135 | $(SILENT)$(DLLWRAP) $(DLLWRAPFLAGS) --def $(OBJDIR)/$*.def $(OBJS) \ |
137 | @$(DLLWRAP) $(DLLWRAPFLAGS) --def $(OBJDIR)/$*.def $(OBJS) \ | ||
138 | $(BUILDDIR)/libplugin.a -o $@ | 136 | $(BUILDDIR)/libplugin.a -o $@ |
139 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) | 137 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) |
140 | # 'x' must be kept or you'll have "Win32 error 5" | 138 | # 'x' must be kept or you'll have "Win32 error 5" |
@@ -153,13 +151,11 @@ include $(TOOLSDIR)/make.inc | |||
153 | # MEMORYSIZE should be passed on to this makefile with the chosen memory size | 151 | # MEMORYSIZE should be passed on to this makefile with the chosen memory size |
154 | # given in number of MB | 152 | # given in number of MB |
155 | $(LINKFILE): $(LDS) | 153 | $(LINKFILE): $(LDS) |
156 | @echo "build $(notdir $@)" | 154 | $(call PRINTS,build $(@F))cat $< | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) $(TARGET) $(DEFINES) \ |
157 | @cat $< | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) $(TARGET) $(DEFINES) \ | ||
158 | -E -P - >$@ | 155 | -E -P - >$@ |
159 | 156 | ||
160 | clean: | 157 | clean: |
161 | @echo "cleaning doom" | 158 | $(call PRINTS,cleaning doom)rm -rf $(OBJDIR)/doom |
162 | @rm -rf $(OBJDIR)/doom | 159 | $(SILENT)rm -f $(OBJDIR)/doom.* $(DEPFILE) |
163 | @rm -f $(OBJDIR)/doom.* $(DEPFILE) | ||
164 | 160 | ||
165 | -include $(DEPFILE) | 161 | -include $(DEPFILE) |
diff --git a/apps/plugins/lib/Makefile b/apps/plugins/lib/Makefile index 35bf3ac7ac..39f1743f7a 100644 --- a/apps/plugins/lib/Makefile +++ b/apps/plugins/lib/Makefile | |||
@@ -38,14 +38,12 @@ OUTPUT = $(BUILDDIR)/libplugin.a | |||
38 | all: $(OUTPUT) | 38 | all: $(OUTPUT) |
39 | 39 | ||
40 | $(OUTPUT): $(OBJS) | 40 | $(OUTPUT): $(OBJS) |
41 | @echo "AR+RANLIB $(notdir $@)" | 41 | $(call PRINTS,AR+RANLIB $(@F))$(AR) ruv $@ $+ >/dev/null 2>&1 |
42 | @$(AR) ruv $@ $+ >/dev/null 2>&1 | 42 | $(SILENT)$(RANLIB) $@ |
43 | @$(RANLIB) $@ | ||
44 | 43 | ||
45 | include $(TOOLSDIR)/make.inc | 44 | include $(TOOLSDIR)/make.inc |
46 | 45 | ||
47 | clean: | 46 | clean: |
48 | @echo "cleaning lib" | 47 | $(call PRINTS,cleaning lib)rm -f $(OBJS) $(OUTPUT) $(DEPFILE) |
49 | @rm -f $(OBJS) $(OUTPUT) $(DEPFILE) | ||
50 | 48 | ||
51 | -include $(DEPFILE) | 49 | -include $(DEPFILE) |
diff --git a/apps/plugins/mpegplayer/Makefile b/apps/plugins/mpegplayer/Makefile index 82782b737c..fd19a6da9c 100644 --- a/apps/plugins/mpegplayer/Makefile +++ b/apps/plugins/mpegplayer/Makefile | |||
@@ -34,13 +34,11 @@ all: $(OUTPUT) | |||
34 | 34 | ||
35 | ifndef SIMVER | 35 | ifndef SIMVER |
36 | $(OBJDIR)/mpegplayer.elf: $(OBJS) $(LINKFILE) | 36 | $(OBJDIR)/mpegplayer.elf: $(OBJS) $(LINKFILE) |
37 | @echo "LD $(notdir $@)" | 37 | $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -O -nostdlib -o $@ $(OBJS) -L$(BUILDDIR) -lplugin -lgcc \ |
38 | @$(CC) $(GCCOPTS) -O -nostdlib -o $@ $(OBJS) -L$(BUILDDIR) -lplugin -lgcc \ | ||
39 | -T$(LINKFILE) -Wl,-Map,$(OBJDIR)/mpegplayer.map | 38 | -T$(LINKFILE) -Wl,-Map,$(OBJDIR)/mpegplayer.map |
40 | 39 | ||
41 | $(OUTPUT): $(OBJDIR)/mpegplayer.elf | 40 | $(OUTPUT): $(OBJDIR)/mpegplayer.elf |
42 | @echo "OBJCOPY $(notdir $@)" | 41 | $(call PRINTS,OBJCOPY $(@F))$(OC) -O binary $< $@ |
43 | @$(OC) -O binary $< $@ | ||
44 | else | 42 | else |
45 | 43 | ||
46 | ifeq ($(SIMVER), x11) | 44 | ifeq ($(SIMVER), x11) |
@@ -48,8 +46,7 @@ ifeq ($(SIMVER), x11) | |||
48 | # This is the X11 simulator version | 46 | # This is the X11 simulator version |
49 | 47 | ||
50 | $(OUTPUT): $(OBJS) | 48 | $(OUTPUT): $(OBJS) |
51 | @echo "LD $(notdir $@)" | 49 | $(call PRINTS,LD $(@F))$(CC) $(CFLAGS) $(SHARED_FLAG) $(OBJS) -L$(BUILDDIR) -lplugin -o $@ |
52 | @$(CC) $(CFLAGS) $(SHARED_FLAG) $(OBJS) -L$(BUILDDIR) -lplugin -o $@ | ||
53 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) | 50 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) |
54 | # 'x' must be kept or you'll have "Win32 error 5" | 51 | # 'x' must be kept or you'll have "Win32 error 5" |
55 | # $ fgrep 5 /usr/include/w32api/winerror.h | head -1 | 52 | # $ fgrep 5 /usr/include/w32api/winerror.h | head -1 |
@@ -64,8 +61,7 @@ ifeq ($(SIMVER), sdl) | |||
64 | # This is the SDL simulator version | 61 | # This is the SDL simulator version |
65 | 62 | ||
66 | $(OUTPUT): $(OBJS) | 63 | $(OUTPUT): $(OBJS) |
67 | @echo "LD $(notdir $@)" | 64 | $(call PRINTS,LD $(@F))$(CC) $(CFLAGS) $(SHARED_FLAG) $(OBJS) -L$(BUILDDIR) -lplugin -o $@ |
68 | @$(CC) $(CFLAGS) $(SHARED_FLAG) $(OBJS) -L$(BUILDDIR) -lplugin -o $@ | ||
69 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) | 65 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) |
70 | # 'x' must be kept or you'll have "Win32 error 5" | 66 | # 'x' must be kept or you'll have "Win32 error 5" |
71 | # $ fgrep 5 /usr/include/w32api/winerror.h | head -1 | 67 | # $ fgrep 5 /usr/include/w32api/winerror.h | head -1 |
@@ -81,9 +77,8 @@ DLLTOOLFLAGS = --export-all | |||
81 | DLLWRAPFLAGS = -s --entry _DllMain@12 --target=i386-mingw32 -mno-cygwin | 77 | DLLWRAPFLAGS = -s --entry _DllMain@12 --target=i386-mingw32 -mno-cygwin |
82 | 78 | ||
83 | $(OUTPUT): $(OBJS) | 79 | $(OUTPUT): $(OBJS) |
84 | @echo "DLL $(notdir $@)" | 80 | $(call PRINTS,DLL $(@F))$(DLLTOOL) $(DLLTOOLFLAGS) -z $(OBJDIR)/$*.def $(OBJS) |
85 | @$(DLLTOOL) $(DLLTOOLFLAGS) -z $(OBJDIR)/$*.def $(OBJS) | 81 | $(SILENT)@$(DLLWRAP) $(DLLWRAPFLAGS) --def $(OBJDIR)/$*.def $(OBJS) \ |
86 | @$(DLLWRAP) $(DLLWRAPFLAGS) --def $(OBJDIR)/$*.def $(OBJS) \ | ||
87 | $(BUILDDIR)/libplugin.a -o $@ | 82 | $(BUILDDIR)/libplugin.a -o $@ |
88 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) | 83 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) |
89 | # 'x' must be kept or you'll have "Win32 error 5" | 84 | # 'x' must be kept or you'll have "Win32 error 5" |
@@ -102,14 +97,12 @@ include $(TOOLSDIR)/make.inc | |||
102 | # MEMORYSIZE should be passed on to this makefile with the chosen memory size | 97 | # MEMORYSIZE should be passed on to this makefile with the chosen memory size |
103 | # given in number of MB | 98 | # given in number of MB |
104 | $(LINKFILE): $(LDS) | 99 | $(LINKFILE): $(LDS) |
105 | @echo "build $(notdir $@)" | 100 | $(call PRINTS,build $(@F))cat $< | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) $(TARGET) \ |
106 | @cat $< | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) $(TARGET) \ | ||
107 | $(DEFINES) -E -P - >$@ | 101 | $(DEFINES) -E -P - >$@ |
108 | 102 | ||
109 | clean: | 103 | clean: |
110 | @echo "cleaning mpegplayer" | 104 | $(call PRINTS,cleaning mpegplayer)rm -rf $(OBJDIR)/mpegplayer |
111 | @rm -rf $(OBJDIR)/mpegplayer | 105 | $(SILENT)rm -f $(OBJDIR)/mpegplayer.* $(DEPFILE) |
112 | @rm -f $(OBJDIR)/mpegplayer.* $(DEPFILE) | ||
113 | 106 | ||
114 | -include $(DEPFILE) | 107 | -include $(DEPFILE) |
115 | 108 | ||
diff --git a/apps/plugins/pacbox/Makefile b/apps/plugins/pacbox/Makefile index 7cc8da02a4..c88d8ae4ab 100644 --- a/apps/plugins/pacbox/Makefile +++ b/apps/plugins/pacbox/Makefile | |||
@@ -34,13 +34,11 @@ all: $(OUTPUT) | |||
34 | 34 | ||
35 | ifndef SIMVER | 35 | ifndef SIMVER |
36 | $(OBJDIR)/pacbox.elf: $(OBJS) $(LINKFILE) | 36 | $(OBJDIR)/pacbox.elf: $(OBJS) $(LINKFILE) |
37 | @echo "LD $(notdir $@)" | 37 | $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -O -nostdlib -o $@ $(OBJS) -L$(BUILDDIR) -lplugin -lgcc \ |
38 | @$(CC) $(GCCOPTS) -O -nostdlib -o $@ $(OBJS) -L$(BUILDDIR) -lplugin -lgcc \ | ||
39 | -T$(LINKFILE) -Wl,-Map,$(OBJDIR)/pacbox.map | 38 | -T$(LINKFILE) -Wl,-Map,$(OBJDIR)/pacbox.map |
40 | 39 | ||
41 | $(OUTPUT): $(OBJDIR)/pacbox.elf | 40 | $(OUTPUT): $(OBJDIR)/pacbox.elf |
42 | @echo "OBJCOPY $(notdir $@)" | 41 | $(call PRINTS,OBJCOPY $(@F))$(OC) -O binary $< $@ |
43 | @$(OC) -O binary $< $@ | ||
44 | else | 42 | else |
45 | 43 | ||
46 | ifeq ($(SIMVER), x11) | 44 | ifeq ($(SIMVER), x11) |
@@ -48,8 +46,7 @@ ifeq ($(SIMVER), x11) | |||
48 | # This is the X11 simulator version | 46 | # This is the X11 simulator version |
49 | 47 | ||
50 | $(OUTPUT): $(OBJS) | 48 | $(OUTPUT): $(OBJS) |
51 | @echo "LD $(notdir $@)" | 49 | $(call PRINTS,LD $(@F))$(CC) $(CFLAGS) $(SHARED_FLAG) $(OBJS) -L$(BUILDDIR) -lplugin -o $@ |
52 | @$(CC) $(CFLAGS) $(SHARED_FLAG) $(OBJS) -L$(BUILDDIR) -lplugin -o $@ | ||
53 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) | 50 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) |
54 | # 'x' must be kept or you'll have "Win32 error 5" | 51 | # 'x' must be kept or you'll have "Win32 error 5" |
55 | # $ fgrep 5 /usr/include/w32api/winerror.h | head -1 | 52 | # $ fgrep 5 /usr/include/w32api/winerror.h | head -1 |
@@ -64,8 +61,7 @@ ifeq ($(SIMVER), sdl) | |||
64 | # This is the SDL simulator version | 61 | # This is the SDL simulator version |
65 | 62 | ||
66 | $(OUTPUT): $(OBJS) | 63 | $(OUTPUT): $(OBJS) |
67 | @echo "LD $(notdir $@)" | 64 | $(call PRINTS,LD $(@F))$(CC) $(CFLAGS) $(SHARED_FLAG) $(OBJS) -L$(BUILDDIR) -lplugin -o $@ |
68 | @$(CC) $(CFLAGS) $(SHARED_FLAG) $(OBJS) -L$(BUILDDIR) -lplugin -o $@ | ||
69 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) | 65 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) |
70 | # 'x' must be kept or you'll have "Win32 error 5" | 66 | # 'x' must be kept or you'll have "Win32 error 5" |
71 | # $ fgrep 5 /usr/include/w32api/winerror.h | head -1 | 67 | # $ fgrep 5 /usr/include/w32api/winerror.h | head -1 |
@@ -81,9 +77,8 @@ DLLTOOLFLAGS = --export-all | |||
81 | DLLWRAPFLAGS = -s --entry _DllMain@12 --target=i386-mingw32 -mno-cygwin | 77 | DLLWRAPFLAGS = -s --entry _DllMain@12 --target=i386-mingw32 -mno-cygwin |
82 | 78 | ||
83 | $(OUTPUT): $(OBJS) | 79 | $(OUTPUT): $(OBJS) |
84 | @echo "DLL $(notdir $@)" | 80 | $(call PRINTS,DLL $(@F))$(DLLTOOL) $(DLLTOOLFLAGS) -z $(OBJDIR)/$*.def $(OBJS) |
85 | @$(DLLTOOL) $(DLLTOOLFLAGS) -z $(OBJDIR)/$*.def $(OBJS) | 81 | $(SILENT)$(DLLWRAP) $(DLLWRAPFLAGS) --def $(OBJDIR)/$*.def $(OBJS) \ |
86 | @$(DLLWRAP) $(DLLWRAPFLAGS) --def $(OBJDIR)/$*.def $(OBJS) \ | ||
87 | $(BUILDDIR)/libplugin.a -o $@ | 82 | $(BUILDDIR)/libplugin.a -o $@ |
88 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) | 83 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) |
89 | # 'x' must be kept or you'll have "Win32 error 5" | 84 | # 'x' must be kept or you'll have "Win32 error 5" |
@@ -102,14 +97,12 @@ include $(TOOLSDIR)/make.inc | |||
102 | # MEMORYSIZE should be passed on to this makefile with the chosen memory size | 97 | # MEMORYSIZE should be passed on to this makefile with the chosen memory size |
103 | # given in number of MB | 98 | # given in number of MB |
104 | $(LINKFILE): $(LDS) | 99 | $(LINKFILE): $(LDS) |
105 | @echo "build $(notdir $@)" | 100 | $(call PRINTS,build $(@F))cat $< | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) $(TARGET) \ |
106 | @cat $< | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) $(TARGET) \ | ||
107 | $(DEFINES) -E -P - >$@ | 101 | $(DEFINES) -E -P - >$@ |
108 | 102 | ||
109 | clean: | 103 | clean: |
110 | @echo "cleaning pacbox" | 104 | $(call PRINTS,cleaning pacbox)rm -rf $(OBJDIR)/pacbox |
111 | @rm -rf $(OBJDIR)/pacbox | 105 | $(SILENT)rm -f $(OBJDIR)/pacbox.* $(DEPFILE) |
112 | @rm -f $(OBJDIR)/pacbox.* $(DEPFILE) | ||
113 | 106 | ||
114 | -include $(DEPFILE) | 107 | -include $(DEPFILE) |
115 | 108 | ||
diff --git a/apps/plugins/rockboy/Makefile b/apps/plugins/rockboy/Makefile index 275d2ffd9b..e4c62666fb 100644 --- a/apps/plugins/rockboy/Makefile +++ b/apps/plugins/rockboy/Makefile | |||
@@ -47,13 +47,11 @@ all: $(OUTPUT) | |||
47 | 47 | ||
48 | ifndef SIMVER | 48 | ifndef SIMVER |
49 | $(OBJDIR)/rockboy.elf: $(OBJS) $(LINKFILE) | 49 | $(OBJDIR)/rockboy.elf: $(OBJS) $(LINKFILE) |
50 | @echo "LD $(notdir $@)" | 50 | $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -O2 -nostdlib -o $@ $(OBJS) -L$(BUILDDIR) -lplugin -fast -lgcc \ |
51 | @$(CC) $(GCCOPTS) -O2 -nostdlib -o $@ $(OBJS) -L$(BUILDDIR) -lplugin -fast -lgcc \ | ||
52 | -T$(LINKFILE) -Wl,-Map,$(OBJDIR)/rockboy.map | 51 | -T$(LINKFILE) -Wl,-Map,$(OBJDIR)/rockboy.map |
53 | 52 | ||
54 | $(OUTPUT): $(OBJDIR)/rockboy.elf | 53 | $(OUTPUT): $(OBJDIR)/rockboy.elf |
55 | @echo "OBJCOPY $(notdir $@)" | 54 | $(call PRINTS,OBJCOPY $(@F))$(OC) -O binary $< $@ |
56 | @$(OC) -O binary $< $@ | ||
57 | else | 55 | else |
58 | 56 | ||
59 | ifeq ($(SIMVER), x11) | 57 | ifeq ($(SIMVER), x11) |
@@ -61,8 +59,7 @@ ifeq ($(SIMVER), x11) | |||
61 | # This is the X11 simulator version | 59 | # This is the X11 simulator version |
62 | 60 | ||
63 | $(OUTPUT): $(OBJS) | 61 | $(OUTPUT): $(OBJS) |
64 | @echo "LD $(notdir $@)" | 62 | $(call PRINTS,LD $(@F))$(CC) $(CFLAGS) $(SHARED_FLAG) $(OBJS) -L$(BUILDDIR) -lplugin -o $@ |
65 | @$(CC) $(CFLAGS) $(SHARED_FLAG) $(OBJS) -L$(BUILDDIR) -lplugin -o $@ | ||
66 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) | 63 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) |
67 | # 'x' must be kept or you'll have "Win32 error 5" | 64 | # 'x' must be kept or you'll have "Win32 error 5" |
68 | # $ fgrep 5 /usr/include/w32api/winerror.h | head -1 | 65 | # $ fgrep 5 /usr/include/w32api/winerror.h | head -1 |
@@ -77,8 +74,7 @@ ifeq ($(SIMVER), sdl) | |||
77 | # This is the sdl simulator version | 74 | # This is the sdl simulator version |
78 | 75 | ||
79 | $(OUTPUT): $(OBJS) | 76 | $(OUTPUT): $(OBJS) |
80 | @echo "LD $(notdir $@)" | 77 | $(call PRINTS,LD $(@F))$(CC) $(CFLAGS) $(SHARED_FLAG) $(OBJS) -L$(BUILDDIR) -lplugin -o $@ |
81 | @$(CC) $(CFLAGS) $(SHARED_FLAG) $(OBJS) -L$(BUILDDIR) -lplugin -o $@ | ||
82 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) | 78 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) |
83 | # 'x' must be kept or you'll have "Win32 error 5" | 79 | # 'x' must be kept or you'll have "Win32 error 5" |
84 | # $ fgrep 5 /usr/include/w32api/winerror.h | head -1 | 80 | # $ fgrep 5 /usr/include/w32api/winerror.h | head -1 |
@@ -94,9 +90,8 @@ DLLTOOLFLAGS = --export-all | |||
94 | DLLWRAPFLAGS = -s --entry _DllMain@12 --target=i386-mingw32 -mno-cygwin | 90 | DLLWRAPFLAGS = -s --entry _DllMain@12 --target=i386-mingw32 -mno-cygwin |
95 | 91 | ||
96 | $(OUTPUT): $(OBJS) | 92 | $(OUTPUT): $(OBJS) |
97 | @echo "DLL $(notdir $@)" | 93 | $(call PRINTS,DLL $(@F))$(DLLTOOL) $(DLLTOOLFLAGS) -z $(OBJDIR)/$*.def $(OBJS) |
98 | @$(DLLTOOL) $(DLLTOOLFLAGS) -z $(OBJDIR)/$*.def $(OBJS) | 94 | $(SILENT)$(DLLWRAP) $(DLLWRAPFLAGS) --def $(OBJDIR)/$*.def $(OBJS) \ |
99 | @$(DLLWRAP) $(DLLWRAPFLAGS) --def $(OBJDIR)/$*.def $(OBJS) \ | ||
100 | $(BUILDDIR)/libplugin.a -o $@ | 95 | $(BUILDDIR)/libplugin.a -o $@ |
101 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) | 96 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) |
102 | # 'x' must be kept or you'll have "Win32 error 5" | 97 | # 'x' must be kept or you'll have "Win32 error 5" |
@@ -115,14 +110,12 @@ include $(TOOLSDIR)/make.inc | |||
115 | # MEMORYSIZE should be passed on to this makefile with the chosen memory size | 110 | # MEMORYSIZE should be passed on to this makefile with the chosen memory size |
116 | # given in number of MB | 111 | # given in number of MB |
117 | $(LINKFILE): $(LDS) | 112 | $(LINKFILE): $(LDS) |
118 | @echo "build $(notdir $@)" | 113 | $(call PRINTS,build $(@F))cat $< | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) $(TARGET) $(DEFINES) \ |
119 | @cat $< | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) $(TARGET) $(DEFINES) \ | ||
120 | -E -P - >$@ | 114 | -E -P - >$@ |
121 | 115 | ||
122 | clean: | 116 | clean: |
123 | @echo "cleaning rockboy" | 117 | $(call PRINTS,cleaning rockboy)rm -rf $(OBJDIR)/rockboy |
124 | @rm -rf $(OBJDIR)/rockboy | 118 | $(SILENT)rm -f $(OBJDIR)/rockboy.* $(DEPFILE) |
125 | @rm -f $(OBJDIR)/rockboy.* $(DEPFILE) | ||
126 | 119 | ||
127 | -include $(DEPFILE) | 120 | -include $(DEPFILE) |
128 | 121 | ||
diff --git a/apps/plugins/searchengine/Makefile b/apps/plugins/searchengine/Makefile index beadac7ea1..1c71c9b30d 100644 --- a/apps/plugins/searchengine/Makefile +++ b/apps/plugins/searchengine/Makefile | |||
@@ -31,13 +31,11 @@ all: $(OUTPUT) | |||
31 | 31 | ||
32 | ifndef SIMVER | 32 | ifndef SIMVER |
33 | $(OBJDIR)/searchengine.elf: $(OBJS) $(LINKFILE) | 33 | $(OBJDIR)/searchengine.elf: $(OBJS) $(LINKFILE) |
34 | @echo "LD $(notdir $@)" | 34 | $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -O -nostdlib -o $@ $(OBJS) -L$(BUILDDIR) -lplugin -lgcc \ |
35 | @$(CC) $(GCCOPTS) -O -nostdlib -o $@ $(OBJS) -L$(BUILDDIR) -lplugin -lgcc \ | ||
36 | -T$(LINKFILE) -Wl,-Map,$(OBJDIR)/searchengine.map | 35 | -T$(LINKFILE) -Wl,-Map,$(OBJDIR)/searchengine.map |
37 | 36 | ||
38 | $(OUTPUT): $(OBJDIR)/searchengine.elf | 37 | $(OUTPUT): $(OBJDIR)/searchengine.elf |
39 | @echo "OBJCOPY $(notdir $@)" | 38 | $(call PRINTS,OBJCOPY $(@F))$(OC) -O binary $< $@ |
40 | @$(OC) -O binary $< $@ | ||
41 | else | 39 | else |
42 | 40 | ||
43 | ifeq ($(SIMVER), x11) | 41 | ifeq ($(SIMVER), x11) |
@@ -45,8 +43,7 @@ ifeq ($(SIMVER), x11) | |||
45 | # This is the X11 simulator version | 43 | # This is the X11 simulator version |
46 | 44 | ||
47 | $(OUTPUT): $(OBJS) | 45 | $(OUTPUT): $(OBJS) |
48 | @echo "LD $(notdir $@)" | 46 | $(call PRINTS,LD $(@F))$(CC) $(CFLAGS) $(SHARED_FLAG) $(OBJS) -L$(BUILDDIR) -lplugin -o $@ |
49 | @$(CC) $(CFLAGS) $(SHARED_FLAG) $(OBJS) -L$(BUILDDIR) -lplugin -o $@ | ||
50 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) | 47 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) |
51 | # 'x' must be kept or you'll have "Win32 error 5" | 48 | # 'x' must be kept or you'll have "Win32 error 5" |
52 | # $ fgrep 5 /usr/include/w32api/winerror.h | head -1 | 49 | # $ fgrep 5 /usr/include/w32api/winerror.h | head -1 |
@@ -61,8 +58,7 @@ ifeq ($(SIMVER), sdl) | |||
61 | # This is the SDL simulator version | 58 | # This is the SDL simulator version |
62 | 59 | ||
63 | $(OUTPUT): $(OBJS) | 60 | $(OUTPUT): $(OBJS) |
64 | @echo "LD $(notdir $@)" | 61 | $(call PRINTS,LD $(@F))$(CC) $(CFLAGS) $(SHARED_FLAG) $(OBJS) -L$(BUILDDIR) -lplugin -o $@ |
65 | @$(CC) $(CFLAGS) $(SHARED_FLAG) $(OBJS) -L$(BUILDDIR) -lplugin -o $@ | ||
66 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) | 62 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) |
67 | # 'x' must be kept or you'll have "Win32 error 5" | 63 | # 'x' must be kept or you'll have "Win32 error 5" |
68 | # $ fgrep 5 /usr/include/w32api/winerror.h | head -1 | 64 | # $ fgrep 5 /usr/include/w32api/winerror.h | head -1 |
@@ -78,9 +74,8 @@ DLLTOOLFLAGS = --export-all | |||
78 | DLLWRAPFLAGS = -s --entry _DllMain@12 --target=i386-mingw32 -mno-cygwin | 74 | DLLWRAPFLAGS = -s --entry _DllMain@12 --target=i386-mingw32 -mno-cygwin |
79 | 75 | ||
80 | $(OUTPUT): $(OBJS) | 76 | $(OUTPUT): $(OBJS) |
81 | @echo "DLL $(notdir $@)" | 77 | $(call PRINTS,DLL $(@F))$(DLLTOOL) $(DLLTOOLFLAGS) -z $(OBJDIR)/$*.def $(OBJS) |
82 | @$(DLLTOOL) $(DLLTOOLFLAGS) -z $(OBJDIR)/$*.def $(OBJS) | 78 | $(SILENT)$(DLLWRAP) $(DLLWRAPFLAGS) --def $(OBJDIR)/$*.def $(OBJS) \ |
83 | @$(DLLWRAP) $(DLLWRAPFLAGS) --def $(OBJDIR)/$*.def $(OBJS) \ | ||
84 | $(BUILDDIR)/libplugin.a -o $@ | 79 | $(BUILDDIR)/libplugin.a -o $@ |
85 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) | 80 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) |
86 | # 'x' must be kept or you'll have "Win32 error 5" | 81 | # 'x' must be kept or you'll have "Win32 error 5" |
@@ -99,14 +94,12 @@ include $(TOOLSDIR)/make.inc | |||
99 | # MEMORYSIZE should be passed on to this makefile with the chosen memory size | 94 | # MEMORYSIZE should be passed on to this makefile with the chosen memory size |
100 | # given in number of MB | 95 | # given in number of MB |
101 | $(LINKFILE): $(LDS) | 96 | $(LINKFILE): $(LDS) |
102 | @echo "build $(notdir $@)" | 97 | $(call PRINTS,build $(@F))cat $< | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) $(TARGET) \ |
103 | @cat $< | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) $(TARGET) \ | ||
104 | $(DEFINES) -E -P - >$@ | 98 | $(DEFINES) -E -P - >$@ |
105 | 99 | ||
106 | clean: | 100 | clean: |
107 | @echo "cleaning searchengine" | 101 | $(call PRINTS,cleaning searchengine)rm -rf $(OBJDIR)/searchengine |
108 | @rm -rf $(OBJDIR)/searchengine | 102 | $(SILENT)rm -f $(OBJDIR)/searchengine.* $(DEPFILE) |
109 | @rm -f $(OBJDIR)/searchengine.* $(DEPFILE) | ||
110 | 103 | ||
111 | -include $(DEPFILE) | 104 | -include $(DEPFILE) |
112 | 105 | ||
diff --git a/apps/plugins/sudoku/Makefile b/apps/plugins/sudoku/Makefile index 7093de93c0..debd9fecc2 100644 --- a/apps/plugins/sudoku/Makefile +++ b/apps/plugins/sudoku/Makefile | |||
@@ -38,13 +38,11 @@ all: $(OUTPUT) | |||
38 | 38 | ||
39 | ifndef SIMVER | 39 | ifndef SIMVER |
40 | $(OBJDIR)/sudoku.elf: $(OBJS) $(LINKFILE) $(BITMAPLIBS) | 40 | $(OBJDIR)/sudoku.elf: $(OBJS) $(LINKFILE) $(BITMAPLIBS) |
41 | @echo "LD $(notdir $@)" | 41 | $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -O -nostdlib -o $@ $(OBJS) -L$(BUILDDIR) -lplugin -lgcc \ |
42 | @$(CC) $(GCCOPTS) -O -nostdlib -o $@ $(OBJS) -L$(BUILDDIR) -lplugin -lgcc \ | ||
43 | $(LINKBITMAPS) -T$(LINKFILE) -Wl,-Map,$(OBJDIR)/sudoku.map | 42 | $(LINKBITMAPS) -T$(LINKFILE) -Wl,-Map,$(OBJDIR)/sudoku.map |
44 | 43 | ||
45 | $(OUTPUT): $(OBJDIR)/sudoku.elf | 44 | $(OUTPUT): $(OBJDIR)/sudoku.elf |
46 | @echo "OBJCOPY $(notdir $@)" | 45 | $(call PRINTS,OBJCOPY $(@F))$(OC) -O binary $< $@ |
47 | @$(OC) -O binary $< $@ | ||
48 | else | 46 | else |
49 | 47 | ||
50 | ifeq ($(SIMVER), x11) | 48 | ifeq ($(SIMVER), x11) |
@@ -52,8 +50,7 @@ ifeq ($(SIMVER), x11) | |||
52 | # This is the X11 simulator version | 50 | # This is the X11 simulator version |
53 | 51 | ||
54 | $(OUTPUT): $(OBJS) | 52 | $(OUTPUT): $(OBJS) |
55 | @echo "LD $(notdir $@)" | 53 | $(call PRINTS,LD $(@F))$(CC) $(CFLAGS) $(SHARED_FLAG) $(OBJS) -L$(BUILDDIR) -lplugin $(LINKBITMAPS) -o $@ |
56 | @$(CC) $(CFLAGS) $(SHARED_FLAG) $(OBJS) -L$(BUILDDIR) -lplugin $(LINKBITMAPS) -o $@ | ||
57 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) | 54 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) |
58 | # 'x' must be kept or you'll have "Win32 error 5" | 55 | # 'x' must be kept or you'll have "Win32 error 5" |
59 | # $ fgrep 5 /usr/include/w32api/winerror.h | head -1 | 56 | # $ fgrep 5 /usr/include/w32api/winerror.h | head -1 |
@@ -68,8 +65,7 @@ ifeq ($(SIMVER), sdl) | |||
68 | # This is the SDL simulator version | 65 | # This is the SDL simulator version |
69 | 66 | ||
70 | $(OUTPUT): $(OBJS) | 67 | $(OUTPUT): $(OBJS) |
71 | @echo "LD $(notdir $@)" | 68 | $(call PRINTS,LD $(@F))$(CC) $(CFLAGS) $(SHARED_FLAG) $(OBJS) -L$(BUILDDIR) -lplugin $(LINKBITMAPS) -o $@ |
72 | @$(CC) $(CFLAGS) $(SHARED_FLAG) $(OBJS) -L$(BUILDDIR) -lplugin $(LINKBITMAPS) -o $@ | ||
73 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) | 69 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) |
74 | # 'x' must be kept or you'll have "Win32 error 5" | 70 | # 'x' must be kept or you'll have "Win32 error 5" |
75 | # $ fgrep 5 /usr/include/w32api/winerror.h | head -1 | 71 | # $ fgrep 5 /usr/include/w32api/winerror.h | head -1 |
@@ -85,9 +81,8 @@ DLLTOOLFLAGS = --export-all | |||
85 | DLLWRAPFLAGS = -s --entry _DllMain@12 --target=i386-mingw32 -mno-cygwin | 81 | DLLWRAPFLAGS = -s --entry _DllMain@12 --target=i386-mingw32 -mno-cygwin |
86 | 82 | ||
87 | $(OUTPUT): $(OBJS) | 83 | $(OUTPUT): $(OBJS) |
88 | @echo "DLL $(notdir $@)" | 84 | $(call PRINTS,DLL $(@F))$(DLLTOOL) $(DLLTOOLFLAGS) -z $(OBJDIR)/$*.def $(OBJS) |
89 | @$(DLLTOOL) $(DLLTOOLFLAGS) -z $(OBJDIR)/$*.def $(OBJS) | 85 | $(SILENT)$(DLLWRAP) $(DLLWRAPFLAGS) --def $(OBJDIR)/$*.def $(OBJS) \ |
90 | @$(DLLWRAP) $(DLLWRAPFLAGS) --def $(OBJDIR)/$*.def $(OBJS) \ | ||
91 | $(BUILDDIR)/libplugin.a $(BITMAPLIBS) -o $@ | 86 | $(BUILDDIR)/libplugin.a $(BITMAPLIBS) -o $@ |
92 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) | 87 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) |
93 | # 'x' must be kept or you'll have "Win32 error 5" | 88 | # 'x' must be kept or you'll have "Win32 error 5" |
@@ -106,13 +101,11 @@ include $(TOOLSDIR)/make.inc | |||
106 | # MEMORYSIZE should be passed on to this makefile with the chosen memory size | 101 | # MEMORYSIZE should be passed on to this makefile with the chosen memory size |
107 | # given in number of MB | 102 | # given in number of MB |
108 | $(LINKFILE): $(LDS) | 103 | $(LINKFILE): $(LDS) |
109 | @echo "build $(notdir $@)" | 104 | $(call PRINTS,build $(@F))cat $< | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) $(TARGET) \ |
110 | @cat $< | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) $(TARGET) \ | ||
111 | $(DEFINES) -E -P - >$@ | 105 | $(DEFINES) -E -P - >$@ |
112 | 106 | ||
113 | clean: | 107 | clean: |
114 | @echo "cleaning sudoku" | 108 | $(call PRINTS,cleaning sudoku)rm -rf $(OBJDIR)/sudoku |
115 | @rm -rf $(OBJDIR)/sudoku | 109 | $(SILENT)rm -f $(OBJDIR)/sudoku.* $(DEPFILE) |
116 | @rm -f $(OBJDIR)/sudoku.* $(DEPFILE) | ||
117 | 110 | ||
118 | -include $(DEPFILE) | 111 | -include $(DEPFILE) |
diff --git a/apps/plugins/zxbox/Makefile b/apps/plugins/zxbox/Makefile index 8f26ce6f40..3ca5d300f1 100644 --- a/apps/plugins/zxbox/Makefile +++ b/apps/plugins/zxbox/Makefile | |||
@@ -43,13 +43,11 @@ all: $(OUTPUT) | |||
43 | 43 | ||
44 | ifndef SIMVER | 44 | ifndef SIMVER |
45 | $(OBJDIR)/zxbox.elf: $(OBJS) $(LINKFILE) | 45 | $(OBJDIR)/zxbox.elf: $(OBJS) $(LINKFILE) |
46 | @echo "LD $(notdir $@)" | 46 | $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -O -nostdlib -o $@ $(OBJS) -L$(BUILDDIR) -lplugin -lgcc \ |
47 | @$(CC) $(GCCOPTS) -O -nostdlib -o $@ $(OBJS) -L$(BUILDDIR) -lplugin -lgcc \ | ||
48 | -T$(LINKFILE) -Wl,-Map,$(OBJDIR)/zxbox.map | 47 | -T$(LINKFILE) -Wl,-Map,$(OBJDIR)/zxbox.map |
49 | 48 | ||
50 | $(OUTPUT): $(OBJDIR)/zxbox.elf | 49 | $(OUTPUT): $(OBJDIR)/zxbox.elf |
51 | @echo "OBJCOPY $(notdir $@)" | 50 | $(call PRINTS,OBJCOPY $(@F))$(OC) -O binary $< $@ |
52 | @$(OC) -O binary $< $@ | ||
53 | else | 51 | else |
54 | 52 | ||
55 | ifeq ($(SIMVER), sdl) | 53 | ifeq ($(SIMVER), sdl) |
@@ -57,8 +55,7 @@ ifeq ($(SIMVER), sdl) | |||
57 | # This is the SDL simulator version | 55 | # This is the SDL simulator version |
58 | 56 | ||
59 | $(OUTPUT): $(OBJS) | 57 | $(OUTPUT): $(OBJS) |
60 | @echo "LD $(notdir $@)" | 58 | $(call PRINTS,LD $(@F))$(CC) $(CFLAGS) $(SHARED_FLAG) $(OBJS) -L$(BUILDDIR) -lplugin -o $@ |
61 | @$(CC) $(CFLAGS) $(SHARED_FLAG) $(OBJS) -L$(BUILDDIR) -lplugin -o $@ | ||
62 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) | 59 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) |
63 | # 'x' must be kept or you'll have "Win32 error 5" | 60 | # 'x' must be kept or you'll have "Win32 error 5" |
64 | # $ fgrep 5 /usr/include/w32api/winerror.h | head -1 | 61 | # $ fgrep 5 /usr/include/w32api/winerror.h | head -1 |
@@ -76,14 +73,12 @@ include $(TOOLSDIR)/make.inc | |||
76 | # MEMORYSIZE should be passed on to this makefile with the chosen memory size | 73 | # MEMORYSIZE should be passed on to this makefile with the chosen memory size |
77 | # given in number of MB | 74 | # given in number of MB |
78 | $(LINKFILE): $(LDS) | 75 | $(LINKFILE): $(LDS) |
79 | @echo "build $(notdir $@)" | 76 | $(call PRINTS,build $(@F))cat $< | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) $(TARGET) \ |
80 | @cat $< | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) $(TARGET) \ | ||
81 | $(DEFINES) -E -P - >$@ | 77 | $(DEFINES) -E -P - >$@ |
82 | 78 | ||
83 | clean: | 79 | clean: |
84 | @echo "cleaning zxbox" | 80 | $(call PRINTS,cleaning zxbox)rm -rf $(OBJDIR)/zxbox |
85 | @rm -rf $(OBJDIR)/zxbox | 81 | $(SILENT)rm -f $(OBJDIR)/zxbox.* $(DEPFILE) |
86 | @rm -f $(OBJDIR)/zxbox.* $(DEPFILE) | ||
87 | 82 | ||
88 | -include $(DEPFILE) | 83 | -include $(DEPFILE) |
89 | 84 | ||