Changeset 985e26d2 in mainline for uspace/lib/softfloat/Makefile.build

Timestamp:

2010-01-07T19:06:59Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

8190e63

Parents:

743e17b (diff), eca2435 (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/lib/softfloat/Makefile.build (moved) (moved from uspace/srv/pci/Makefile ) (2 diffs)

uspace/lib/softfloat/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
 
-
-LIBS = libpci/libpci.a $(LIBC_PREFIX)/libc.a
+CFLAGS += -Iinclude -Iarch/$(UARCH)/include/
 
 ## Sources
 #
 
-OUTPUT = pci
 SOURCES = \
-        pci.c
+        generic/add.c \
+        generic/common.c \
+        generic/comparison.c \
+        generic/conversion.c \
+        generic/div.c \
+        generic/mul.c \
+        generic/other.c \
+        generic/softfloat.c \
+        generic/sub.c
 
 OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
 
-.PHONY: all clean depend disasm
+.PHONY: all
 
-all: $(OUTPUT) disasm
+all: $(LIBSOFTFLOAT)
 
--include Makefile.depend
+-include $(DEPEND)
 
-clean:
-        -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend $(OBJECTS)
-        $(MAKE) -C libpci clean
+$(LIBSOFTFLOAT): $(OBJECTS)
+        $(AR) rc $@ $(OBJECTS)
 
-depend:
-        $(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend
+%.o: %.c $(DEPEND)
+        $(CC) $(DEFS) $(CFLAGS) -c $< -o $@
+ifeq ($(PRECHECK),y)
+        $(JOBFILE) $(JOB) $< $@ cc core $(DEFS) $(CFLAGS)
+endif
 
-$(OUTPUT): $(OBJECTS) $(LIBS)
-        $(MAKE) -C libpci
-        $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
-
-disasm:
-        $(OBJDUMP) -d $(OUTPUT) >$(OUTPUT).disasm
-
-%.o: %.S
-        $(CC) $(DEFS) $(AFLAGS) $(CFLAGS) -D__ASM__ -c $< -o $@
-
-%.o: %.s
-        $(AS) $(AFLAGS) $< -o $@
-
-%.o: %.c
-        $(CC) $(DEFS) $(CFLAGS) -c $< -o $@
-
-libpci/libpci.a:
-        $(MAKE) -C libpci
+$(DEPEND):
+        makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(SOURCES) > $@ 2> /dev/null
+        -[ -f $(DEPEND_PREV) ] && diff -q $(DEPEND_PREV) $@ && mv -f $(DEPEND_PREV) $@