mcy
/
owlps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Makefiles: use colorgcc (only) if it exists 

owlps-positioning/Makefile used to use colorgcc as the default compiler,
without testing its existence. This is fixed.
The makefiles for libowlps and infrastructure-centred modules now use
colorgcc when available.
This commit is contained in:
Matteo Cypriani 2011-03-04 16:10:08 +01:00
parent 3027df22a7
commit 0676462082
6 changed files with 29 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
infrastructure-centred/libowlps-client/Makefile
View File

@ -1,5 +1,8 @@
# Compilateur # Compilateur
CC = gcc COLORGCC := $(shell which colorgcc >/dev/null 2>&1 ; echo $$?)
ifeq ($(COLORGCC), 0)
CC = colorgcc
endif
# Autres outils # Autres outils
AR = ar AR = ar

5
infrastructure-centred/owlps-aggregator/Makefile
View File

@ -6,7 +6,10 @@ INSTALL_INC= $(PREFIX)/include
INSTALL_MAN= $(PREFIX)/share/man INSTALL_MAN= $(PREFIX)/share/man
# Compilateur # Compilateur
CC = gcc COLORGCC := $(shell which colorgcc >/dev/null 2>&1 ; echo $$?)
ifeq ($(COLORGCC), 0)
CC = colorgcc
endif
# Commandes d'installation et de désinstallation # Commandes d'installation et de désinstallation
RM=rm -fv RM=rm -fv

5
infrastructure-centred/owlps-client/Makefile
View File

@ -6,7 +6,10 @@ INSTALL_INC= $(PREFIX)/include
INSTALL_MAN= $(PREFIX)/share/man INSTALL_MAN= $(PREFIX)/share/man
# Compilateur # Compilateur
CC = gcc COLORGCC := $(shell which colorgcc >/dev/null 2>&1 ; echo $$?)
ifeq ($(COLORGCC), 0)
CC = colorgcc
endif
# Commandes d'installation et de désinstallation # Commandes d'installation et de désinstallation
RM=rm -fv RM=rm -fv

5
infrastructure-centred/owlps-listener/Makefile
View File

@ -6,7 +6,10 @@ INSTALL_INC= $(PREFIX)/include
INSTALL_MAN= $(PREFIX)/share/man INSTALL_MAN= $(PREFIX)/share/man
# Compilateur # Compilateur
CC = gcc COLORGCC := $(shell which colorgcc >/dev/null 2>&1 ; echo $$?)
ifeq ($(COLORGCC), 0)
CC = colorgcc
endif
# Commandes d'installation et de désinstallation # Commandes d'installation et de désinstallation
RM=rm -fv RM=rm -fv

5
libowlps/Makefile
View File

@ -5,7 +5,10 @@ INSTALL_INC= $(PREFIX)/include
INSTALL_MAN= $(PREFIX)/share/man INSTALL_MAN= $(PREFIX)/share/man
# Compilateur # Compilateur
CC = gcc COLORGCC := $(shell which colorgcc >/dev/null 2>&1 ; echo $$?)
ifeq ($(COLORGCC), 0)
CC = colorgcc
endif
# Autres outils # Autres outils
AR = ar AR = ar

15
owlps-positioning/Makefile
View File

@ -23,11 +23,14 @@ CPPCHECK = cppcheck --enable=all
DOXYGEN = doxygen >/dev/null DOXYGEN = doxygen >/dev/null
# Compilation tools and flags # Compilation tools and flags
GXX = colorgcc COLORGCC := $(shell which colorgcc >/dev/null 2>&1 ; echo $$?)
ifeq ($(COLORGCC), 0)
CXX = colorgcc
endif
#DEBUG = -g #DEBUG = -g
TESTSGXXFLAGS = -I$(TESTS_DIR) -I$(SRC_DIR) -I. TESTSGXXFLAGS = -I$(TESTS_DIR) -I$(SRC_DIR) -I.
GXXFLAGS = $(DEBUG) -Wall -Wextra GXXFLAGS = $(DEBUG) -Wall -Wextra
LD = $(GXX) LD = $(CXX)
LDFLAGS = -lm -lrt -lboost_program_options LDFLAGS = -lm -lrt -lboost_program_options
# Targets # Targets
@ -107,10 +110,10 @@ all: prepare $(TARGET)
# Generic targets # Generic targets
$(TESTS_DIR)/%.o: $(TESTS_DIR)/%.cc $(TESTS_DIR)/%.hh $(TESTS_DIR)/%.o: $(TESTS_DIR)/%.cc $(TESTS_DIR)/%.hh
$(GXX) $(GXXFLAGS) $(TESTSGXXFLAGS) -o $@ -c $< $(CXX) $(GXXFLAGS) $(TESTSGXXFLAGS) -o $@ -c $<
$(OBJ_DIR)/%.o: $(SRC_DIR)/%.cc $(SRC_DIR)/%.hh $(OBJ_DIR)/%.o: $(SRC_DIR)/%.cc $(SRC_DIR)/%.hh
$(GXX) $(GXXFLAGS) -o $@ -c $< $(CXX) $(GXXFLAGS) -o $@ -c $<
%: $(OBJ_DIR)/%.o %: $(OBJ_DIR)/%.o
$(LD) $(LDFLAGS) -o $@ $^ $(LD) $(LDFLAGS) -o $@ $^
@ -243,7 +246,7 @@ $(OBJ_DIR)/positioning.o: \
$(TARGET): $(OBJ) $(OBJ_NOTEST) $(OBJ_TARGET) $(TARGET): $(OBJ) $(OBJ_NOTEST) $(OBJ_TARGET)
$(OBJ_TARGET): $(SOURCE_TARGET) $(OBJ_TARGET): $(SOURCE_TARGET)
$(GXX) $(GXXFLAGS) -o $@ -c $< $(CXX) $(GXXFLAGS) -o $@ -c $<
$(TESTS_XX): $(SOURCE_TESTS) $(OBJ) $(TESTS_XX): $(SOURCE_TESTS) $(OBJ)
$(TESTS_DIR)/cxxtestgen.pl --error-printer \ $(TESTS_DIR)/cxxtestgen.pl --error-printer \
@ -252,7 +255,7 @@ $(TESTS_XX): $(SOURCE_TESTS) $(OBJ)
-o $@ $(SOURCE_TESTS) -o $@ $(SOURCE_TESTS)
$(TESTS_OBJ): $(TESTS_XX) $(INCLUDES_TESTS) $(TESTS_OBJ): $(TESTS_XX) $(INCLUDES_TESTS)
$(GXX) $(GXXFLAGS) $(TESTSGXXFLAGS) -o $@ -c $< $(CXX) $(GXXFLAGS) $(TESTSGXXFLAGS) -o $@ -c $<
$(TESTS_TARGET): $(TESTS_OBJ) $(OBJ_TESTS) $(OBJ) $(OBJ_NOTEST) $(TESTS_TARGET): $(TESTS_OBJ) $(OBJ_TESTS) $(OBJ) $(OBJ_NOTEST)
$(LD) $(LDFLAGS) -o $@ $^ $(LD) $(LDFLAGS) -o $@ $^