From 61124e4cfc5a5e8977dbb40e0ebe1da037d9f735 Mon Sep 17 00:00:00 2001 From: Matteo Cypriani Date: Thu, 29 Dec 2011 15:21:22 +0100 Subject: [PATCH] Makefiles: test CC prior to surcharge it Verifies that CC is at its default value prior to try to surcharge it with colorgcc. --- libowlps-client/Makefile | 8 +++++--- libowlps-resultreader/Makefile | 8 +++++--- libowlps/Makefile | 8 +++++--- owlps-aggregator/Makefile | 8 +++++--- owlps-client/Makefile | 8 +++++--- owlps-listener/Makefile | 8 +++++--- owlps-positioning/Makefile | 8 +++++--- owlps-udp-to-http/Makefile | 8 +++++--- 8 files changed, 40 insertions(+), 24 deletions(-) diff --git a/libowlps-client/Makefile b/libowlps-client/Makefile index f364436..1fa2642 100644 --- a/libowlps-client/Makefile +++ b/libowlps-client/Makefile @@ -1,7 +1,9 @@ # Compiler -COLORGCC := $(shell which colorgcc >/dev/null 2>&1 ; echo $$?) -ifeq ($(COLORGCC), 0) - CC = colorgcc +ifeq "$(origin CC)" "default" + COLORGCC := $(shell which colorgcc >/dev/null 2>&1 ; echo $$?) + ifeq "$(COLORGCC)" "0" + CC = colorgcc + endif endif # Other tools diff --git a/libowlps-resultreader/Makefile b/libowlps-resultreader/Makefile index a9ad8f6..e73d80d 100644 --- a/libowlps-resultreader/Makefile +++ b/libowlps-resultreader/Makefile @@ -1,7 +1,9 @@ # Compiler -COLORGCC := $(shell which colorgcc >/dev/null 2>&1 ; echo $$?) -ifeq ($(COLORGCC), 0) - CC = colorgcc +ifeq "$(origin CC)" "default" + COLORGCC := $(shell which colorgcc >/dev/null 2>&1 ; echo $$?) + ifeq "$(COLORGCC)" "0" + CC = colorgcc + endif endif # Other tools diff --git a/libowlps/Makefile b/libowlps/Makefile index d9829ab..e8a0f55 100644 --- a/libowlps/Makefile +++ b/libowlps/Makefile @@ -5,9 +5,11 @@ INSTALL_INC= $(PREFIX)/include INSTALL_MAN= $(PREFIX)/share/man # Compiler -COLORGCC := $(shell which colorgcc >/dev/null 2>&1 ; echo $$?) -ifeq ($(COLORGCC), 0) - CC = colorgcc +ifeq "$(origin CC)" "default" + COLORGCC := $(shell which colorgcc >/dev/null 2>&1 ; echo $$?) + ifeq "$(COLORGCC)" "0" + CC = colorgcc + endif endif # Other tools diff --git a/owlps-aggregator/Makefile b/owlps-aggregator/Makefile index 4f9d0ee..8c8872a 100644 --- a/owlps-aggregator/Makefile +++ b/owlps-aggregator/Makefile @@ -11,9 +11,11 @@ INSTALL_INC= $(PREFIX)/include INSTALL_MAN= $(PREFIX)/share/man # Compiler -COLORGCC := $(shell which colorgcc >/dev/null 2>&1 ; echo $$?) -ifeq ($(COLORGCC), 0) - CC = colorgcc +ifeq "$(origin CC)" "default" + COLORGCC := $(shell which colorgcc >/dev/null 2>&1 ; echo $$?) + ifeq "$(COLORGCC)" "0" + CC = colorgcc + endif endif # Install/uninstall commands diff --git a/owlps-client/Makefile b/owlps-client/Makefile index b5b753c..b96a413 100644 --- a/owlps-client/Makefile +++ b/owlps-client/Makefile @@ -11,9 +11,11 @@ INSTALL_INC= $(PREFIX)/include INSTALL_MAN= $(PREFIX)/share/man # Compiler -COLORGCC := $(shell which colorgcc >/dev/null 2>&1 ; echo $$?) -ifeq ($(COLORGCC), 0) - CC = colorgcc +ifeq "$(origin CC)" "default" + COLORGCC := $(shell which colorgcc >/dev/null 2>&1 ; echo $$?) + ifeq "$(COLORGCC)" "0" + CC = colorgcc + endif endif # Install/uninstall commands diff --git a/owlps-listener/Makefile b/owlps-listener/Makefile index c8c6f56..15449a1 100644 --- a/owlps-listener/Makefile +++ b/owlps-listener/Makefile @@ -11,9 +11,11 @@ INSTALL_INC= $(PREFIX)/include INSTALL_MAN= $(PREFIX)/share/man # Compiler -COLORGCC := $(shell which colorgcc >/dev/null 2>&1 ; echo $$?) -ifeq ($(COLORGCC), 0) - CC = colorgcc +ifeq "$(origin CC)" "default" + COLORGCC := $(shell which colorgcc >/dev/null 2>&1 ; echo $$?) + ifeq "$(COLORGCC)" "0" + CC = colorgcc + endif endif # Install/uninstall commands diff --git a/owlps-positioning/Makefile b/owlps-positioning/Makefile index 66cd3e3..c8f0534 100644 --- a/owlps-positioning/Makefile +++ b/owlps-positioning/Makefile @@ -26,9 +26,11 @@ CPPCHECK = cppcheck --quiet --enable=all DOXYGEN = OWLPS_VERSION=$(OWLPS_VERSION) doxygen >/dev/null # Compilation tools -COLORGCC := $(shell which colorgcc >/dev/null 2>&1 ; echo $$?) -ifeq ($(COLORGCC), 0) - CXX = colorgcc +ifeq "$(origin CXX)" "default" + COLORGCC := $(shell which colorgcc >/dev/null 2>&1 ; echo $$?) + ifeq "$(COLORGCC)" "0" + CXX = colorgcc + endif endif # Flags diff --git a/owlps-udp-to-http/Makefile b/owlps-udp-to-http/Makefile index 6951855..f487da4 100644 --- a/owlps-udp-to-http/Makefile +++ b/owlps-udp-to-http/Makefile @@ -11,9 +11,11 @@ INSTALL_INC= $(PREFIX)/include INSTALL_MAN= $(PREFIX)/share/man # Compiler -COLORGCC := $(shell which colorgcc >/dev/null 2>&1 ; echo $$?) -ifeq ($(COLORGCC), 0) - CC = colorgcc +ifeq "$(origin CC)" "default" + COLORGCC := $(shell which colorgcc >/dev/null 2>&1 ; echo $$?) + ifeq "$(COLORGCC)" "0" + CC = colorgcc + endif endif # Install/uninstall commands