diff options
Diffstat (limited to 'src/tool')
| -rw-r--r-- | src/tool/Makefile.in | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/src/tool/Makefile.in b/src/tool/Makefile.in index ee448a16a..307aa6d2c 100644 --- a/src/tool/Makefile.in +++ b/src/tool/Makefile.in @@ -1,19 +1,20 @@ +CONFIG_D = ../config +CONFIG_H = $(wildcard $(CONFIG_D)/*.h) $(wildcard $(CONFIG_D)/*/*.h) + COMMON_D = ../common COMMON_OBJ = $(addprefix $(COMMON_D)/obj_all/, des.o grfio.o malloc.o \ - miniconsole.o minicore.o showmsg.o strlib.o utils.o) + miniconsole.o minicore.o showmsg.o strlib.o utils.o) COMMON_H = $(addprefix $(COMMON_D)/, cbasetypes.h console.h core.h des.h \ - grfio.h malloc.h mmo.h showmsg.h strlib.h utils.h) + grfio.h malloc.h mmo.h showmsg.h strlib.h utils.h) LIBCONFIG_D = ../../3rdparty/libconfig LIBCONFIG_OBJ = $(addprefix $(LIBCONFIG_D)/, libconfig.o grammar.o scanctx.o \ - scanner.o strbuf.o) + scanner.o strbuf.o) LIBCONFIG_H = $(addprefix $(LIBCONFIG_D)/, libconfig.h grammar.h parsectx.h \ - scanctx.h scanner.h strbuf.h wincompat.h) + scanctx.h scanner.h strbuf.h wincompat.h) LIBCONFIG_INCLUDE = -I$(LIBCONFIG_D) -CONFIG_H = $(shell ls ../config/*.h ../config/*/*.h) - MAPCACHE_OBJ = obj_all/mapcache.o @SET_MAKE@ @@ -63,13 +64,13 @@ obj_all/%.o: %.c $(COMMON_H) $(CONFIG_H) $(LIBCONFIG_H) | obj_all @$(CC) @CFLAGS@ $(LIBCONFIG_INCLUDE) @CPPFLAGS@ -c $(OUTPUT_OPTION) $< # missing common object files -../common/obj_all/%.o: +$(COMMON_D)/obj_all/%.o: @echo " MAKE $@" - @$(MAKE) -C ../common sql + @$(MAKE) -C $(COMMON_D) sql -../common/obj_all/mini%.o: +$(COMMON_D)/obj_all/mini%.o: @echo " MAKE $@" - @$(MAKE) -C ../common sql + @$(MAKE) -C $(COMMON_D) sql $(LIBCONFIG_OBJ): @echo " MAKE $@" |