diff --git a/make.sh b/make.sh index e988b97..856b6da 100755 --- a/make.sh +++ b/make.sh @@ -125,3 +125,7 @@ perl -pi -e "s#\\\$\(LIBS\)#$LIBS#g" Makefile perl -pi -e "s#\\\$\(LIB_VERSION\)#$LIB_VERSION#g" Makefile make $1 $2 $3 +if [ "$1" = "clean" ]; then + /bin/rm -f Makefile _os_define.h +fi + diff --git a/src/Makefile.in b/src/Makefile.in index f06395f..f002ed0 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -26,7 +26,7 @@ HEADER_FILES = common_define.h hash.h chain.h logger.h base64.h \ fast_timer.h process_ctrl.h fast_mblock.h \ connection_pool.h fast_mpool.h -ALL_OBJS = $(STATIC_OBJS) $(FAST_SHARED_OBJS) +ALL_OBJS = $(FAST_STATIC_OBJS) $(FAST_SHARED_OBJS) ALL_PRGS = SHARED_LIBS = libfastcommon.so @@ -39,9 +39,9 @@ libfastcommon.so: libfastcommon.a: $(FAST_STATIC_OBJS) ar rcs $@ $(FAST_STATIC_OBJS) .o: - $(COMPILE) -o $@ $< $(STATIC_OBJS) $(LIB_PATH) $(INC_PATH) + $(COMPILE) -o $@ $< $(FAST_STATIC_OBJS) $(LIB_PATH) $(INC_PATH) .c: - $(COMPILE) -o $@ $< $(STATIC_OBJS) $(LIB_PATH) $(INC_PATH) + $(COMPILE) -o $@ $< $(FAST_STATIC_OBJS) $(LIB_PATH) $(INC_PATH) .c.o: $(COMPILE) -c -o $@ $< $(INC_PATH) .c.lo: