Changeset dc9162b in mainline

Timestamp:

2010-01-15T22:22:44Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

cec261e

Parents:

d45660a (diff), 15eeb93 (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 first attempt at decreasing userspace makefile madness.

Location:

uspace

Files:

• Makefile (modified) (view diffs)
• app/Makefile.common (moved) (moved from uspace/app/bdsh/Makefile.build ) (view diffs)
• app/bdsh/Makefile (modified) (view diffs)
• app/bdsh/Makefile.common (deleted)
• app/edit/Makefile (modified) (view diffs)
• app/edit/Makefile.build (deleted)
• app/edit/Makefile.common (deleted)
• app/getterm/Makefile (modified) (view diffs)
• app/getterm/Makefile.common (deleted)
• app/init/Makefile (modified) (view diffs)
• app/init/Makefile.build (deleted)
• app/init/Makefile.common (deleted)
• app/klog/Makefile (modified) (view diffs)
• app/klog/Makefile.build (deleted)
• app/klog/Makefile.common (deleted)
• app/mkfat/Makefile (modified) (view diffs)
• app/mkfat/Makefile.build (deleted)
• app/mkfat/Makefile.common (deleted)
• app/redir/Makefile (modified) (view diffs)
• app/redir/Makefile.build (deleted)
• app/redir/Makefile.common (deleted)
• app/tester/Makefile (modified) (view diffs)
• app/tester/Makefile.build (deleted)
• app/tester/Makefile.common (deleted)
• app/tetris/Makefile (modified) (view diffs)
• app/tetris/Makefile.build (deleted)
• app/tetris/Makefile.common (deleted)
• app/trace/Makefile (modified) (view diffs)
• app/trace/Makefile.build (deleted)
• app/trace/Makefile.common (deleted)
• lib/libpci/COPYING (moved) (moved from uspace/srv/hw/bus/pci/COPYING ) (view diffs)
• lib/libpci/Makefile (moved) (moved from uspace/srv/hw/bus/pci/libpci/Makefile ) (view diffs)
• lib/libpci/Makefile.build (moved) (moved from uspace/srv/hw/bus/pci/libpci/Makefile.build ) (view diffs)
• lib/libpci/Makefile.common (moved) (moved from uspace/srv/hw/bus/pci/libpci/Makefile.common ) (view diffs)
• lib/libpci/VERSION (moved) (moved from uspace/srv/hw/bus/pci/libpci/VERSION ) (view diffs)
• lib/libpci/access.c (moved) (moved from uspace/srv/hw/bus/pci/libpci/access.c ) (view diffs)
• lib/libpci/generic.c (moved) (moved from uspace/srv/hw/bus/pci/libpci/generic.c ) (view diffs)
• lib/libpci/header.h (moved) (moved from uspace/srv/hw/bus/pci/libpci/header.h ) (view diffs)
• lib/libpci/i386-ports.c (moved) (moved from uspace/srv/hw/bus/pci/libpci/i386-ports.c ) (view diffs)
• lib/libpci/internal.h (moved) (moved from uspace/srv/hw/bus/pci/libpci/internal.h ) (view diffs)
• lib/libpci/names.c (moved) (moved from uspace/srv/hw/bus/pci/libpci/names.c ) (view diffs)
• lib/libpci/pci.h (moved) (moved from uspace/srv/hw/bus/pci/libpci/pci.h ) (view diffs)
• lib/libpci/pci_ids.h (moved) (moved from uspace/srv/hw/bus/pci/libpci/pci_ids.h ) (view diffs)
• lib/libpci/sysdep.h (moved) (moved from uspace/srv/hw/bus/pci/libpci/sysdep.h ) (view diffs)
• lib/libpci/types.h (moved) (moved from uspace/srv/hw/bus/pci/libpci/types.h ) (view diffs)
• srv/Makefile.common (moved) (moved from uspace/app/getterm/Makefile.build ) (view diffs)
• srv/bd/ata_bd/Makefile (modified) (view diffs)
• srv/bd/ata_bd/Makefile.build (deleted)
• srv/bd/ata_bd/Makefile.common (deleted)
• srv/bd/file_bd/Makefile (modified) (view diffs)
• srv/bd/file_bd/Makefile.build (deleted)
• srv/bd/file_bd/Makefile.common (deleted)
• srv/bd/gxe_bd/Makefile (modified) (view diffs)
• srv/bd/gxe_bd/Makefile.build (deleted)
• srv/bd/gxe_bd/Makefile.common (deleted)
• srv/bd/part/mbr_part/Makefile (modified) (view diffs)
• srv/bd/part/mbr_part/Makefile.build (deleted)
• srv/bd/part/mbr_part/Makefile.common (deleted)
• srv/bd/rd/Makefile (modified) (view diffs)
• srv/bd/rd/Makefile.build (deleted)
• srv/bd/rd/Makefile.common (deleted)
• srv/clip/Makefile (modified) (view diffs)
• srv/clip/Makefile.build (deleted)
• srv/clip/Makefile.common (deleted)
• srv/devmap/Makefile (modified) (view diffs)
• srv/devmap/Makefile.build (deleted)
• srv/devmap/Makefile.common (deleted)
• srv/fs/devfs/Makefile (modified) (view diffs)
• srv/fs/devfs/Makefile.build (deleted)
• srv/fs/devfs/Makefile.common (deleted)
• srv/fs/fat/Makefile (modified) (view diffs)
• srv/fs/fat/Makefile.build (deleted)
• srv/fs/fat/Makefile.common (deleted)
• srv/fs/tmpfs/Makefile (modified) (view diffs)
• srv/fs/tmpfs/Makefile.build (deleted)
• srv/fs/tmpfs/Makefile.common (deleted)
• srv/hid/c_mouse/Makefile (modified) (view diffs)
• srv/hid/c_mouse/Makefile.build (deleted)
• srv/hid/c_mouse/Makefile.common (deleted)
• srv/hw/bus/pci/Makefile (modified) (view diffs)
• srv/hw/bus/pci/Makefile.build (deleted)
• srv/hw/bus/pci/Makefile.common (deleted)
• srv/hw/bus/pci/pci.c (modified) (view diffs)
• srv/hw/char/i8042/Makefile (modified) (view diffs)
• srv/hw/char/i8042/Makefile.build (deleted)
• srv/hw/char/i8042/Makefile.common (deleted)
• srv/hw/cir/fhc/Makefile (modified) (view diffs)
• srv/hw/cir/fhc/Makefile.build (deleted)
• srv/hw/cir/fhc/Makefile.common (deleted)
• srv/hw/cir/obio/Makefile (modified) (view diffs)
• srv/hw/cir/obio/Makefile.build (deleted)
• srv/hw/cir/obio/Makefile.common (deleted)
• srv/ns/Makefile (modified) (view diffs)
• srv/ns/Makefile.build (deleted)
• srv/ns/Makefile.common (deleted)
• srv/vfs/Makefile (modified) (view diffs)
• srv/vfs/Makefile.build (deleted)
• srv/vfs/Makefile.common (deleted)