Fix some Makefile bugs ENGINE-228
authorDamiano Boppart <damiano@pep-security.net>
Tue, 15 Aug 2017 00:07:09 +0000
branchENGINE-228
changeset 1962b88394894238
parent 1961 98630cbc56ad
child 1963 35d308e437cf
Fix some Makefile bugs
Makefile
Makefile.conf
src/Makefile
     1.1 --- a/Makefile	Mon Aug 14 23:46:54 2017 +0000
     1.2 +++ b/Makefile	Tue Aug 15 00:07:09 2017 +0000
     1.3 @@ -3,6 +3,7 @@
     1.4  # This file may be used under the terms of the GNU General Public License version 3
     1.5  # see LICENSE.txt
     1.6  
     1.7 +export BUILD_CONFIG:=$(CURDIR)/build-config
     1.8  include Makefile.conf
     1.9  
    1.10  export YML2_PATH
     2.1 --- a/Makefile.conf	Mon Aug 14 23:46:54 2017 +0000
     2.2 +++ b/Makefile.conf	Tue Aug 15 00:07:09 2017 +0000
     2.3 @@ -5,13 +5,13 @@
     2.4  
     2.5  # To use custom build configuration variables, put them in a new file at `build-config/<name>.conf`. Execute `export PLATFORM_OVERRIDE=<name>` before running make. If this environment variable is not set, make will load a default configuration for your platform.
     2.6  
     2.7 -include build-config/common.conf
     2.8 +include $(BUILD_CONFIG)/common.conf
     2.9  # cross-compiling is currently not supported, but maybe you can hack something with `PLATFORM_OVERRIDE`
    2.10  ifeq ($(BUILD_ON),$(BUILD_FOR))
    2.11 -    include build-config/$(BUILD_ON).conf
    2.12 +    include $(BUILD_CONFIG)/$(BUILD_ON).conf
    2.13  else
    2.14      $(error I don't know how to build for $(BUILD_FOR) on $(BUILD_ON))
    2.15  endif
    2.16  ifdef PLATFORM_OVERRIDE
    2.17 -    include build-config/$(PLATFORM_OVERRIDE).conf
    2.18 +    include $(BUILD_CONFIG)/$(PLATFORM_OVERRIDE).conf
    2.19  endif
     3.1 --- a/src/Makefile	Mon Aug 14 23:46:54 2017 +0000
     3.2 +++ b/src/Makefile	Tue Aug 15 00:07:09 2017 +0000
     3.3 @@ -50,8 +50,7 @@
     3.4  .PHONY: all
     3.5  all: $(TARGET)
     3.6  
     3.7 -# FIXME What is this?
     3.8 -include Makefile.protocols
     3.9 +-include Makefile.protocols
    3.10  
    3.11  %.d: %.c
    3.12  	@set -e; rm -f $@; \