bsnote
diff --git a/‎.gitignore‎
Lines changed: 2 additions & 4 deletions b/‎.gitignore‎
Lines changed: 2 additions & 4 deletions
diff --git a/‎Makefile‎
Lines changed: 9 additions & 27 deletions b/‎Makefile‎
Lines changed: 9 additions & 27 deletions
diff --git a/‎base.h‎ ‎native/base.h‎base.h renamed to native/base.h b/‎base.h‎ ‎native/base.h‎base.h renamed to native/base.h
diff --git a/‎callback.h‎ ‎native/callback.h‎callback.h renamed to native/callback.h b/‎callback.h‎ ‎native/callback.h‎callback.h renamed to native/callback.h
diff --git a/‎handle.h‎ ‎native/handle.h‎handle.h renamed to native/handle.h b/‎handle.h‎ ‎native/handle.h‎handle.h renamed to native/handle.h
diff --git a/‎http.h‎ ‎native/http.h‎http.h renamed to native/http.h b/‎http.h‎ ‎native/http.h‎http.h renamed to native/http.h
diff --git a/‎net.h‎ ‎native/net.h‎net.h renamed to native/net.h b/‎net.h‎ ‎native/net.h‎net.h renamed to native/net.h
diff --git a/‎stream.h‎ ‎native/stream.h‎stream.h renamed to native/stream.h b/‎stream.h‎ ‎native/stream.h‎stream.h renamed to native/stream.h
diff --git a/‎text.h‎ ‎native/text.h‎text.h renamed to native/text.h b/‎text.h‎ ‎native/text.h‎text.h renamed to native/text.h
diff --git a/‎webclient.cpp‎
Lines changed: 8 additions & 0 deletions b/‎webclient.cpp‎
Lines changed: 8 additions & 0 deletions
@@ -1,9 +1,7 @@
-*.a
-*.o
-sample
-
 .cproject
 .project
 .settings/*
 
+webclient
+webserver
 
@@ -1,38 +1,20 @@
-PROGNAME = sample
-LIBS = -lrt -lm -lpthread
-LIBUV_INC = $(LIBUV_PATH)/include
-HTTP_PARSER_INC = $(HTTP_PARSER_PATH)
-INCLUDES = -I$(LIBUV_INC) -I$(HTTP_PARSER_INC)
-LDFLAGS = 
-OBJECTS = sample.o $(LIBUV_PATH)/uv.a $(HTTP_PARSER_PATH)/http_parser.o
-CPPFLAGS = -std=gnu++0x
-CPPFLAGS_DEBUG = $(CPPFLAGS) -g -O0
+CXXFLAGS = -std=gnu++0x -g -O0 -I$(LIBUV_PATH)/include -I$(HTTP_PARSER_PATH) -I.
 
-all: env_req $(PROGNAME)
+all: webclient webserver
 
-$(PROGNAME): $(OBJECTS)
-	g++ -o $(PROGNAME) $(OBJECTS) $(LIBS) $(INCLUDES) $(LDFLAGS)
-
-$(OBJECTS): Makefile
+webclient: webclient.cpp $(LIBUV_PATH)/uv.a $(HTTP_PARSER_PATH)/http_parser.o $(wildcard native/*.h)
+	$(CXX) $(CXXFLAGS) -o webclient webclient.cpp $(LIBUV_PATH)/uv.a $(HTTP_PARSER_PATH)/http_parser.o -lrt -lm -lpthread	
+	
+webserver: webserver.cpp $(LIBUV_PATH)/uv.a $(HTTP_PARSER_PATH)/http_parser.o $(wildcard native/*.h)
+	$(CXX) $(CXXFLAGS) -o webserver webserver.cpp $(LIBUV_PATH)/uv.a $(HTTP_PARSER_PATH)/http_parser.o -lrt -lm -lpthread
 
 $(LIBUV_PATH)/uv.a:
 	$(MAKE) -C $(LIBUV_PATH)
 
 $(HTTP_PARSER_PATH)/http_parser.o:
 	$(MAKE) -C $(HTTP_PARSER_PATH) http_parser.o
-
-sample.o: sample.cpp $(wildcard *.h)
-	g++ -c $(CPPFLAGS_DEBUG) $(INCLUDES) -o sample.o sample.cpp 
-    
-env_req:
-ifndef LIBUV_PATH
-	$(error Variable 'LIBUV_PATH' must be set to the path of libuv library.)
-endif
-ifndef HTTP_PARSER_PATH
-	$(error Variable 'HTTP_PARSER_PATH' must be set to the path of http-parser library.)
-endif 
-
+	
 clean:
 	rm -f $(LIBUV_PATH)/uv.a
 	rm -f $(HTTP_PARSER_PATH)/http_parser.o
-	rm *.o $(PROGNAME)
+	rm -f webclient webserver
@@ -0,0 +1,8 @@
+#include <iostream>
+#include <native/http.h>
+using namespace native::http;
+
+int main()
+{
+	return native::run();
+}