Changeset fcd7053 in mainline for uspace/app/init

Timestamp:

2009-02-12T20:11:25Z (17 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

fa024ce

Parents:

84266669

Message:

cleanup configuration
code cleanup

Location:

uspace/app/init

Files:

• Makefile (modified) (4 diffs)
• version.c (modified) (2 diffs)

uspace/app/init/Makefile

@@ -28 +28 @@
 
 include ../../../version
--include ../../../Makefile.config
 
 ## Setup toolchain
@@ -35 +34 @@
 LIBC_PREFIX = ../../lib/libc
 SOFTINT_PREFIX = ../../lib/softint
+
 include $(LIBC_PREFIX)/Makefile.toolchain
 
@@ -40 +40 @@
 
 LIBS = $(LIBC_PREFIX)/libc.a
-DEFS += -DRELEASE=\"$(RELEASE)\"
-
-ifdef REVISION
-        DEFS += "-DREVISION=\"$(REVISION)\""
-endif
-
-ifdef TIMESTAMP
-        DEFS += "-DTIMESTAMP=\"$(TIMESTAMP)\""
-endif
+DEFS += -DRELEASE=$(RELEASE)
 
 ## Sources
@@ -73 +65 @@
 
 $(OUTPUT): $(OBJECTS) $(LIBS)
-        $(LD) -T $(LIBC_PREFIX)/arch/$(ARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
+        $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
 
 disasm: $(OUTPUT).disasm

uspace/app/init/version.c

@@ -36 +36 @@
 #include <unistd.h>
 #include <stdio.h>
+#include <macros.h>
 #include "init.h"
 #include "version.h"
 
-char *release = RELEASE;
+char *release = STRING(RELEASE);
 
 #ifdef REVISION
-        char *revision = ", revision " REVISION;
+        char *revision = ", revision " STRING(REVISION);
 #else
         char *revision = "";
@@ -48 +49 @@
 
 #ifdef TIMESTAMP
-        char *timestamp = "\nBuilt on " TIMESTAMP;
+        char *timestamp = "\nBuilt on " STRING(TIMESTAMP);
 #else
         char *timestamp = "";