From d627f8f3cdebc07dfc54e762456f477806f0b3cb Mon Sep 17 00:00:00 2001 From: Haru Date: Thu, 18 Jul 2013 15:42:53 +0200 Subject: Changed CC to a Makefile variable - This allows the user to override the compiler at each make invocation (i.e. to run scripts to generate .clang_complete for https://github.com/Rip-Rip/clang_complete ) - Updated .gitignore with a few platform-dependent entries Signed-off-by: Haru --- src/tool/Makefile.in | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/tool') diff --git a/src/tool/Makefile.in b/src/tool/Makefile.in index c1780fe51..de4607dc3 100644 --- a/src/tool/Makefile.in +++ b/src/tool/Makefile.in @@ -19,6 +19,9 @@ MAPCACHE_OBJ = obj_all/mapcache.o @SET_MAKE@ +CC = @CC@ +export CC + ##################################################################### .PHONY : all mapcache clean help @@ -26,7 +29,7 @@ all: mapcache mapcache: obj_all $(MAPCACHE_OBJ) $(COMMON_OBJ) $(LIBCONFIG_OBJ) @echo " LD $@" - @@CC@ @LDFLAGS@ $(LIBCONFIG_INCLUDE) -o ../../mapcache@EXEEXT@ $(MAPCACHE_OBJ) $(COMMON_OBJ) $(LIBCONFIG_OBJ) @LIBS@ + @$(CC) @LDFLAGS@ $(LIBCONFIG_INCLUDE) -o ../../mapcache@EXEEXT@ $(MAPCACHE_OBJ) $(COMMON_OBJ) $(LIBCONFIG_OBJ) @LIBS@ clean: @echo " CLEAN tool" @@ -47,7 +50,7 @@ obj_all: obj_all/%.o: %.c $(COMMON_H) $(OTHER_H) $(LIBCONFIG_H) @echo " CC $<" - @@CC@ @CFLAGS@ $(LIBCONFIG_INCLUDE) @CPPFLAGS@ -c $(OUTPUT_OPTION) $< + @$(CC) @CFLAGS@ $(LIBCONFIG_INCLUDE) @CPPFLAGS@ -c $(OUTPUT_OPTION) $< # missing common object files ../common/obj_all/%.o: -- cgit v1.2.3-70-g09d2