Changeset fcd7053 in mainline for uspace/lib/libc/Makefile

Timestamp:

2009-02-12T20:11:25Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

fa024ce

Parents:

84266669

Message:

cleanup configuration
code cleanup

File:

• uspace/lib/libc/Makefile (modified) (4 diffs)

uspace/lib/libc/Makefile

@@ -30 +30 @@
 #
 
--include ../../../Makefile.config
-
 LIBC_PREFIX = $(shell pwd)
 SOFTINT_PREFIX = ../softint
+
+ifndef CROSS_PREFIX
+        CROSS_PREFIX = /usr/local
+endif
+
 
 ## Setup toolchain
@@ -40 +43 @@
 include $(LIBC_PREFIX)/Makefile.toolchain
 
+
 ## Sources
 #
-
 
 GENERIC_SOURCES = \
@@ -88 +91 @@
 
 ARCH_SOURCES += \
-        arch/$(ARCH)/src/entry.s \
-        arch/$(ARCH)/src/thread_entry.s
+        arch/$(UARCH)/src/entry.s \
+        arch/$(UARCH)/src/thread_entry.s
 
 GENERIC_OBJECTS := $(addsuffix .o,$(basename $(GENERIC_SOURCES)))
@@ -97 +100 @@
 .PHONY: all clean depend kerninc
 
-all: kerninc libc.a arch/$(ARCH)/_link.ld
+all: kerninc libc.a arch/$(UARCH)/_link.ld
 
 kerninc:
         ln -sfn ../../../../kernel/generic/include include/kernel
         ln -sfn kernel/arch include/arch
-        ln -sfn ../arch/$(ARCH)/include include/libarch
+        ln -sfn ../arch/$(UARCH)/include include/libarch
 
 -include Makefile.depend
 
 clean:
-        -rm -f include/kernel include/arch include/libarch libc.a arch/$(ARCH)/_link.ld Makefile.depend
-        find generic/ arch/$(ARCH)/ malloc -name '*.o' -follow -exec rm \{\} \;
+        -rm -f include/kernel include/arch include/libarch libc.a arch/$(UARCH)/_link.ld Makefile.depend
+        find generic/ arch/$(UARCH)/ malloc -name '*.o' -follow -exec rm \{\} \;
 
 depend: kerninc
-        -makedepend -f - -- $(DEFS) $(CFLAGS) -- $(ARCH_SOURCES) $(GENERIC_SOURCES) > Makefile.depend 2> /dev/null
+        -makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(ARCH_SOURCES) $(GENERIC_SOURCES) > Makefile.depend 2> /dev/null
 
 libc.a: depend $(ARCH_OBJECTS) $(GENERIC_OBJECTS)
         $(AR) rc libc.a $(LIBS) $(ARCH_OBJECTS) $(GENERIC_OBJECTS)
 
-arch/$(ARCH)/_link.ld: arch/$(ARCH)/_link.ld.in
+arch/$(UARCH)/_link.ld: arch/$(UARCH)/_link.ld.in
         $(CC) $(DEFS) $(CFLAGS) -DLIBC_PREFIX=$(LIBC_PREFIX) -E -x c $< | grep -v "^\#" > $@