Changes in uspace/srv/pci/Makefile [fcd7053:cb0ea39] in mainline

File:

• uspace/srv/pci/Makefile (modified) (6 diffs)

uspace/srv/pci/Makefile

@@ -35 +35 @@
 include $(LIBC_PREFIX)/Makefile.toolchain
 
+CFLAGS += -I../libipc/include
 
-LIBS = libpci/libpci.a $(LIBC_PREFIX)/libc.a
+LIBS =  $(LIBC_PREFIX)/libc.a
 
 ## Sources
@@ -43 +44 @@
 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 +64 @@
 .PHONY: all clean depend disasm
 
-all: $(OUTPUT) disasm
+all: $(OUTPUT) $(OUTPUT).disasm
 
 -include Makefile.depend
@@ -55 +70 @@
 clean:
         -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend $(OBJECTS)
-        $(MAKE) -C libpci clean
 
 depend:
@@ -61 +75 @@
 
 $(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 +90 @@
 %.o: %.c
         $(CC) $(DEFS) $(CFLAGS) -c $< -o $@
-
-libpci/libpci.a:
-        $(MAKE) -C libpci