diff options
author | Björn Stenberg <bjorn@haxx.se> | 2002-07-15 13:19:00 +0000 |
---|---|---|
committer | Björn Stenberg <bjorn@haxx.se> | 2002-07-15 13:19:00 +0000 |
commit | 6d55a71e0e69926564be060cea61266739b372f4 (patch) | |
tree | 75653fffecb6524dfdb2cfa09767a9a09a379934 | |
parent | 803f47b8afb1fb48f345f447ef3144fac042b8f1 (diff) | |
download | rockbox-6d55a71e0e69926564be060cea61266739b372f4.tar.gz rockbox-6d55a71e0e69926564be060cea61266739b372f4.zip |
Added build timestamp in version string
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1349 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/Makefile | 2 | ||||
-rwxr-xr-x | tools/configure | 7 | ||||
-rw-r--r-- | uisimulator/x11/Makefile | 10 |
3 files changed, 10 insertions, 9 deletions
diff --git a/apps/Makefile b/apps/Makefile index b2880fb7ec..3629813595 100644 --- a/apps/Makefile +++ b/apps/Makefile | |||
@@ -25,7 +25,7 @@ TARGET = -DARCHOS_PLAYER_OLD=1 | |||
25 | # store output files in this directory: | 25 | # store output files in this directory: |
26 | OBJDIR = . | 26 | OBJDIR = . |
27 | 27 | ||
28 | CFLAGS = -O -W -Wall -m1 -nostdlib -Wstrict-prototypes -fomit-frame-pointer -fschedule-insns $(INCLUDES) $(TARGET) $(DEFINES) | 28 | CFLAGS = -O -W -Wall -m1 -nostdlib -Wstrict-prototypes -fomit-frame-pointer -fschedule-insns $(INCLUDES) $(TARGET) $(DEFINES) -DAPPSVERSION=\"$(VERSION)\" |
29 | AFLAGS += -small -relax | 29 | AFLAGS += -small -relax |
30 | 30 | ||
31 | ifdef DEBUG | 31 | ifdef DEBUG |
diff --git a/tools/configure b/tools/configure index 0464150d31..b83a34791d 100755 --- a/tools/configure +++ b/tools/configure | |||
@@ -53,13 +53,14 @@ TARGET=@TARGET@ | |||
53 | DISPLAY=@DISPLAY@ | 53 | DISPLAY=@DISPLAY@ |
54 | KEYPAD=@KEYPAD@ | 54 | KEYPAD=@KEYPAD@ |
55 | THISDIR="@PWD@" | 55 | THISDIR="@PWD@" |
56 | VERSION=\$(shell date +%y%m%d-%H%M) | ||
56 | 57 | ||
57 | .PHONE: | 58 | .PHONE: |
58 | 59 | ||
59 | all: sim | 60 | all: sim |
60 | 61 | ||
61 | sim: | 62 | sim: |
62 | make -C \$(SIMDIR) DISPLAY=\$(DISPLAY) KEYPAD=\$(KEYPAD) OBJDIR=\$(THISDIR) | 63 | make -C \$(SIMDIR) DISPLAY=\$(DISPLAY) KEYPAD=\$(KEYPAD) OBJDIR=\$(THISDIR) VERSION=\$(VERSION) |
63 | 64 | ||
64 | clean-sim: | 65 | clean-sim: |
65 | make -C \$(SIMDIR) DISPLAY=\$(DISPLAY) KEYPAD=\$(KEYPAD) OBJDIR=\$(THISDIR) clean | 66 | make -C \$(SIMDIR) DISPLAY=\$(DISPLAY) KEYPAD=\$(KEYPAD) OBJDIR=\$(THISDIR) clean |
@@ -150,7 +151,6 @@ if [ -z "$target" ]; then | |||
150 | esac | 151 | esac |
151 | fi | 152 | fi |
152 | 153 | ||
153 | |||
154 | if [ -z "$debug" ]; then | 154 | if [ -z "$debug" ]; then |
155 | ################################################################## | 155 | ################################################################## |
156 | # Figure out debug on/off | 156 | # Figure out debug on/off |
@@ -235,6 +235,7 @@ APPSDIR=@APPSDIR@ | |||
235 | DEBUG=@DEBUG@ | 235 | DEBUG=@DEBUG@ |
236 | TARGET=@TARGET@ | 236 | TARGET=@TARGET@ |
237 | THISDIR="@PWD@" | 237 | THISDIR="@PWD@" |
238 | VERSION=\$(shell date +%y%m%d-%H%M) | ||
238 | 239 | ||
239 | .PHONE: firmware apps | 240 | .PHONE: firmware apps |
240 | 241 | ||
@@ -244,7 +245,7 @@ firmware: | |||
244 | make -C \$(FIRMDIR) TARGET=\$(TARGET) \$(DEBUG) OBJDIR=\$(THISDIR) | 245 | make -C \$(FIRMDIR) TARGET=\$(TARGET) \$(DEBUG) OBJDIR=\$(THISDIR) |
245 | 246 | ||
246 | apps: | 247 | apps: |
247 | make -C \$(APPSDIR) TARGET=\$(TARGET) \$(DEBUG) OBJDIR=\$(THISDIR) | 248 | make -C \$(APPSDIR) TARGET=\$(TARGET) \$(DEBUG) OBJDIR=\$(THISDIR) VERSION=\$(VERSION) |
248 | 249 | ||
249 | clean-firmware: | 250 | clean-firmware: |
250 | make -C \$(FIRMDIR) TARGET=\$(TARGET) OBJDIR=\$(THISDIR) clean | 251 | make -C \$(FIRMDIR) TARGET=\$(TARGET) OBJDIR=\$(THISDIR) clean |
diff --git a/uisimulator/x11/Makefile b/uisimulator/x11/Makefile index 73d46bf9a4..0c82b2d0a3 100644 --- a/uisimulator/x11/Makefile +++ b/uisimulator/x11/Makefile | |||
@@ -42,7 +42,7 @@ DISPLAY = -DHAVE_LCD_BITMAP | |||
42 | KEYPAD = -DHAVE_RECORDER_KEYPAD | 42 | KEYPAD = -DHAVE_RECORDER_KEYPAD |
43 | 43 | ||
44 | DEFINES = -DHAVE_CONFIG_H -DGETTIMEOFDAY_TWO_ARGS -DSIMULATOR \ | 44 | DEFINES = -DHAVE_CONFIG_H -DGETTIMEOFDAY_TWO_ARGS -DSIMULATOR \ |
45 | $(KEYPAD) $(DISPLAY) | 45 | $(KEYPAD) $(DISPLAY) |
46 | 46 | ||
47 | LDFLAGS = -lX11 -lm -lXt -lXmu -lnsl | 47 | LDFLAGS = -lX11 -lm -lXt -lXmu -lnsl |
48 | 48 | ||
@@ -71,7 +71,7 @@ endif | |||
71 | 71 | ||
72 | CFLAGS = $(DEBUG) $(DEFINES) $(INCLUDES) -W -Wall | 72 | CFLAGS = $(DEBUG) $(DEFINES) $(INCLUDES) -W -Wall |
73 | 73 | ||
74 | APPCFLAGS = $(DEBUG) $(DEFINES) $(APPINCLUDES) -W -Wall | 74 | APPCFLAGS = $(DEBUG) $(DEFINES) -DAPPSVERSION=\"$(VERSION)\" $(APPINCLUDES) -W -Wall |
75 | 75 | ||
76 | FIRMSRCS = chartables.c lcd.c sprintf.c id3.c debug.c usb.c mpeg.c | 76 | FIRMSRCS = chartables.c lcd.c sprintf.c id3.c debug.c usb.c mpeg.c |
77 | 77 | ||
@@ -198,7 +198,7 @@ $(OBJDIR)/showtext.o: $(APPDIR)/showtext.c | |||
198 | $(CC) $(APPCFLAGS) -c $< -o $@ | 198 | $(CC) $(APPCFLAGS) -c $< -o $@ |
199 | 199 | ||
200 | $(OBJDIR)/lcd.o: $(DRIVERS)/lcd.c | 200 | $(OBJDIR)/lcd.o: $(DRIVERS)/lcd.c |
201 | $(CC) $(APPCFLAGS) -c $< -o $@ | 201 | $(CC) $(CFLAGS) -c $< -o $@ |
202 | 202 | ||
203 | $(OBJDIR)/chartables.o: $(FIRMWAREDIR)/chartables.c | 203 | $(OBJDIR)/chartables.o: $(FIRMWAREDIR)/chartables.c |
204 | $(CC) $(APPCFLAGS) -c $< -o $@ | 204 | $(CC) $(APPCFLAGS) -c $< -o $@ |
@@ -216,10 +216,10 @@ $(OBJDIR)/mpeg.o: $(FIRMWAREDIR)/mpeg.c | |||
216 | $(CC) $(CFLAGS) -c $< -o $@ | 216 | $(CC) $(CFLAGS) -c $< -o $@ |
217 | 217 | ||
218 | $(OBJDIR)/sprintf.o: $(COMMON)/sprintf.c | 218 | $(OBJDIR)/sprintf.o: $(COMMON)/sprintf.c |
219 | $(CC) $(APPCFLAGS) -c $< -o $@ | 219 | $(CC) $(CFLAGS) -c $< -o $@ |
220 | 220 | ||
221 | $(OBJDIR)/usb.o: $(FIRMWAREDIR)/usb.c | 221 | $(OBJDIR)/usb.o: $(FIRMWAREDIR)/usb.c |
222 | $(CC) $(APPCFLAGS) -c $< -o $@ | 222 | $(CC) $(CFLAGS) -c $< -o $@ |
223 | 223 | ||
224 | 224 | ||
225 | # these ones are simulator-specific | 225 | # these ones are simulator-specific |