Changeset 2ca5f632 in mainline for uspace/lib/c/Makefile

Timestamp:

2011-04-30T16:45:06Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

7fb3f1c

Parents:

15b3761

Message:

Integrate arch/ part of rtld into core C library.

File:

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

uspace/lib/c/Makefile

@@ -34 +34 @@
 INCLUDE_ARCH = include/arch
 INCLUDE_LIBARCH = include/libarch
-INCLUDE_RTLDARCH = rtld/include/arch
 
 COMMON_MAKEFILE = $(ROOT_PATH)/Makefile.common
@@ -48 +47 @@
         $(LIBC_PREFIX)/arch/$(UARCH)/_link-dlexe.ld
 
-PRE_DEPEND = $(INCLUDE_KERNEL) $(INCLUDE_ARCH) $(INCLUDE_LIBARCH) $(INCLUDE_RTLDARCH) $(COMMON_HEADER_ARCH)
+PRE_DEPEND = $(INCLUDE_KERNEL) $(INCLUDE_ARCH) $(INCLUDE_LIBARCH) $(COMMON_HEADER_ARCH)
 EXTRA_OUTPUT = $(LINKER_SCRIPTS)
-EXTRA_CLEAN = $(INCLUDE_KERNEL) $(INCLUDE_ARCH) $(INCLUDE_LIBARCH) $(INCLUDE_RTLDARCH) $(COMMON_HEADER_ARCH) $(LINKER_SCRIPTS)
+EXTRA_CLEAN = $(INCLUDE_KERNEL) $(INCLUDE_ARCH) $(INCLUDE_LIBARCH) $(COMMON_HEADER_ARCH) $(LINKER_SCRIPTS)
 LIBRARY = libc
 SLIBRARY = libc.so.0.0
@@ -59 +58 @@
 -include $(CONFIG_MAKEFILE)
 -include arch/$(UARCH)/Makefile.inc
--include rtld/arch/$(UARCH)/Makefile.inc
 
 EXTRA_CFLAGS += -Irtld/include -I../../srv/loader/include
@@ -147 +145 @@
         ln -sfn ../$< $@
 
-$(INCLUDE_RTLDARCH): rtld/arch/$(UARCH)/include
-        ln -sfn ../../$< $@
-
 $(INCLUDE_KERNEL)/arch: ../../../kernel/generic/include/arch $(INCLUDE_KERNEL)