Changeset 7ee6aff in mainline

Timestamp:

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

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

38edb96

Parents:

450cd3a

Message:

Fixed not compiling uspace after libipc merge.

Files:

• kbd/Makefile (modified) (1 diff)
• kbd/generic/kbd.c (modified) (1 diff)
• libc/generic/ipc.c (modified) (1 diff)
• libc/include/ipc/ipc.h (moved) (moved from libc/include/libipc/ipc.h )
• libc/include/ipc/ns.h (moved) (moved from libc/include/libipc/ns.h )
• libc/include/ipc/services.h (moved) (moved from libc/include/libipc/services.h )
• pci/Makefile (modified) (1 diff)

kbd/Makefile

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

kbd/generic/kbd.c

@@ -27 +27 @@
  */
 
-#include <ipc.h>
-#include <services.h>
+#include <ipc/ipc.h>
+#include <ipc/services.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <stdlib.h>
-#include <ns.h>
+#include <ipc/ns.h>
 #include <errno.h>
 #include <arch/kbd.h>

libc/generic/ipc.c

@@ -27 +27 @@
  */ 
 
-#include <ipc.h>
+#include <ipc/ipc.h>
 #include <libc.h>
 #include <malloc.h>
 #include <errno.h>
-#include <list.h>
+#include <libadt/list.h>
 #include <stdio.h>
 #include <unistd.h>

pci/Makefile

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