Changes in uspace/srv/console/Makefile [cc1f8d4:e035612] in mainline

File:

• uspace/srv/console/Makefile (modified) (2 diffs)

uspace/srv/console/Makefile

@@ -1 +1 @@
 #
 # Copyright (c) 2005 Martin Decky
-# Copyright (c) 2007 Jakub Jermar
 # All rights reserved.
 #
@@ -28 +27 @@
 #
 
-include Makefile.common
+## Setup toolchain
+#
 
-.PHONY: all clean
+LIBC_PREFIX = ../../lib/libc
+SOFTINT_PREFIX = ../../lib/softint
 
-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
+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
 
 clean:
-        rm -f $(DEPEND) $(DEPEND_PREV) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm
-        find . -name '*.o' -follow -exec rm \{\} \;
+        -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) $< $@