diff options
author | H. Nikolaus Schaller <hns@goldelico.com> | 2012-04-02 17:15:53 +0200 |
---|---|---|
committer | H. Nikolaus Schaller <hns@goldelico.com> | 2012-04-02 17:15:53 +0200 |
commit | d45f815d51db77a592cd0e3f07440877a5c4f9ee (patch) | |
tree | 1648f8642392b5d9e00619f7ce80837c68e3c99b /x-loader/config.mk | |
parent | 18ea53eaac88276357fb553d9b97d378ef48ba46 (diff) | |
download | bootable_bootloader_goldelico_gta04_x-loader-d45f815d51db77a592cd0e3f07440877a5c4f9ee.zip bootable_bootloader_goldelico_gta04_x-loader-d45f815d51db77a592cd0e3f07440877a5c4f9ee.tar.gz bootable_bootloader_goldelico_gta04_x-loader-d45f815d51db77a592cd0e3f07440877a5c4f9ee.tar.bz2 |
merge/overwrite of soures without commit log
Diffstat (limited to 'x-loader/config.mk')
-rw-r--r-- | x-loader/config.mk | 45 |
1 files changed, 39 insertions, 6 deletions
diff --git a/x-loader/config.mk b/x-loader/config.mk index 1365b9d..f4c58e9 100644 --- a/x-loader/config.mk +++ b/x-loader/config.mk @@ -23,6 +23,22 @@ ######################################################################### +ifneq ($(OBJTREE),$(SRCTREE)) +ifeq ($(CURDIR),$(SRCTREE)) +dir := +else +dir := $(subst $(SRCTREE)/,,$(CURDIR)) +endif + +obj := $(if $(dir),$(OBJTREE)/$(dir)/,$(OBJTREE)/) +src := $(if $(dir),$(SRCTREE)/$(dir)/,$(SRCTREE)/) + +$(shell mkdir -p $(obj)) +else +obj := +src := +endif + # clean the slate ... PLATFORM_RELFLAGS = PLATFORM_CPPFLAGS = @@ -116,10 +132,15 @@ OBJCFLAGS += --gap-fill=0xff gccincdir := $(shell $(CC) -print-file-name=include) CPPFLAGS := $(DBGFLAGS) $(OPTFLAGS) $(RELFLAGS) \ - -D__KERNEL__ -DTEXT_BASE=$(TEXT_BASE) \ - -I$(TOPDIR)/include \ - -fno-builtin -ffreestanding -nostdinc -isystem \ - $(gccincdir) -pipe $(PLATFORM_CPPFLAGS) + -D__KERNEL__ -DTEXT_BASE=$(TEXT_BASE) + +ifneq ($(OBJTREE),$(SRCTREE)) +CPPFLAGS += -I$(OBJTREE)/include +endif + +CPPFLAGS += -I$(TOPDIR)/include +CPPFLAGS += -fno-builtin -ffreestanding -nostdinc \ + -isystem $(gccincdir) -pipe $(PLATFORM_CPPFLAGS) ifdef BUILD_TAG CFLAGS := $(CPPFLAGS) -Wall -Wstrict-prototypes \ @@ -165,11 +186,23 @@ export TEXT_BASE PLATFORM_CPPFLAGS PLATFORM_RELFLAGS CPPFLAGS CFLAGS AFLAGS ######################################################################### +ifndef REMOTE_BUILD + %.s: %.S - $(CPP) $(AFLAGS) -o $@ $(CURDIR)/$< + $(CPP) $(AFLAGS) -o $@ $< %.o: %.S - $(CC) $(AFLAGS) -c -o $@ $(CURDIR)/$< + $(CC) $(AFLAGS) -c -o $@ $< %.o: %.c $(CC) $(CFLAGS) -c -o $@ $< +else + +$(obj)%.s: %.S + $(CPP) $(AFLAGS) -o $@ $< +$(obj)%.o: %.S + $(CC) $(AFLAGS) -c -o $@ $< +$(obj)%.o: %.c + $(CC) $(CFLAGS) -c -o $@ $< +endif + ######################################################################### |