Merge branch 'hotfix/0.4.1'

lparam · Oct 18, 2015 · 4572606 · 4572606
2 parents 33f7d1f + 9e3fe74
commit 4572606
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 11 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,8 @@
+v0.4.1 (2015-10-18)
+-----------
+* Hotfix: Openwrt build script
+
+
 v0.4.0 (2015-10-18)
 -----------
 * Feature: Protect Android VpnService

diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 MAJOR = 0
 MINOR = 4
-PATCH = 0
+PATCH = 1
 NAME = xsocks
 
 ifdef O
@@ -36,10 +36,11 @@ endif
 ifdef CROSS
 CROSS_COMPILE = $(CROSS)
 HOST = $(patsubst %-,%,$(CROSS_COMPILE))
+endif
+
 ifneq (,$(findstring openwrt,$(CROSS_COMPILE)))
 OPENWRT = 1
 endif
-endif
 
 ifdef CROSS_COMPILE
 CPPFLAGS = -DCROSS_COMPILE
@@ -74,7 +75,8 @@ ifneq ($(OBJTREE),$(SRCTREE))
 CPPFLAGS += -I3rd/libsodium/src/libsodium/include/sodium
 CPPFLAGS += -I$(OBJTREE)/3rd/libsodium/src/libsodium/include
 endif
-CPPFLAGS += -I3rd/c-ares -I3rd/libcork/include -I3rd/libipset/include
+CPPFLAGS += -I3rd/c-ares
+CPPFLAGS += -I3rd/libcork/include -I3rd/libipset/include
 
 ifdef ANDROID
 	CPPFLAGS += -I3rd/libancillary
@@ -115,13 +117,13 @@ include $(SRCTREE)/config.mk
 #########################################################################
 
 ifdef OPENWRT
-all: libuv libsodium xsocks xtproxy xforwarder xtunnel
+all: libuv libsodium $(XSOCKS) $(XTPROXY) $(XFORWARDER) $(XTUNNEL)
 else
 all: libuv libsodium c-ares $(XSOCKSD) $(XSOCKS) $(XTPROXY) $(XFORWARDER) $(XTUNNEL)
 endif
 
 android: libuv libsodium $(XSOCKS) $(XFORWARDER)
-mingw32: libuv libsodium c-ares xsocksd.exe xsocks.exe xforwarder.exe xtunnel.exe
+mingw32: libuv libsodium c-ares $(XSOCKS).exe $(XTPROXY).exe $(XFORWARDER).exe $(XTUNNEL).exe
 
 3rd/libuv/autogen.sh:
 	$(Q)git submodule update --init
@@ -220,7 +222,7 @@ $(XSOCKSD): \
 	$(OBJTREE)/src/xsocksd.o
 	$(LINK) $^ -o $@ $(LDFLAGS) $(OBJTREE)/3rd/c-ares/.libs/libcares.a
 else
-xsocksd.exe: \
+$(XSOCKSD).exe: \
 	src/util.o \
 	src/logger.o \
 	src/common.o \
@@ -262,7 +264,7 @@ $(XSOCKS): \
 	| lib3rd
 	$(LINK) $^ -o $@ $(LDFLAGS) $(LIB3RD)
 else
-xsocks.exe: \
+$(XSOCKS).exe: \
 	src/util.o \
 	src/logger.o \
 	src/common.o \
@@ -308,7 +310,7 @@ $(XFORWARDER): \
 	$(OBJTREE)/src/xforwarder.o
 	$(LINK) $^ -o $@ $(LDFLAGS)
 else
-xforwarder.exe: \
+$(XFORWARDER).exe: \
 	src/util.o \
 	src/logger.o \
 	src/crypto.o \
@@ -336,7 +338,7 @@ $(XTUNNEL): \
 	$(OBJTREE)/src/xtunnel.o
 	$(LINK) $^ -o $@ $(LDFLAGS)
 else
-xtunnel.exe: \
+$(XTUNNEL).exe: \
 	src/util.o \
 	src/logger.o \
 	src/crypto.o \

diff --git a/openwrt/Makefile b/openwrt/Makefile
@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=xsocks
-PKG_VERSION:=0.4.0
+PKG_VERSION:=0.4.1
 PKG_RELEASE=
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz

diff --git a/src/common.h b/src/common.h
@@ -4,7 +4,7 @@
 #include "uv.h"
 #include "socks.h"
 
-#define XSOCKS_VERSION      "0.4.0"
+#define XSOCKS_VERSION      "0.4.1"
 
 struct server_context {
     int index;