Changeset 5f70118 in mainline for uspace/srv/hid/console/Makefile.build

Timestamp:

2010-01-10T12:16:59Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

c77a64f

Parents:

309ede1 (diff), 1ac3a52 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• uspace/srv/hid/console/Makefile.build (moved) (moved from uspace/srv/console/Makefile ) (3 diffs)

uspace/srv/hid/console/Makefile.build

@@ -1 +1 @@
 #
 # Copyright (c) 2005 Martin Decky
+# Copyright (c) 2007 Jakub Jermar
 # All rights reserved.
 #
@@ -30 +31 @@
 #
 
-LIBC_PREFIX = ../../lib/libc
-SOFTINT_PREFIX = ../../lib/softint
-
+include Makefile.common
 include $(LIBC_PREFIX)/Makefile.toolchain
-
-CFLAGS += -I.
-
-LIBS = $(LIBC_PREFIX)/libc.a
 
 ## Sources
 #
 
-OUTPUT = console
-
-GENERIC_SOURCES = \
+SOURCES = \
         console.c \
         screenbuffer.c \
@@ -62 +55 @@
         gfx/anim_4.ppm
 
-GENERIC_OBJECTS := $(addsuffix .o,$(basename $(GENERIC_SOURCES))) \
-        $(addsuffix .o,$(basename $(IMAGES)))
+OBJECTS := $(addsuffix .o,$(basename $(SOURCES))) $(addsuffix .o,$(basename $(IMAGES)))
 
-OBJECTS := $(GENERIC_OBJECTS)
-
-.PHONY: all clean depend disasm
+.PHONY: all
 
 all: $(OUTPUT) $(OUTPUT).disasm
 
--include Makefile.depend
+-include $(DEPEND)
 
-clean:
-        -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend $(OBJECTS)
-
-depend:
-        $(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend
+$(OUTPUT).disasm: $(OUTPUT)
+        $(OBJDUMP) -d $< > $@
 
 $(OUTPUT): $(OBJECTS) $(LIBS)
         $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
 
-disasm: $(OUTPUT).disasm
-
-$(OUTPUT).disasm: $(OUTPUT)
-        $(OBJDUMP) -d $< > $@
-
-%.o: %.S
-        $(CC) $(DEFS) $(AFLAGS) $(CFLAGS) -D__ASM__ -c $< -o $@
-
-%.o: %.s
-        $(AS) $(AFLAGS) $< -o $@
-
-%.o: %.c
+%.o: %.c $(DEPEND)
         $(CC) $(DEFS) $(CFLAGS) -c $< -o $@
+ifeq ($(PRECHECK),y)
+        $(JOBFILE) $(JOB) $< $@ cc core $(DEFS) $(CFLAGS)
+endif
 
 %.o: %.ppm
         $(OBJCOPY) -I binary -O $(BFD_NAME) -B $(BFD_ARCH) $< $@
+
+$(DEPEND):
+        makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(SOURCES) > $@ 2> /dev/null
+        -[ -f $(DEPEND_PREV) ] && diff -q $(DEPEND_PREV) $@ && mv -f $(DEPEND_PREV) $@