diff --git a/make.sh b/make.sh index f06c7551..99d2d436 100755 --- a/make.sh +++ b/make.sh @@ -100,3 +100,6 @@ perl -pi -e "s#\\\$\(CFLAGS\)#$CFLAGS#g" Makefile perl -pi -e "s#\\\$\(LIBS\)#$LIBS#g" Makefile make $1 $2 +if [ "$1" = "clean" ]; then + /bin/rm -f Makefile _os_bits.h +fi diff --git a/src/Makefile.in b/src/Makefile.in index 78b79758..eef66f63 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -22,7 +22,7 @@ HEADER_FILES = common_define.h hash.h chain.h logger.h base64.h \ avl_tree.h ioevent.h ioevent_loop.h fast_task_queue.h \ fast_timer.h process_ctrl.h fast_mblock.h connection_pool.h -ALL_OBJS = $(STATIC_OBJS) $(FAST_SHARED_OBJS) +ALL_OBJS = $(FAST_STATIC_OBJS) $(FAST_SHARED_OBJS) ALL_PRGS = SHARED_LIBS = libfastcommon.so @@ -35,9 +35,9 @@ libfastcommon.so: libfastcommon.a: $(FAST_STATIC_OBJS) ar rcs $@ $< .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: diff --git a/src/_os_bits.h b/src/_os_bits.h deleted file mode 100644 index 81e16262..00000000 --- a/src/_os_bits.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef _OS_BITS_H -#define _OS_BITS_H - -#define OS_BITS 64 -#define OFF_BITS 64 - -#endif