diff options
| author | shennetsind <notind@gmail.com> | 2013-05-17 11:08:38 -0700 |
|---|---|---|
| committer | shennetsind <notind@gmail.com> | 2013-05-17 11:08:38 -0700 |
| commit | 080f7a22740225df70a488849587b462a5d6b1a3 (patch) | |
| tree | 0c1dc751af9f06e1ce3729d271de301f78a4e611 /src/tool | |
| parent | 754af15505f32237f8063e51ae9a1cb90788dff4 (diff) | |
| parent | 25e848f1a0f9317d63106cae048a1ef838411cb2 (diff) | |
| download | hercules-080f7a22740225df70a488849587b462a5d6b1a3.tar.gz hercules-080f7a22740225df70a488849587b462a5d6b1a3.tar.bz2 hercules-080f7a22740225df70a488849587b462a5d6b1a3.tar.xz hercules-080f7a22740225df70a488849587b462a5d6b1a3.zip | |
Merge pull request #1 from Earisu/master
updating, with earisu's
Diffstat (limited to 'src/tool')
| -rw-r--r-- | src/tool/Makefile.in | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/tool/Makefile.in b/src/tool/Makefile.in index d72ef5405..1e149c2b3 100644 --- a/src/tool/Makefile.in +++ b/src/tool/Makefile.in @@ -1,10 +1,10 @@ COMMON_OBJ = ../common/obj_all/minicore.o ../common/obj_all/malloc.o \ ../common/obj_all/showmsg.o ../common/obj_all/strlib.o \ - ../common/obj_all/utils.o ../common/obj_all/des.o ../common/obj_all/grfio.o + ../common/obj_all/utils.o ../common/obj_all/des.o ../common/obj_all/grfio.o ../common/obj_all/miniconsole.o COMMON_H = ../common/core.h ../common/mmo.h \ ../common/malloc.h ../common/showmsg.h ../common/strlib.h \ - ../common/utils.h ../common/cbasetypes.h ../common/des.h ../common/grfio.h ../config/renewal.h + ../common/utils.h ../common/cbasetypes.h ../common/des.h ../common/grfio.h ../common/console.h ../config/renewal.h LIBCONFIG_OBJ = ../../3rdparty/libconfig/libconfig.o ../../3rdparty/libconfig/grammar.o \ ../../3rdparty/libconfig/scanctx.o ../../3rdparty/libconfig/scanner.o ../../3rdparty/libconfig/strbuf.o @@ -42,7 +42,8 @@ help: ##################################################################### obj_all: - -mkdir obj_all + @echo " MKDIR obj_all" + @-mkdir obj_all obj_all/%.o: %.c $(COMMON_H) $(OTHER_H) $(LIBCONFIG_H) @echo " CC $<" @@ -50,10 +51,10 @@ obj_all/%.o: %.c $(COMMON_H) $(OTHER_H) $(LIBCONFIG_H) # missing common object files ../common/obj_all/%.o: - @$(MAKE) -C ../common txt + @$(MAKE) -C ../common sql ../common/obj_all/mini%.o: - @$(MAKE) -C ../common txt + @$(MAKE) -C ../common sql LIBCONFIG_OBJ: @$(MAKE) -C ../../3rdparty/libconfig |