update

Makefile

@@ -1,67 +1,69 @@
-CC = gcc
-CXX = g++
-MAKE = make
-
-MKDIR = mkdir -p
-RM = rm -r
-CP = cp -r
-
-CFLAGS += -g -Wall -O3 
-CXXFLAGS += $(CFLAGS) -std=c++11
-
-INCDIR = include
-LIBDIR = lib
-SRCDIR = src
-BINDIR = bin
-DEPDIR = 3rd
-
-TARGET = test
-ifeq ($(OS),Windows_NT)
-TARGET := $(addsuffix .exe, $(TARGET))
-MAKE = mingw32-make
-endif
-
-DIRS += . $(SRCDIR) test
-SRCS += $(foreach dir, $(DIRS), $(wildcard $(dir)/*.c $(dir)/*.cc $(dir)/*.cpp))
-#OBJS := $(patsubst %.cpp, %.o, $(SRCS))
-OBJS := $(addsuffix .o, $(basename $(SRCS)))
-
-$(info TARGET=$(TARGET))
-$(info DIRS=$(DIRS))
-$(info SRCS=$(SRCS))
-$(info OBJS=$(OBJS))
-
-INCDIRS  += $(INCDIR) $(DEPDIR)/include $(DIRS)
-CPPFLAGS += $(addprefix -I, $(INCDIRS))
-
-LIBDIRS += $(LIBDIR) $(DEPDIR)/lib
-LDFLAGS += $(addprefix -L, $(LIBDIRS))
-LDFLAGS += -lpthread
-
-$(info CC=$(CC))
-$(info CXX=$(CXX))
-$(info MAKE=$(MAKE))
-$(info CFLAGS=$(CFLAGS))
-$(info CXXFLAGS=$(CXXFLAGS))
-$(info CPPFLAGS=$(CPPFLAGS))
-$(info LDFLAGS=$(LDFLAGS))
-
-default: all
-
-all: prepare $(TARGET)
-
-prepare:
-	$(MKDIR) $(BINDIR)
-
-$(TARGET): $(OBJS)
-	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $^ -o $(BINDIR)/$@ $(LDFLAGS)
-
-clean:
-	$(RM) $(OBJS)
-	$(RM) $(BINDIR)
-    
-install:
-
-uninstall:
-    
-.PHONY: default all prepare clean install uninstall
+CC = gcc
+CXX = g++
+
+MKDIR = mkdir -p
+RM = rm -r
+CP = cp -r
+
+CFLAGS += -g -Wall -O3
+CXXFLAGS += $(CFLAGS) -std=c++11
+
+INCDIR = include
+LIBDIR = lib
+SRCDIR = src
+BINDIR = bin
+DEPDIR = 3rd
+CONFDIR = etc
+
+TARGET = test
+ifeq ($(OS),Windows_NT)
+TARGET := $(addsuffix .exe, $(TARGET))
+endif
+
+DIRS += . test
+DIRS += $(shell find $(SRCDIR) -type d)
+SRCS += $(foreach dir, $(DIRS), $(wildcard $(dir)/*.c $(dir)/*.cc $(dir)/*.cpp))
+#OBJS := $(patsubst %.cpp, %.o, $(SRCS))
+OBJS := $(addsuffix .o, $(basename $(SRCS)))
+
+$(info TARGET=$(TARGET))
+$(info DIRS=$(DIRS))
+$(info SRCS=$(SRCS))
+$(info OBJS=$(OBJS))
+
+INCDIRS  += $(INCDIR) $(DEPDIR)/include $(DIRS)
+CPPFLAGS += $(addprefix -I, $(INCDIRS))
+
+LIBDIRS += $(LIBDIR) $(DEPDIR)/lib
+LDFLAGS += $(addprefix -L, $(LIBDIRS))
+#LDFLAGS += -wl,-Bstatic  -luv
+#LDFLAGS += -Wl,-Bdynamic -lm -lz -lpthread
+
+$(info CC=$(CC))
+$(info CXX=$(CXX))
+$(info MAKE=$(MAKE))
+$(info CFLAGS=$(CFLAGS))
+$(info CXXFLAGS=$(CXXFLAGS))
+$(info CPPFLAGS=$(CPPFLAGS))
+$(info LDFLAGS=$(LDFLAGS))
+
+default: all
+
+all: prepare $(TARGET)
+
+prepare:
+	$(MKDIR) $(BINDIR)
+
+$(TARGET): $(OBJS)
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $^ -o $(BINDIR)/$@ $(LDFLAGS)
+
+clean:
+	$(RM) $(OBJS)
+	$(RM) $(BINDIR)
+
+install:
+
+uninstall:
+
+.PHONY: default all prepare clean install uninstall
+