Changeset cc1f8d4 in mainline for uspace/srv/console

Timestamp:

2009-10-20T16:08:08Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

50989793

Parents:

00413c5c

Message:

proper support for parallel building (this time really tested)
all ports except sparc64 (which should follow soon)

Location:

uspace/srv/console

Files:

• Makefile (modified) (2 diffs)
• Makefile.build (added)
• Makefile.common (added)
• console.c (modified) (2 diffs)
• keybuffer.c (modified) (1 diff)
• screenbuffer.c (modified) (1 diff)

uspace/srv/console/Makefile

@@ -1 +1 @@
 #
 # Copyright (c) 2005 Martin Decky
+# Copyright (c) 2007 Jakub Jermar
 # All rights reserved.
 #
@@ -27 +28 @@
 #
 
-## Setup toolchain
-#
+include Makefile.common
 
-LIBC_PREFIX = ../../lib/libc
-SOFTINT_PREFIX = ../../lib/softint
+.PHONY: all clean
 
-include $(LIBC_PREFIX)/Makefile.toolchain
-
-CFLAGS += -I.
-
-LIBS = $(LIBC_PREFIX)/libc.a
-
-## Sources
-#
-
-OUTPUT = console
-
-GENERIC_SOURCES = \
-        console.c \
-        screenbuffer.c \
-        keybuffer.c \
-        gcons.c
-
-IMAGES = \
-        gfx/helenos.ppm \
-        gfx/nameic.ppm \
-        gfx/cons_selected.ppm \
-        gfx/cons_idle.ppm \
-        gfx/cons_has_data.ppm \
-        gfx/cons_kernel.ppm \
-        gfx/anim_1.ppm \
-        gfx/anim_2.ppm \
-        gfx/anim_3.ppm \
-        gfx/anim_4.ppm
-
-GENERIC_OBJECTS := $(addsuffix .o,$(basename $(GENERIC_SOURCES))) \
-        $(addsuffix .o,$(basename $(IMAGES)))
-
-OBJECTS := $(GENERIC_OBJECTS)
-
-.PHONY: all clean depend
-
-all: $(OUTPUT) $(OUTPUT).disasm
-
--include Makefile.depend
+all: $(LIBC_PREFIX)/../../../Makefile.config $(LIBC_PREFIX)/../../../config.h $(LIBC_PREFIX)/../../../config.defs $(LIBS)
+        -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV)
+        $(MAKE) -f Makefile.build
 
 clean:
-        -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend $(OBJECTS)
-
-depend:
-        $(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend
-
-$(OUTPUT): $(OBJECTS) $(LIBS)
-        $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
-
-$(OUTPUT).disasm: $(OUTPUT)
-        $(OBJDUMP) -d $< > $@
-
-%.o: %.S
-        $(CC) $(DEFS) $(AFLAGS) $(CFLAGS) -D__ASM__ -c $< -o $@
-
-%.o: %.s
-        $(AS) $(AFLAGS) $< -o $@
-
-%.o: %.c
-        $(CC) $(DEFS) $(CFLAGS) -c $< -o $@
-
-%.o: %.ppm
-        $(OBJCOPY) -I binary -O $(BFD_NAME) -B $(BFD_ARCH) $< $@
+        rm -f $(DEPEND) $(DEPEND_PREV) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm
+        find . -name '*.o' -follow -exec rm \{\} \;

uspace/srv/console/console.c

@@ -40 +40 @@
 #include <ipc/services.h>
 #include <errno.h>
-#include <keybuffer.h>
 #include <ipc/console.h>
 #include <unistd.h>
@@ -55 +54 @@
 #include "console.h"
 #include "gcons.h"
+#include "keybuffer.h"
 #include "screenbuffer.h"
 

uspace/srv/console/keybuffer.c

@@ -35 +35 @@
  */
 
-#include <keybuffer.h>
 #include <futex.h>
+#include "keybuffer.h"
 
 atomic_t keybuffer_futex = FUTEX_INITIALIZER;

uspace/srv/console/screenbuffer.c

@@ -33 +33 @@
  */
 
-#include <screenbuffer.h>
 #include <io/style.h>
 #include <malloc.h>
 #include <unistd.h>
+#include "screenbuffer.h"
 
 /** Store one character to screenbuffer.