diff options
| author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2013-05-10 17:45:37 +0200 |
|---|---|---|
| committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2013-05-10 17:48:01 +0200 |
| commit | 8568a8de1368b1c61169a0627dead2c2de18f349 (patch) | |
| tree | 144c1a45f1bad0cb84f9e34a356de99ae5054b1f | |
| parent | 7ab7f865dcf237135958fafcaf5871670b18794c (diff) | |
| download | rockbox-8568a8de1368b1c61169a0627dead2c2de18f349.tar.gz rockbox-8568a8de1368b1c61169a0627dead2c2de18f349.zip | |
Set APPVERSION globally for extralibs Makefile.
Make sure its value quotes are properly escaped. Otherwise make on Windows
causes problems. Also, expand CPPDEFINES only once.
Change-Id: I52e91f17626b2596f389811b22abc12d94f721d1
| -rw-r--r-- | rbutil/libtools.make | 4 | ||||
| -rw-r--r-- | rbutil/rbutilqt/Makefile.libs | 15 |
2 files changed, 10 insertions, 9 deletions
diff --git a/rbutil/libtools.make b/rbutil/libtools.make index be2a69e2c7..59be99f76b 100644 --- a/rbutil/libtools.make +++ b/rbutil/libtools.make @@ -24,12 +24,12 @@ TOP := $(dir $(lastword $(MAKEFILE_LIST))) # overwrite for releases APPVERSION ?= $(shell $(TOP)/../tools/version.sh $(TOP)/..) -CFLAGS += -DVERSION=\""$(APPVERSION)"\" +CFLAGS += -DVERSION=\"$(APPVERSION)\" TARGET_DIR ?= $(abspath .)/ NATIVECC ?= gcc CC ?= gcc -CPPDEFINES=$(shell echo foo | $(CROSS)$(CC) -dM -E -) +CPPDEFINES := $(shell echo foo | $(CROSS)$(CC) -dM -E -) # use POSIX/C99 printf on windows CFLAGS += -D__USE_MINGW_ANSI_STDIO=1 diff --git a/rbutil/rbutilqt/Makefile.libs b/rbutil/rbutilqt/Makefile.libs index a3119f28fc..ecb1c1814e 100644 --- a/rbutil/rbutilqt/Makefile.libs +++ b/rbutil/rbutilqt/Makefile.libs @@ -23,6 +23,7 @@ EXTRALIBS_AR ?= ar # re-export variables that might have been set via command line. # If set via command line sub-makefiles cannot override them, so use different # variable names in the calling makefile. +export APPVERSION=\"rbutil\" export SYS_SPEEX export TARGET_DIR export RBBASE_DIR @@ -40,23 +41,23 @@ libucl: $(SILENT)$(MAKE) -C $(RBBASE_DIR)/tools/ucl/src BUILD_DIR=$(BUILD_DIR)/ucl libucl.a libipodpatcher: - $(SILENT)$(MAKE) -C $(RBBASE_DIR)/rbutil/ipodpatcher BUILD_DIR=$(BUILD_DIR)/ipodpatcher APPVERSION="rbutil" libipodpatcher.a + $(SILENT)$(MAKE) -C $(RBBASE_DIR)/rbutil/ipodpatcher BUILD_DIR=$(BUILD_DIR)/ipodpatcher libipodpatcher.a libsansapatcher: - $(SILENT)$(MAKE) -C $(RBBASE_DIR)/rbutil/sansapatcher BUILD_DIR=$(BUILD_DIR)/sansapatcher APPVERSION="rbutil" libsansapatcher.a + $(SILENT)$(MAKE) -C $(RBBASE_DIR)/rbutil/sansapatcher BUILD_DIR=$(BUILD_DIR)/sansapatcher libsansapatcher.a libmkamsboot: - $(SILENT)$(MAKE) -C $(RBBASE_DIR)/rbutil/mkamsboot BUILD_DIR=$(BUILD_DIR)/mkamsboot APPVERSION="rbutil" libmkamsboot.a + $(SILENT)$(MAKE) -C $(RBBASE_DIR)/rbutil/mkamsboot BUILD_DIR=$(BUILD_DIR)/mkamsboot libmkamsboot.a libmktccboot: - $(SILENT)$(MAKE) -C $(RBBASE_DIR)/rbutil/mktccboot BUILD_DIR=$(BUILD_DIR)/mktccboot APPVERSION="rbutil" libmktccboot.a + $(SILENT)$(MAKE) -C $(RBBASE_DIR)/rbutil/mktccboot BUILD_DIR=$(BUILD_DIR)/mktccboot libmktccboot.a libmkmpioboot: - $(SILENT)$(MAKE) -C $(RBBASE_DIR)/rbutil/mkmpioboot BUILD_DIR=$(BUILD_DIR)/mkmpioboot APPVERSION="rbutil" libmkmpioboot.a + $(SILENT)$(MAKE) -C $(RBBASE_DIR)/rbutil/mkmpioboot BUILD_DIR=$(BUILD_DIR)/mkmpioboot libmkmpioboot.a libchinachippatcher: - $(SILENT)$(MAKE) -C $(RBBASE_DIR)/rbutil/chinachippatcher BUILD_DIR=$(BUILD_DIR)/chinachippatcher APPVERSION="rbutil" libchinachippatcher.a + $(SILENT)$(MAKE) -C $(RBBASE_DIR)/rbutil/chinachippatcher BUILD_DIR=$(BUILD_DIR)/chinachippatcher libchinachippatcher.a libmkimxboot: - $(SILENT)$(MAKE) -C $(RBBASE_DIR)/rbutil/mkimxboot BUILD_DIR=$(BUILD_DIR)/mkimxboot APPVERSION="rbutil" libmkimxboot.a + $(SILENT)$(MAKE) -C $(RBBASE_DIR)/rbutil/mkimxboot BUILD_DIR=$(BUILD_DIR)/mkimxboot libmkimxboot.a |