Index: uspace/srv/pci/Makefile
===================================================================
--- uspace/srv/pci/Makefile	(revision fcd7053c1b7bca76e2258a6b2b5ce5b3b416f00f)
+++ uspace/srv/pci/Makefile	(revision cb0ea396374ac492a0af9b8eb2d2147d94ed34fd)
@@ -35,6 +35,7 @@
 include $(LIBC_PREFIX)/Makefile.toolchain
 
+CFLAGS += -I../libipc/include
 
-LIBS = libpci/libpci.a $(LIBC_PREFIX)/libc.a
+LIBS =  $(LIBC_PREFIX)/libc.a
 
 ## Sources
@@ -43,5 +44,19 @@
 OUTPUT = pci
 SOURCES = \
-	pci.c
+	main.c \
+	pci.c \
+	intel_piix3.c \
+	isa.c \
+	serial.c
+
+ifeq ($(PROCESSOR), us)
+	SOURCES += psycho.c
+endif
+
+ifeq ($(UARCH), ia32)
+	SOURCES += intel_method1.c
+endif
+
+CFLAGS += -D$(UARCH)
 
 OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
@@ -49,5 +64,5 @@
 .PHONY: all clean depend disasm
 
-all: $(OUTPUT) disasm
+all: $(OUTPUT) $(OUTPUT).disasm
 
 -include Makefile.depend
@@ -55,5 +70,4 @@
 clean:
 	-rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend $(OBJECTS)
-	$(MAKE) -C libpci clean
 
 depend:
@@ -61,9 +75,10 @@
 
 $(OUTPUT): $(OBJECTS) $(LIBS)
-	$(MAKE) -C libpci
 	$(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
 
-disasm:
-	$(OBJDUMP) -d $(OUTPUT) >$(OUTPUT).disasm
+disasm: $(OUTPUT).disasm
+
+$(OUTPUT).disasm: $(OUTPUT)
+	$(OBJDUMP) -d $< >$@
 
 %.o: %.S
@@ -75,5 +90,2 @@
 %.o: %.c
 	$(CC) $(DEFS) $(CFLAGS) -c $< -o $@
-
-libpci/libpci.a:
-	$(MAKE) -C libpci