Changeset 00aece0 in mainline for uspace/Makefile.common

Timestamp:

2012-02-18T16:47:38Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4449c6c

Parents:

bd5f3b7 (diff), f943dd3 (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/Makefile.common (modified) (4 diffs)

uspace/Makefile.common

@@ -44 +44 @@
 #   EXTRA_CLEAN        additional cleanup targets
 #
+#   POSIX_COMPAT       set to 'y' to use POSIX compatibility layer
+#
 # Optionally, for a binary:
 #   STATIC_NEEDED      set to 'y' for init binaries, will build statically
@@ -104 +106 @@
 LIBSOFTINT_PREFIX = $(LIB_PREFIX)/softint
 
+LIBPOSIX_PREFIX = $(LIB_PREFIX)/posix
+
 LIBBLOCK_PREFIX = $(LIB_PREFIX)/block
 LIBFS_PREFIX = $(LIB_PREFIX)/fs
-LIBIMGMAP_PREFIX = $(LIB_PREFIX)/imgmap
+LIBFB_PREFIX = $(LIB_PREFIX)/fb
 LIBCLUI_PREFIX = $(LIB_PREFIX)/clui
 LIBFMTUTIL_PREFIX = $(LIB_PREFIX)/fmtutil
@@ -119 +123 @@
 
 LIBDRV_PREFIX = $(LIB_PREFIX)/drv
-LIBPACKET_PREFIX = $(LIB_PREFIX)/packet
 LIBNET_PREFIX = $(LIB_PREFIX)/net
+LIBNIC_PREFIX = $(LIB_PREFIX)/nic
+LIBMINIX_PREFIX = $(LIB_PREFIX)/minix
 
 LIBSCSI_PREFIX = $(LIB_PREFIX)/scsi
@@ -215 +220 @@
 JOBFILE = $(LIBC_PREFIX)/../../../tools/jobfile.py
 
+ifeq ($(POSIX_COMPAT),y)
+        CFLAGS = -I$(LIBPOSIX_PREFIX)
+        LIBS += $(LIBPOSIX_PREFIX)/libposix.a
+endif
+
 ifeq ($(COMPILER),gcc_cross)
-        CFLAGS = $(GCC_CFLAGS) $(EXTRA_CFLAGS)
+        CFLAGS += $(GCC_CFLAGS) $(EXTRA_CFLAGS)
         DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
 endif
 
 ifeq ($(COMPILER),gcc_native)
-        CFLAGS = $(GCC_CFLAGS) $(EXTRA_CFLAGS)
+        CFLAGS += $(GCC_CFLAGS) $(EXTRA_CFLAGS)
         DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
 endif
 
 ifeq ($(COMPILER),icc)
-        CFLAGS = $(ICC_CFLAGS) $(EXTRA_CFLAGS)
+        CFLAGS += $(ICC_CFLAGS) $(EXTRA_CFLAGS)
         DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
 endif
 
 ifeq ($(COMPILER),clang)
-        CFLAGS = $(CLANG_CFLAGS) $(EXTRA_CFLAGS)
+        CFLAGS += $(CLANG_CFLAGS) $(EXTRA_CFLAGS)
         DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
 endif