summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorStefan Reinauer <stepan@coresystems.de>2010-03-16 23:07:29 +0000
committerStefan Reinauer <stepan@openbios.org>2010-03-16 23:07:29 +0000
commit859e94a30420c726a0043a00a73abb946cfb94c3 (patch)
tree37d7924bc8dbf8d28662f1d17c40acea811d9727 /Makefile
parent11b1eb994cedef869618bff5368859d9b3c99b1d (diff)
it was reason for workaround rules already, and it's somewhat ugly:
util/x86emu is the only part of coreboot that is linked into coreboot itself that lives in util/. It's not a utility and it does not really belong where it lives. ---> svn mv util/x86emu src/devices/oprom plus necessary Makefile changes to get it building again Signed-off-by: Stefan Reinauer <stepan@coresystems.de> Acked-by: Ronald G. Minnich <rminnich@gmail.com> Acked-by: Peter Stuge <peter@stuge.se> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5228 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile14
1 files changed, 4 insertions, 10 deletions
diff --git a/Makefile b/Makefile
index 3aa48f861e..696bede949 100644
--- a/Makefile
+++ b/Makefile
@@ -96,7 +96,7 @@ export MAINBOARDDIR
PLATFORM-y += src/arch/$(ARCHDIR-y) src/cpu src/mainboard/$(MAINBOARDDIR)
TARGETS-y :=
-BUILD-y := src/lib src/boot src/console src/devices src/southbridge src/northbridge src/superio src/drivers util/x86emu
+BUILD-y := src/lib src/boot src/console src/devices src/southbridge src/northbridge src/superio src/drivers
BUILD-y += util/cbfstool
BUILD-$(CONFIG_ARCH_X86) += src/pc80
@@ -162,11 +162,9 @@ includemakefiles= \
$(if $(strip $(3)), \
$(foreach type,$(2), \
$(eval $(type)s+= \
- $$(abspath $$(patsubst util/%, \
- $(obj)/util/%, \
- $$(patsubst src/%, \
+ $$(abspath $$(patsubst src/%, \
$(obj)/%, \
- $$(addprefix $(dir $(1)),$$($(type)-y)))))))) \
+ $$(addprefix $(dir $(1)),$$($(type)-y))))))) \
$(eval subdirs+=$$(subst $(PWD)/,,$$(abspath $$(addprefix $(dir $(1)),$$(subdirs-y)))))
# For each path in $(subdirs) call includemakefiles, passing $(1) as $(3)
@@ -214,10 +212,6 @@ define create_cc_template
# $3 .o infix ("" ".initobj", ...)
# $4 additional compiler flags
de$(EMPTY)fine $(1)_$(2)_template
-$(obj)/$$(1)%$(3).o: $$(1)%.$(2) $(obj)/config.h
- printf " CC $$$$(subst $$$$(obj)/,,$$$$(@))\n"
- $(CC) $(4) $$$$(CFLAGS) -c -o $$$$@ $$$$<
-
$(obj)/$$(1)%$(3).o: src/$$(1)%.$(2) $(obj)/config.h
printf " CC $$$$(subst $$$$(obj)/,,$$$$(@))\n"
$(CC) $(4) $$$$(CFLAGS) -c -o $$$$@ $$$$<
@@ -263,7 +257,7 @@ printcrt0s:
OBJS := $(patsubst %,$(obj)/%,$(TARGETS-y))
INCLUDES := -I$(top)/src -I$(top)/src/include -I$(obj) -I$(top)/src/arch/$(ARCHDIR-y)/include
-INCLUDES += -I$(top)/util/x86emu/include
+INCLUDES += -I$(top)/src/devices/oprom/include
INCLUDES += -include $(obj)/config.h
CFLAGS = $(INCLUDES) -Os -nostdinc -pipe