Changeset 450cd3a in mainline

Timestamp:

2006-05-16T13:35:18Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

7ee6aff

Parents:

35509652

Message:

Merge ipc and libc. Does not compile.

Files:

• Makefile (modified) (1 diff)
• init/Makefile (modified) (1 diff)
• libc/Makefile (modified) (1 diff)
• libc/generic/async.c (added)
• libc/generic/ipc.c (moved) (moved from libipc/generic/ipc.c )
• libc/include/libipc/ipc.h (moved) (moved from libipc/include/ipc.h )
• libc/include/libipc/ns.h (moved) (moved from libipc/include/ns.h )
• libc/include/libipc/services.h (moved) (moved from libipc/include/services.h )
• libipc/Makefile (deleted)
• ns/Makefile (modified) (1 diff)

Makefile

@@ -36 +36 @@
         softint \
         softfloat \
-        libipc \
         libadt \
         init \

init/Makefile

@@ -31 +31 @@
 
 LIBC_PREFIX = ../libc
-LIBIPC_PREFIX = ../libipc
 SOFTINT_PREFIX = ../softint
 include $(LIBC_PREFIX)/Makefile.toolchain
 
-CFLAGS += -I../libipc/include -I../kbd/include
+CFLAGS += -I../kbd/include
 
-LIBS = $(LIBIPC_PREFIX)/libipc.a $(LIBC_PREFIX)/libc.a
+LIBS = $(LIBC_PREFIX)/libc.a
 
 ## Sources

libc/Makefile

@@ -61 +61 @@
         malloc/malloc.c \
         generic/psthread.c \
-        generic/sysinfo.c
+        generic/sysinfo.c \
+        generic/ipc.c
 
 ARCH_SOURCES += \

ns/Makefile

@@ -32 +32 @@
 LIBC_PREFIX = ../libc
 LIBADT_PREFIX = ../libadt
-LIBIPC_PREFIX = ../libipc
 SOFTINT_PREFIX = ../softint
 include $(LIBC_PREFIX)/Makefile.toolchain
 
-CFLAGS += -I../libipc/include
-
-LIBS = $(LIBADT_PREFIX)/libadt.a $(LIBIPC_PREFIX)/libipc.a $(LIBC_PREFIX)/libc.a
+LIBS = $(LIBADT_PREFIX)/libadt.a $(LIBC_PREFIX)/libc.a
 
 ## Sources