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/common/Makefile.in | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src/common/Makefile.in') diff --git a/src/common/Makefile.in b/src/common/Makefile.in index dce817e67..313db8ccc 100644 --- a/src/common/Makefile.in +++ b/src/common/Makefile.in @@ -32,6 +32,9 @@ endif @SET_MAKE@ +CC = @CC@ +export CC + ##################################################################### .PHONY : all sql clean help @@ -79,15 +82,15 @@ common_sql: obj_sql $(COMMON_SQL_OBJ) obj_sql/common_sql.a obj_all/%.o: %.c $(COMMON_H) $(MT19937AR_H) $(LIBCONFIG_H) @echo " CC $<" - @@CC@ @CFLAGS@ $(MT19937AR_INCLUDE) $(LIBCONFIG_INCLUDE) @CPPFLAGS@ -c $(OUTPUT_OPTION) $< + @$(CC) @CFLAGS@ $(MT19937AR_INCLUDE) $(LIBCONFIG_INCLUDE) @CPPFLAGS@ -c $(OUTPUT_OPTION) $< obj_all/mini%.o: %.c $(COMMON_H) $(MT19937AR_H) $(LIBCONFIG_H) @echo " CC $<" - @@CC@ @CFLAGS@ $(MT19937AR_INCLUDE) $(LIBCONFIG_INCLUDE) -DMINICORE @CPPFLAGS@ -c $(OUTPUT_OPTION) $< + @$(CC) @CFLAGS@ $(MT19937AR_INCLUDE) $(LIBCONFIG_INCLUDE) -DMINICORE @CPPFLAGS@ -c $(OUTPUT_OPTION) $< obj_sql/%.o: %.c $(COMMON_H) $(COMMON_SQL_H) $(LIBCONFIG_H) @echo " CC $<" - @@CC@ @CFLAGS@ $(LIBCONFIG_INCLUDE) @MYSQL_CFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $< + @$(CC) @CFLAGS@ $(LIBCONFIG_INCLUDE) @MYSQL_CFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $< # missing object files -- cgit v1.2.3-70-g09d2