Changeset d8d7a0d in mainline for uspace/lib/c/Makefile

Timestamp:

2013-03-10T20:53:58Z (11 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

40a0e3bd

Parents:

e4a1497 (diff), 05bab88 (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:

No compile-time symlinks

Prior this commit, during the build process symlinks to architecture
specific directories and abi/ were created.

This commit (merge from lp:~vojtech-horky/helenos/misc) adds extra
directory and thus it is possible to use -I directive only.

As a side effect, this brings less confusion to tools such as IDE or
documentation generators.

File:

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

uspace/lib/c/Makefile

@@ -31 +31 @@
 ROOT_PATH = $(USPACE_PREFIX)/..
 
-INCLUDE_ABI = include/abi
-INCLUDE_LIBARCH = include/libarch
-
 COMMON_MAKEFILE = $(ROOT_PATH)/Makefile.common
 COMMON_HEADER = $(ROOT_PATH)/common.h
-COMMON_HEADER_ARCH = arch/$(UARCH)/include/common.h
+COMMON_HEADER_ARCH = arch/$(UARCH)/include/libarch/common.h
 
 CONFIG_MAKEFILE = $(ROOT_PATH)/Makefile.config
@@ -46 +43 @@
         $(LIBC_PREFIX)/arch/$(UARCH)/_link-dlexe.ld
 
-PRE_DEPEND = $(INCLUDE_ABI) $(INCLUDE_LIBARCH) $(COMMON_HEADER_ARCH)
+PRE_DEPEND = $(COMMON_HEADER_ARCH)
 EXTRA_OUTPUT = $(LINKER_SCRIPTS)
-EXTRA_CLEAN = $(INCLUDE_ABI) $(INCLUDE_LIBARCH) $(COMMON_HEADER_ARCH) $(LINKER_SCRIPTS)
+EXTRA_CLEAN = $(COMMON_HEADER_ARCH) $(LINKER_SCRIPTS)
 LIBRARY = libc
 SLIBRARY = libc.so.0.0
@@ -162 +159 @@
 include $(USPACE_PREFIX)/Makefile.common
 
-$(INCLUDE_LIBARCH): arch/$(UARCH)/include
-        ln -sfn ../$< $@
-
-$(INCLUDE_ABI): ../../../abi/include/
-        ln -sfn ../$< $@
 
 $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld: $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld.in
@@ -181 +173 @@
 
 $(COMMON_HEADER_ARCH): $(COMMON_HEADER)
-        ln -sfn ../../../$< $@
+        ln -sfn ../../../../$< $@