makefile refactored

a100q100 · Jun 15, 2015 · 6f432a6 · 6f432a6
1 parent 1f95f0e
commit 6f432a6
Show file tree

Hide file tree

Showing 14 changed files with 89 additions and 42 deletions.
diff --git a/Makefile b/Makefile
@@ -1,4 +1,50 @@
+# OPT ?= -O2 -DNDEBUG
+# (B) Debug mode, w/ full line-level debugging symbols
+OPT ?= -g2
+# (C) Profiling mode: opt, but w/debugging symbols
+# OPT ?= -O2 -g2 -DNDEBUG
 $(shell ./build_config 1>&2)
 include config.mk
-default clean:
-	cd handy && make $@ || exit 1
+
+CFLAGS += -I. -I./include $(PLATFORM_CCFLAGS) $(OPT)
+CXXFLAGS += -I. -I./include $(PLATFORM_CXXFLAGS) $(OPT)
+
+LDFLAGS += $(PLATFORM_LDFLAGS)
+LIBS += $(PLATFORM_LIBS)
+
+HANDY_SOURCES += $(shell find handy -name '*.cc')
+HANDY_OBJECTS = $(HANDY_SOURCES:.cc=.o)
+
+TEST_SOURCES = $(shell find test -name '*.cc')
+TEST_OBJECTS = $(TEST_SOURCES:.cc=.o)
+
+EXAMPLE_SOURCES += $(shell find examples -name '*.cc')
+EXAMPLES = $(EXAMPLE_SOURCES:.cc=)
+
+LIBRARY = libhandy.a
+
+TARGETS = $(LIBRARY) handy_test $(EXAMPLES)
+
+default: $(TARGETS)
+handy_examples: $(EXAMPLES)
+$(EXAMPLES): $(LIBRARY)
+
+clean:
+			-rm -f $(TARGETS)
+			-rm -f */*.o
+
+$(LIBRARY): $(HANDY_OBJECTS)
+		rm -f $@
+			$(AR) -rs $@ $(HANDY_OBJECTS)
+
+handy_test: $(TEST_OBJECTS) $(LIBRARY)
+	$(CXX) $^ -o $@ $(LDFLAGS) $(LIBRARY) $(LIBS)
+
+.cc.o:
+		$(CXX) $(CXXFLAGS) -c $< -o $@
+
+.c.o:
+		$(CC) $(CFLAGS) -c $< -o $@
+
+.cc:
+	$(CXX) -o $@ $< $(CXXFLAGS) $(LDFLAGS) $(LIBRARY) $(LIBS)
diff --git a/build_config b/build_config
@@ -144,11 +144,18 @@ PLATFORM_IS_LITTLE_ENDIAN=$?
 
 $CXX -x c++ - -o $TMPDIR/handy_build_config.out >/dev/null 2>&1 <<EOF
 #include <sys/epoll.h>
-int main(){}
+int main() {}
 EOF
 [ $? = 0 ] && COMMON_FLAGS="$COMMON_FLAGS -DUSE_EPOLL"
 
-COMMON_FLAGS="$COMMON_FLAGS -DPLATFORM_IS_LITTLE_ENDIAN=$PLATFORM_IS_LITTLE_ENDIAN -std=c++11"
+$CXX -x c++ - -o $TMPDIR/handy_build_config.out >/dev/null 2>&1 <<EOF
+#include <openssl/ssl.h>
+int main() {}
+EOF
+[ $? = 0 ] && SSL=1 && ! [ -e ssl ] && git clone https://github.com/yedf/handy-ssl.git ssl
+[ x$SSL = x1 ] && PLATFORM_LIBS="$PLATFORM_LIBS -lssl -lcrypto"
+
+COMMON_FLAGS="$COMMON_FLAGS -DLITTLE_ENDIAN=$PLATFORM_IS_LITTLE_ENDIAN -std=c++11"
 PLATFORM_CCFLAGS="$PLATFORM_CCFLAGS $COMMON_FLAGS"
 PLATFORM_CXXFLAGS="$PLATFORM_CXXFLAGS $COMMON_FLAGS"
 
@@ -163,3 +170,6 @@ echo "PLATFORM_SHARED_CFLAGS=$PLATFORM_SHARED_CFLAGS" >> $OUTPUT
 echo "PLATFORM_SHARED_EXT=$PLATFORM_SHARED_EXT" >> $OUTPUT
 echo "PLATFORM_SHARED_LDFLAGS=$PLATFORM_SHARED_LDFLAGS" >> $OUTPUT
 echo "PLATFORM_SHARED_VERSIONED=$PLATFORM_SHARED_VERSIONED" >> $OUTPUT
+[ x$SSL = x1 ] && echo "HANDY_SOURCES=ssl/ssl-conn.cc" >> $OUTPUT
+[ x$SSL = x1 ] && echo "EXAMPLE_SOURCES=ssl/ssl-cli.cc ssl/ssl-svr.cc ssl/https-svr.cc" >> $OUTPUT
+
diff --git a/examples/chat.cc b/examples/chat.cc
@@ -1,7 +1,7 @@
-#include "conn.h"
-#include "logging.h"
-#include "daemon.h"
-#include "codec.h"
+#include <handy/conn.h>
+#include <handy/logging.h>
+#include <handy/daemon.h>
+#include <handy/codec.h>
 #include <map>
 
 using namespace std;

diff --git a/examples/codec-cli.cc b/examples/codec-cli.cc
@@ -1,7 +1,7 @@
-#include "conn.h"
-#include "logging.h"
-#include "daemon.h"
-#include "codec.h"
+#include <handy/conn.h>
+#include <handy/logging.h>
+#include <handy/daemon.h>
+#include <handy/codec.h>
 
 using namespace std;
 using namespace handy;

diff --git a/examples/codec-svr.cc b/examples/codec-svr.cc
@@ -1,6 +1,5 @@
-#include "conn.h"
-#include "logging.h"
-#include "daemon.h"
+#include <handy/conn.h>
+#include <handy/daemon.h>
 
 using namespace std;
 using namespace handy;

diff --git a/examples/daemon.cc b/examples/daemon.cc
@@ -1,7 +1,6 @@
-#include "conn.h"
-#include "conf.h"
-#include "logging.h"
-#include "daemon.h"
+#include <handy/conn.h>
+#include <handy/conf.h>
+#include <handy/daemon.h>
 
 using namespace std;
 using namespace handy;

diff --git a/examples/echo.cc b/examples/echo.cc
@@ -1,6 +1,5 @@
-#include "conn.h"
-#include "logging.h"
-#include "daemon.h"
+#include <handy/conn.h>
+#include <handy/daemon.h>
 
 using namespace std;
 using namespace handy;

diff --git a/examples/hsha.cc b/examples/hsha.cc
@@ -1,7 +1,5 @@
-#include "conn.h"
-#include "logging.h"
-#include "daemon.h"
-#include <signal.h>
+#include <handy/conn.h>
+#include <handy/daemon.h>
 
 using namespace std;
 using namespace handy;

diff --git a/examples/http-echo.cc b/examples/http-echo.cc
@@ -1,6 +1,5 @@
-#include "http.h"
-#include "logging.h"
-#include "daemon.h"
+#include <handy/http.h>
+#include <handy/daemon.h>
 
 using namespace std;
 using namespace handy;

diff --git a/examples/log.cc b/examples/log.cc
@@ -1,8 +1,6 @@
-#include "conn.h"
-#include "logging.h"
-#include "daemon.h"
-#include "codec.h"
-#include <map>
+#include <handy/logging.h>
+#include <unistd.h>
+#include <time.h>
 
 using namespace std;
 using namespace handy;

diff --git a/examples/stat.cc b/examples/stat.cc
@@ -1,7 +1,6 @@
-#include "http.h"
-#include "logging.h"
-#include "daemon.h"
-#include "stat-svr.h"
+#include <handy/http.h>
+#include <handy/daemon.h>
+#include <handy/stat-svr.h>
 
 using namespace std;
 using namespace handy;

diff --git a/examples/write-on-empty.cc b/examples/write-on-empty.cc
@@ -1,6 +1,5 @@
-#include "conn.h"
-#include "logging.h"
-#include "daemon.h"
+#include <handy/conn.h>
+#include <handy/daemon.h>
 #include <thread>
 
 using namespace std;

diff --git a/handy/handy-imp.h b/handy/handy-imp.h
@@ -1,4 +1,5 @@
 #pragma once
+#include "logging.h"
 #include "util.h"
 #include "net.h"
 #include "threads.h"

diff --git a/handy/port_posix.h b/handy/port_posix.h
@@ -3,7 +3,7 @@
 #include <string>
 namespace handy {
     namespace port {
-        static const int kLittleEndian = PLATFORM_IS_LITTLE_ENDIAN;
+        static const int kLittleEndian = LITTLE_ENDIAN;
         inline uint16_t htobe(uint16_t v) {
             if (!kLittleEndian) {
                 return v;