diff options
author | shennetsind <ind@henn.et> | 2013-07-21 15:58:01 -0300 |
---|---|---|
committer | shennetsind <ind@henn.et> | 2013-07-21 15:58:01 -0300 |
commit | dede3fb8bdfdbb8c49ebc7e9b5a0a2665033f8e8 (patch) | |
tree | 9b90aeae8d8922479f34e0ae7ea1c4aa99f39365 /src/common | |
parent | b2e12fbc71d2e5e1005c9daa386345a45105be03 (diff) | |
parent | d627f8f3cdebc07dfc54e762456f477806f0b3cb (diff) | |
download | hercules-dede3fb8bdfdbb8c49ebc7e9b5a0a2665033f8e8.tar.gz hercules-dede3fb8bdfdbb8c49ebc7e9b5a0a2665033f8e8.tar.bz2 hercules-dede3fb8bdfdbb8c49ebc7e9b5a0a2665033f8e8.tar.xz hercules-dede3fb8bdfdbb8c49ebc7e9b5a0a2665033f8e8.zip |
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'src/common')
-rw-r--r-- | src/common/Makefile.in | 9 |
1 files changed, 6 insertions, 3 deletions
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 |