diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2014-12-29 23:22:38 -0500 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2014-12-29 23:22:38 -0500 |
| commit | ccd37737ebdabb7a68c1836856394767500ff38d (patch) | |
| tree | 94a2c1f94b33d652ae768b58b78eb5bf00eb78bf /Makefile | |
| parent | b9160874be69ca4a08df3f19e2477d0b5fae4c52 (diff) | |
Mostly improve ./configure, a couple of related changes in Makefiles
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 9 |
1 files changed, 6 insertions, 3 deletions
@@ -1,8 +1,8 @@ -VERSION := $(shell if test -f version.txt; then cat version.txt; else git describe; fi) +-include config.mk host_arch := $(shell uname -m) export SHARED=0 -export CC = gcc -static $(if $(findstring i686,$@),-m32) +export CC = gcc $(if $(MAINTAINER_MODE),-static) $(if $(findstring i686,$@),-m32,-m64) # Just for convenience keymapdir = resources/utilities/grub-assemble/keymap @@ -28,7 +28,7 @@ roms = $(foreach board,$(boards),\ all: PHONY build -build: PHONY roms tools # $(addprefix tools-,$(arches)) +build: PHONY roms $(if $(MAINTAINER_MODE),$(addprefix tools-,$(arches)),tools) roms: PHONY $(foreach rom,$(roms),roms/$(rom).rom roms/$(rom)_with_seabios.rom) tools: PHONY tools-$(host_arch) @@ -60,6 +60,9 @@ multiglob = $(if $(strip $2),\ configure: configure.ac autoconf +config.mk: configure config.mk.in + ./configure + Makefile.d/keymap-list.mk: $(keymapdir)/original/ echo keymaps = $(notdir $(wildcard $</*)) > $@ Makefile.d/modules-list.mk: Makefile.d/modules/ |