moved all headers under native dir; updated Makefile; added webserver…

…e and webclient sample app
d5 · Feb 6, 2012 · 78f355d · 78f355d
1 parent 50887e8
commit 78f355d
Show file tree

Hide file tree

Showing 11 changed files with 20 additions and 32 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,9 +1,7 @@
-*.a
-*.o
-sample
-
 .cproject
 .project
 .settings/*
 
+webclient
+webserver
 
diff --git a/Makefile b/Makefile
@@ -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
diff --git a/base.h → native/base.h b/base.h → native/base.h
diff --git a/callback.h → native/callback.h b/callback.h → native/callback.h
diff --git a/handle.h → native/handle.h b/handle.h → native/handle.h
diff --git a/http.h → native/http.h b/http.h → native/http.h
diff --git a/net.h → native/net.h b/net.h → native/net.h
diff --git a/stream.h → native/stream.h b/stream.h → native/stream.h
diff --git a/text.h → native/text.h b/text.h → native/text.h
diff --git a/webclient.cpp b/webclient.cpp
@@ -0,0 +1,8 @@
+#include <iostream>
+#include <native/http.h>
+using namespace native::http;
+
+int main()
+{
+	return native::run();
+}
diff --git a/sample.cpp → webserver.cpp b/sample.cpp → webserver.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "http.h"
+#include <native/http.h>
 using namespace native::http;
 
 int main()