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

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 (modified) (2 diffs)

uspace/lib/softfloat/Makefile

@@ -1 +1 @@
 #
 # Copyright (c) 2005 Martin Decky
+# Copyright (c) 2007 Jakub Jermar
 # All rights reserved.
 #
@@ -27 +28 @@
 #
 
-## Common compiler flags
-#
+include Makefile.common
 
-LIBC_PREFIX = ../libc
+.PHONY: all clean
 
-## Setup toolchain
-#
-
-include $(LIBC_PREFIX)/Makefile.toolchain
-
-CFLAGS += -Iinclude -Iarch/$(UARCH)/include/
-
-## Sources
-#
-
-GENERIC_SOURCES = \
-        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
-
-ARCH_SOURCES =
-
-GENERIC_OBJECTS := $(addsuffix .o,$(basename $(GENERIC_SOURCES)))
-
-.PHONY: all clean depend
-
-all: libsoftfloat.a
-
--include Makefile.depend
+all: $(LIBC_PREFIX)/../../../Makefile.config $(LIBC_PREFIX)/../../../config.h $(LIBC_PREFIX)/../../../config.defs $(LIBC_PREFIX)/libc.a
+        -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV)
+        $(MAKE) -f Makefile.build PRECHECK=$(PRECHECK)
 
 clean:
-        -rm -f libsoftfloat.a Makefile.depend
-        find generic/ -name '*.o' -follow -exec rm \{\} \;
-
-depend:
-        -makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(GENERIC_SOURCES) > Makefile.depend 2> /dev/null
-
-libsoftfloat.a: depend $(ARCH_OBJECTS) $(GENERIC_OBJECTS)
-        $(AR) rc libsoftfloat.a $(ARCH_OBJECTS) $(GENERIC_OBJECTS)
-
-%.o: %.S
-        $(CC) $(DEFS) $(AFLAGS) $(CFLAGS) -D__ASM__ -c $< -o $@
-
-%.o: %.s
-        $(AS) $(AFLAGS) $< -o $@
-
-%.o: %.c
-        $(CC) $(DEFS) $(CFLAGS) -c $< -o $@
+        rm -f $(DEPEND) $(DEPEND_PREV) $(JOB) $(LIBSOFTFLOAT)
+        find . -name '*.o' -follow -exec rm \{\} \;