summaryrefslogtreecommitdiff
path: root/src/tool/Makefile.in
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2013-07-18 15:42:53 +0200
committerHaru <haru@dotalux.com>2013-07-21 20:26:46 +0200
commitd627f8f3cdebc07dfc54e762456f477806f0b3cb (patch)
tree5c5fa31945e2861d256d4bab2dbc2bf0372aa789 /src/tool/Makefile.in
parent2548a8cee42fae1225cd9ff3266beb4feb13dc83 (diff)
downloadhercules-d627f8f3cdebc07dfc54e762456f477806f0b3cb.tar.gz
hercules-d627f8f3cdebc07dfc54e762456f477806f0b3cb.tar.bz2
hercules-d627f8f3cdebc07dfc54e762456f477806f0b3cb.tar.xz
hercules-d627f8f3cdebc07dfc54e762456f477806f0b3cb.zip
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 <haru@dotalux.com>
Diffstat (limited to 'src/tool/Makefile.in')
-rw-r--r--src/tool/Makefile.in7
1 files changed, 5 insertions, 2 deletions
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: