summaryrefslogtreecommitdiff
path: root/src/tool
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2016-11-19 20:30:27 +0100
committerHaru <haru@dotalux.com>2016-11-19 21:08:13 +0100
commitc6c30ef5e431cba1bc48900d0f558394bb112669 (patch)
treebfa9e10d8daf5a4cb7cf8e4cbd3b97a84bfb249e /src/tool
parent264767428aa06fc4e6a5238996b58637f586100f (diff)
downloadhercules-c6c30ef5e431cba1bc48900d0f558394bb112669.tar.gz
hercules-c6c30ef5e431cba1bc48900d0f558394bb112669.tar.bz2
hercules-c6c30ef5e431cba1bc48900d0f558394bb112669.tar.xz
hercules-c6c30ef5e431cba1bc48900d0f558394bb112669.zip
Extend the previous linker library order fix to other makefiles
This also fixed a typo (misplaced parentheses around LIBCONFIG_OBJ) in the *_DEPENDS variable of makefiles Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'src/tool')
-rw-r--r--src/tool/Makefile.in4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/tool/Makefile.in b/src/tool/Makefile.in
index eb1362780..6e8643c56 100644
--- a/src/tool/Makefile.in
+++ b/src/tool/Makefile.in
@@ -39,7 +39,7 @@ LIBCONFIG_H = $(addprefix $(LIBCONFIG_D)/, libconfig.h grammar.h parsectx.h \
MAPCACHE_OBJ = obj_all/mapcache.o
MAPCACHE_C = mapcache.c
MAPCACHE_H =
-MAPCACHE_DEPENDS = $(MAPCACHE_OBJ) $(COMMON_D)/obj_all/common_mini.a $(LIBCONFIG_OBJ $(SYSINFO_INC))
+MAPCACHE_DEPENDS = $(MAPCACHE_OBJ) $(COMMON_D)/obj_all/common_mini.a $(LIBCONFIG_OBJ) $(SYSINFO_INC)
@SET_MAKE@
@@ -55,7 +55,7 @@ mapcache: ../../mapcache@EXEEXT@
../../mapcache@EXEEXT@: $(MAPCACHE_DEPENDS) Makefile
@echo " LD $(notdir $@)"
- @$(CC) @STATIC@ @LDFLAGS@ -o ../../mapcache@EXEEXT@ $(MAPCACHE_DEPENDS) @LIBS@
+ @$(CC) @STATIC@ @LDFLAGS@ -o ../../mapcache@EXEEXT@ $(MAPCACHE_OBJ) $(COMMON_D)/obj_all/common_mini.a $(LIBCONFIG_OBJ) @LIBS@
buildclean:
@echo " CLEAN tool (build temp files)"