Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
com.ccwangluo.accelerator
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
sheteng
com.ccwangluo.accelerator
Commits
620d48df
Commit
620d48df
authored
Jan 10, 2013
by
Max Lv
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix compile issues
parent
5c58ed98
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
11 additions
and
638 deletions
+11
-638
.gitignore
.gitignore
+1
-3
assets/obfsproxy
assets/obfsproxy
+0
-0
assets/redsocks
assets/redsocks
+0
-0
jni/Android.mk
jni/Android.mk
+5
-1
jni/libevent/buffer.c
jni/libevent/buffer.c
+1
-0
jni/libevent/config.h
jni/libevent/config.h
+2
-2
jni/libevent/include/Makefile.am
jni/libevent/include/Makefile.am
+0
-47
jni/libevent/include/Makefile.in
jni/libevent/include/Makefile.in
+0
-584
jni/libevent/include/event2/event-config.h
jni/libevent/include/event2/event-config.h
+1
-1
jni/obfsproxy/micro-revision.i
jni/obfsproxy/micro-revision.i
+1
-0
No files found.
.gitignore
View file @
620d48df
...
...
@@ -11,9 +11,7 @@ tests/bin
tests/gen
tests/local.properties
NUL
libs/armeabi/polipo
libs/armeabi/pdnsd
libs/armeabi/shadowsocks
libs/armeabi/*
#Intellij IDEA
*.iml
...
...
assets/obfsproxy
0 → 100755
View file @
620d48df
File added
assets/redsocks
View file @
620d48df
No preview for this file type
jni/Android.mk
View file @
620d48df
...
...
@@ -61,12 +61,16 @@ OBFSPROXY_SOURCES := container.c crypt.c external.c \
main.c managed.c network.c
\
obfs_main.c protocol.c sha256.c
\
socks.c status.c util.c
\
protocols/dummy.c protocols/obfs2.c
LOCAL_STATIC_LIBRARIES
:=
libevent libcrypto
LOCAL_MODULE
:=
obfsproxy
LOCAL_SRC_FILES
:=
$(
addprefix
obfsproxy/,
$(OBFSPROXY_SOURCES)
)
LOCAL_CFLAGS
:=
-O2
-g
-I
$(LOCAL_PATH)
/obfsproxy
LOCAL_CFLAGS
:=
-O2
-g
-I
$(LOCAL_PATH)
/obfsproxy
\
-I
$(LOCAL_PATH)
/libevent/include
\
-I
$(LOCAL_PATH)
/libevent
\
-I
$(LOCAL_PATH)
/openssl/include
include
$(BUILD_EXECUTABLE)
...
...
jni/libevent/buffer.c
View file @
620d48df
...
...
@@ -90,6 +90,7 @@
#include "evthread-internal.h"
#include "evbuffer-internal.h"
#include "bufferevent-internal.h"
#include "event-internal.h"
/* some systems do not have MAP_FAILED */
#ifndef MAP_FAILED
...
...
jni/libevent/config.h
View file @
620d48df
...
...
@@ -273,7 +273,7 @@
#define HAVE_SYS_PARAM_H 1
/* Define to 1 if you have the <sys/queue.h> header file. */
/* #undef HAVE_SYS_QUEUE_H */
#define HAVE_SYS_QUEUE_H 1
/* Define to 1 if you have the <sys/select.h> header file. */
#define HAVE_SYS_SELECT_H 1
...
...
@@ -303,7 +303,7 @@
#define HAVE_SYS_WAIT_H 1
/* Define if TAILQ_FOREACH is defined in <sys/queue.h> */
#define TAILQ_FOREACH 1
/* #undef TAILQ_FOREACH */
/* Define if timeradd is defined in <sys/time.h> */
#define HAVE_TIMERADD 1
...
...
jni/libevent/include/Makefile.am
deleted
100644 → 0
View file @
5c58ed98
# include/Makefile.am for libevent
# Copyright 2000-2007 Niels Provos
# Copyright 2007-2012 Niels Provos and Nick Mathewson
#
# See LICENSE for copying information.
AUTOMAKE_OPTIONS
=
foreign
EVENT2_EXPORT
=
\
event2/buffer.h
\
event2/buffer_compat.h
\
event2/bufferevent.h
\
event2/bufferevent_compat.h
\
event2/bufferevent_ssl.h
\
event2/bufferevent_struct.h
\
event2/dns.h
\
event2/dns_compat.h
\
event2/dns_struct.h
\
event2/event.h
\
event2/event_compat.h
\
event2/event_struct.h
\
event2/http.h
\
event2/http_compat.h
\
event2/http_struct.h
\
event2/keyvalq_struct.h
\
event2/listener.h
\
event2/rpc.h
\
event2/rpc_compat.h
\
event2/rpc_struct.h
\
event2/tag.h
\
event2/tag_compat.h
\
event2/thread.h
\
event2/util.h
EXTRA_SRC
=
$(EVENT2_EXPORT)
## Without the nobase_ prefixing, Automake would strip "event2/" from
## the source header filename to derive the installed header filename.
## With nobase_ the installed path is $(includedir)/event2/ev*.h.
if
INSTALL_LIBEVENT
nobase_include_HEADERS
=
$(EVENT2_EXPORT)
nobase_nodist_include_HEADERS
=
./event2/event-config.h
else
noinst_HEADERS
=
$(EVENT2_EXPORT)
nodist_noinst_HEADERS
=
./event2/event-config.h
endif
jni/libevent/include/Makefile.in
deleted
100644 → 0
View file @
5c58ed98
# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
# Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
@SET_MAKE@
# include/Makefile.am for libevent
# Copyright 2000-2007 Niels Provos
# Copyright 2007-2012 Niels Provos and Nick Mathewson
#
# See LICENSE for copying information.
VPATH
=
@srcdir@
am__make_dryrun
=
\
{
\
am__dry
=
no
;
\
case
$$
MAKEFLAGS
in
\
*
\\
[
\ \
]
*
)
\
echo
'am--echo: ; @echo "AM" OK'
|
$(MAKE)
-f
- 2>/dev/null
\
|
grep
'^AM OK$$'
>
/dev/null
||
am__dry
=
yes
;;
\
*
)
\
for
am__flg
in
$$
MAKEFLAGS
;
do
\
case
$$
am__flg
in
\
*
=
*
|
--
*
)
;;
\
*
n
*
)
am__dry
=
yes
;
break
;;
\
esac
;
\
done
;;
\
esac
;
\
test
$$
am__dry
=
yes
;
\
}
pkgdatadir
=
$(datadir)
/@PACKAGE@
pkgincludedir
=
$(includedir)
/@PACKAGE@
pkglibdir
=
$(libdir)
/@PACKAGE@
pkglibexecdir
=
$(libexecdir)
/@PACKAGE@
am__cd
=
CDPATH
=
"
$
${
ZSH_VERSION
+.
}
$(PATH_SEPARATOR)
"
&&
cd
install_sh_DATA
=
$(install_sh)
-c
-m
644
install_sh_PROGRAM
=
$(install_sh)
-c
install_sh_SCRIPT
=
$(install_sh)
-c
INSTALL_HEADER
=
$(INSTALL_DATA)
transform
=
$(program_transform_name)
NORMAL_INSTALL
=
:
PRE_INSTALL
=
:
POST_INSTALL
=
:
NORMAL_UNINSTALL
=
:
PRE_UNINSTALL
=
:
POST_UNINSTALL
=
:
build_triplet
=
@build@
host_triplet
=
@host@
subdir
=
include
DIST_COMMON
=
$(am__nobase_include_HEADERS_DIST)
\
$(am__noinst_HEADERS_DIST)
$(srcdir)
/Makefile.am
\
$(srcdir)
/Makefile.in
ACLOCAL_M4
=
$(top_srcdir)
/aclocal.m4
am__aclocal_m4_deps
=
$(top_srcdir)
/m4/acx_pthread.m4
\
$(top_srcdir)
/m4/libtool.m4
$(top_srcdir)
/m4/ltoptions.m4
\
$(top_srcdir)
/m4/ltsugar.m4
$(top_srcdir)
/m4/ltversion.m4
\
$(top_srcdir)
/m4/lt~obsolete.m4
$(top_srcdir)
/configure.in
am__configure_deps
=
$(am__aclocal_m4_deps)
$(CONFIGURE_DEPENDENCIES)
\
$(ACLOCAL_M4)
mkinstalldirs
=
$(install_sh)
-d
CONFIG_HEADER
=
$(top_builddir)
/config.h
CONFIG_CLEAN_FILES
=
CONFIG_CLEAN_VPATH_FILES
=
SOURCES
=
DIST_SOURCES
=
am__can_run_installinfo
=
\
case
$$
AM_UPDATE_INFO_DIR
in
\
n|no|NO
)
false
;;
\
*
)
(
install-info
--version
)
>
/dev/null 2>&1
;;
\
esac
am__nobase_include_HEADERS_DIST
=
event2/buffer.h
\
event2/buffer_compat.h event2/bufferevent.h
\
event2/bufferevent_compat.h event2/bufferevent_ssl.h
\
event2/bufferevent_struct.h event2/dns.h event2/dns_compat.h
\
event2/dns_struct.h event2/event.h event2/event_compat.h
\
event2/event_struct.h event2/http.h event2/http_compat.h
\
event2/http_struct.h event2/keyvalq_struct.h event2/listener.h
\
event2/rpc.h event2/rpc_compat.h event2/rpc_struct.h
\
event2/tag.h event2/tag_compat.h event2/thread.h event2/util.h
am__vpath_adj_setup
=
srcdirstrip
=
`
echo
"
$(srcdir)
"
|
sed
's|.|.|g'
`
;
am__vpath_adj
=
case
$$
p
in
\
$(srcdir)
/
*
)
f
=
`
echo
"
$$
p"
|
sed
"s|^
$$
srcdirstrip/||"
`
;;
\
*
)
f
=
$$
p
;;
\
esac
;
am__strip_dir
=
f
=
`
echo
$$
p |
sed
-e
's|^.*/||'
`
;
am__install_max
=
40
am__nobase_strip_setup
=
\
srcdirstrip
=
`
echo
"
$(srcdir)
"
|
sed
's/[].[^$$\\*|]/\\\\&/g'
`
am__nobase_strip
=
\
for
p
in
$$
list
;
do
echo
"
$$
p"
;
done
|
sed
-e
"s|
$$
srcdirstrip/||"
am__nobase_list
=
$(am__nobase_strip_setup)
;
\
for
p
in
$$
list
;
do
echo
"
$$
p
$$
p"
;
done
|
\
sed
"s|
$$
srcdirstrip/| |;"
' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,'
|
\
$(AWK)
'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
if (++n[$$2] ==
$(am__install_max)
) \
{ print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
END { for (dir in files) print dir, files[dir] }'
am__base_list
=
\
sed
'$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
|
\
sed
'$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
am__uninstall_files_from_dir
=
{
\
test
-z
"
$$
files"
\
||
{
test
!
-d
"
$$
dir"
&&
test
!
-f
"
$$
dir"
&&
test
!
-r
"
$$
dir"
;
}
\
||
{
echo
" ( cd '
$$
dir' && rm -f"
$$
files
")"
;
\
$(am__cd)
"
$$
dir"
&&
rm
-f
$$
files
;
}
;
\
}
am__installdirs
=
"
$(DESTDIR)$(includedir)
"
"
$(DESTDIR)$(includedir)
"
am__noinst_HEADERS_DIST
=
event2/buffer.h event2/buffer_compat.h
\
event2/bufferevent.h event2/bufferevent_compat.h
\
event2/bufferevent_ssl.h event2/bufferevent_struct.h
\
event2/dns.h event2/dns_compat.h event2/dns_struct.h
\
event2/event.h event2/event_compat.h event2/event_struct.h
\
event2/http.h event2/http_compat.h event2/http_struct.h
\
event2/keyvalq_struct.h event2/listener.h event2/rpc.h
\
event2/rpc_compat.h event2/rpc_struct.h event2/tag.h
\
event2/tag_compat.h event2/thread.h event2/util.h
HEADERS
=
$(nobase_include_HEADERS)
$(nobase_nodist_include_HEADERS)
\
$(nodist_noinst_HEADERS)
$(noinst_HEADERS)
ETAGS
=
etags
CTAGS
=
ctags
DISTFILES
=
$(DIST_COMMON)
$(DIST_SOURCES)
$(TEXINFOS)
$(EXTRA_DIST)
ACLOCAL
=
@ACLOCAL@
AMTAR
=
@AMTAR@
AR
=
@AR@
AUTOCONF
=
@AUTOCONF@
AUTOHEADER
=
@AUTOHEADER@
AUTOMAKE
=
@AUTOMAKE@
AWK
=
@AWK@
CC
=
@CC@
CCDEPMODE
=
@CCDEPMODE@
CFLAGS
=
@CFLAGS@
CPP
=
@CPP@
CPPFLAGS
=
@CPPFLAGS@
CYGPATH_W
=
@CYGPATH_W@
DEFS
=
@DEFS@
DEPDIR
=
@DEPDIR@
DLLTOOL
=
@DLLTOOL@
DSYMUTIL
=
@DSYMUTIL@
DUMPBIN
=
@DUMPBIN@
ECHO_C
=
@ECHO_C@
ECHO_N
=
@ECHO_N@
ECHO_T
=
@ECHO_T@
EGREP
=
@EGREP@
EV_LIB_GDI
=
@EV_LIB_GDI@
EV_LIB_WS32
=
@EV_LIB_WS32@
EXEEXT
=
@EXEEXT@
FGREP
=
@FGREP@
GREP
=
@GREP@
INSTALL
=
@INSTALL@
INSTALL_DATA
=
@INSTALL_DATA@
INSTALL_PROGRAM
=
@INSTALL_PROGRAM@
INSTALL_SCRIPT
=
@INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM
=
@INSTALL_STRIP_PROGRAM@
LD
=
@LD@
LDFLAGS
=
@LDFLAGS@
LIBEVENT_GC_SECTIONS
=
@LIBEVENT_GC_SECTIONS@
LIBOBJS
=
@LIBOBJS@
LIBS
=
@LIBS@
LIBTOOL
=
@LIBTOOL@
LIBTOOL_DEPS
=
@LIBTOOL_DEPS@
LIPO
=
@LIPO@
LN_S
=
@LN_S@
LTLIBOBJS
=
@LTLIBOBJS@
MAKEINFO
=
@MAKEINFO@
MANIFEST_TOOL
=
@MANIFEST_TOOL@
MKDIR_P
=
@MKDIR_P@
NM
=
@NM@
NMEDIT
=
@NMEDIT@
OBJDUMP
=
@OBJDUMP@
OBJEXT
=
@OBJEXT@
OPENSSL_LIBADD
=
@OPENSSL_LIBADD@
OPENSSL_LIBS
=
@OPENSSL_LIBS@
OTOOL
=
@OTOOL@
OTOOL64
=
@OTOOL64@
PACKAGE
=
@PACKAGE@
PACKAGE_BUGREPORT
=
@PACKAGE_BUGREPORT@
PACKAGE_NAME
=
@PACKAGE_NAME@
PACKAGE_STRING
=
@PACKAGE_STRING@
PACKAGE_TARNAME
=
@PACKAGE_TARNAME@
PACKAGE_URL
=
@PACKAGE_URL@
PACKAGE_VERSION
=
@PACKAGE_VERSION@
PATH_SEPARATOR
=
@PATH_SEPARATOR@
PTHREAD_CC
=
@PTHREAD_CC@
PTHREAD_CFLAGS
=
@PTHREAD_CFLAGS@
PTHREAD_LIBS
=
@PTHREAD_LIBS@
RANLIB
=
@RANLIB@
SED
=
@SED@
SET_MAKE
=
@SET_MAKE@
SHELL
=
@SHELL@
STRIP
=
@STRIP@
VERSION
=
@VERSION@
ZLIB_LIBS
=
@ZLIB_LIBS@
abs_builddir
=
@abs_builddir@
abs_srcdir
=
@abs_srcdir@
abs_top_builddir
=
@abs_top_builddir@
abs_top_srcdir
=
@abs_top_srcdir@
ac_ct_AR
=
@ac_ct_AR@
ac_ct_CC
=
@ac_ct_CC@
ac_ct_DUMPBIN
=
@ac_ct_DUMPBIN@
acx_pthread_config
=
@acx_pthread_config@
am__include
=
@am__include@
am__leading_dot
=
@am__leading_dot@
am__quote
=
@am__quote@
am__tar
=
@am__tar@
am__untar
=
@am__untar@
bindir
=
@bindir@
build
=
@build@
build_alias
=
@build_alias@
build_cpu
=
@build_cpu@
build_os
=
@build_os@
build_vendor
=
@build_vendor@
builddir
=
@builddir@
datadir
=
@datadir@
datarootdir
=
@datarootdir@
docdir
=
@docdir@
dvidir
=
@dvidir@
exec_prefix
=
@exec_prefix@
host
=
@host@
host_alias
=
@host_alias@
host_cpu
=
@host_cpu@
host_os
=
@host_os@
host_vendor
=
@host_vendor@
htmldir
=
@htmldir@
includedir
=
@includedir@
infodir
=
@infodir@
install_sh
=
@install_sh@
libdir
=
@libdir@
libexecdir
=
@libexecdir@
localedir
=
@localedir@
localstatedir
=
@localstatedir@
mandir
=
@mandir@
mkdir_p
=
@mkdir_p@
oldincludedir
=
@oldincludedir@
pdfdir
=
@pdfdir@
prefix
=
@prefix@
program_transform_name
=
@program_transform_name@
psdir
=
@psdir@
sbindir
=
@sbindir@
sharedstatedir
=
@sharedstatedir@
srcdir
=
@srcdir@
sysconfdir
=
@sysconfdir@
target_alias
=
@target_alias@
top_build_prefix
=
@top_build_prefix@
top_builddir
=
@top_builddir@
top_srcdir
=
@top_srcdir@
AUTOMAKE_OPTIONS
=
foreign
EVENT2_EXPORT
=
\
event2/buffer.h
\
event2/buffer_compat.h
\
event2/bufferevent.h
\
event2/bufferevent_compat.h
\
event2/bufferevent_ssl.h
\
event2/bufferevent_struct.h
\
event2/dns.h
\
event2/dns_compat.h
\
event2/dns_struct.h
\
event2/event.h
\
event2/event_compat.h
\
event2/event_struct.h
\
event2/http.h
\
event2/http_compat.h
\
event2/http_struct.h
\
event2/keyvalq_struct.h
\
event2/listener.h
\
event2/rpc.h
\
event2/rpc_compat.h
\
event2/rpc_struct.h
\
event2/tag.h
\
event2/tag_compat.h
\
event2/thread.h
\
event2/util.h
EXTRA_SRC
=
$(EVENT2_EXPORT)
@INSTALL_LIBEVENT_TRUE@
nobase_include_HEADERS
=
$(EVENT2_EXPORT)
@INSTALL_LIBEVENT_TRUE@
nobase_nodist_include_HEADERS
=
./event2/event-config.h
@INSTALL_LIBEVENT_FALSE@
noinst_HEADERS
=
$(EVENT2_EXPORT)
@INSTALL_LIBEVENT_FALSE@
nodist_noinst_HEADERS
=
./event2/event-config.h
all
:
all-am
.SUFFIXES
:
$(srcdir)/Makefile.in
:
$(srcdir)/Makefile.am $(am__configure_deps)
@
for
dep
in
$?
;
do
\
case
'
$(am__configure_deps)
'
in
\
*
$$
dep
*
)
\
(
cd
$(top_builddir)
&&
$(MAKE)
$(AM_MAKEFLAGS)
am--refresh
)
\
&&
{
if
test
-f
$@
;
then
exit
0
;
else
break
;
fi
;
}
;
\
exit
1
;;
\
esac
;
\
done
;
\
echo
' cd
$(top_srcdir)
&&
$(AUTOMAKE)
--foreign include/Makefile'
;
\
$(am__cd)
$(top_srcdir)
&&
\
$(AUTOMAKE)
--foreign
include/Makefile
.PRECIOUS
:
Makefile
Makefile
:
$(srcdir)/Makefile.in $(top_builddir)/config.status
@
case
'$?'
in
\
*
config.status
*
)
\
cd
$(top_builddir)
&&
$(MAKE)
$(AM_MAKEFLAGS)
am--refresh
;;
\
*
)
\
echo
' cd
$(top_builddir)
&&
$(SHELL)
./config.status
$(subdir)
/$@
$(am__depfiles_maybe)
'
;
\
cd
$(top_builddir)
&&
$(SHELL)
./config.status
$(subdir)
/
$@
$(am__depfiles_maybe)
;;
\
esac
;
$(top_builddir)/config.status
:
$(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd
$(top_builddir)
&&
$(MAKE)
$(AM_MAKEFLAGS)
am--refresh
$(top_srcdir)/configure
:
$(am__configure_deps)
cd
$(top_builddir)
&&
$(MAKE)
$(AM_MAKEFLAGS)
am--refresh
$(ACLOCAL_M4)
:
$(am__aclocal_m4_deps)
cd
$(top_builddir)
&&
$(MAKE)
$(AM_MAKEFLAGS)
am--refresh
$(am__aclocal_m4_deps)
:
mostlyclean-libtool
:
-
rm
-f
*
.lo
clean-libtool
:
-
rm
-rf
.libs _libs
install-nobase_includeHEADERS
:
$(nobase_include_HEADERS)
@
$(NORMAL_INSTALL)
@
list
=
'
$(nobase_include_HEADERS)
'
;
test
-n
"
$(includedir)
"
||
list
=
;
\
if
test
-n
"
$$
list"
;
then
\
echo
"
$(MKDIR_P)
'
$(DESTDIR)$(includedir)
'"
;
\
$(MKDIR_P)
"
$(DESTDIR)$(includedir)
"
||
exit
1
;
\
fi
;
\
$(am__nobase_list)
|
while
read dir
files
;
do
\
xfiles
=
;
for
file
in
$$
files
;
do
\
if
test
-f
"
$$
file"
;
then
xfiles
=
"
$$
xfiles
$$
file"
;
\
else
xfiles
=
"
$$
xfiles
$(srcdir)
/
$$
file"
;
fi
;
done
;
\
test
-z
"
$$
xfiles"
||
{
\
test
"x
$$
dir"
=
x.
||
{
\
echo
"
$(MKDIR_P)
'
$(DESTDIR)$(includedir)
/
$$
dir'"
;
\
$(MKDIR_P)
"
$(DESTDIR)$(includedir)
/
$$
dir"
;
}
;
\
echo
"
$(INSTALL_HEADER)
$$
xfiles '
$(DESTDIR)$(includedir)
/
$$
dir'"
;
\
$(INSTALL_HEADER)
$$
xfiles
"
$(DESTDIR)$(includedir)
/
$$
dir"
||
exit
$$
?
;
}
;
\
done
uninstall-nobase_includeHEADERS
:
@
$(NORMAL_UNINSTALL)
@
list
=
'
$(nobase_include_HEADERS)
'
;
test
-n
"
$(includedir)
"
||
list
=
;
\
$(am__nobase_strip_setup)
;
files
=
`
$(am__nobase_strip)
`
;
\
dir
=
'
$(DESTDIR)$(includedir)
'
;
$(am__uninstall_files_from_dir)
install-nobase_nodist_includeHEADERS
:
$(nobase_nodist_include_HEADERS)
@
$(NORMAL_INSTALL)
@
list
=
'
$(nobase_nodist_include_HEADERS)
'
;
test
-n
"
$(includedir)
"
||
list
=
;
\
if
test
-n
"
$$
list"
;
then
\
echo
"
$(MKDIR_P)
'
$(DESTDIR)$(includedir)
'"
;
\
$(MKDIR_P)
"
$(DESTDIR)$(includedir)
"
||
exit
1
;
\
fi
;
\
$(am__nobase_list)
|
while
read dir
files
;
do
\
xfiles
=
;
for
file
in
$$
files
;
do
\
if
test
-f
"
$$
file"
;
then
xfiles
=
"
$$
xfiles
$$
file"
;
\
else
xfiles
=
"
$$
xfiles
$(srcdir)
/
$$
file"
;
fi
;
done
;
\
test
-z
"
$$
xfiles"
||
{
\
test
"x
$$
dir"
=
x.
||
{
\
echo
"
$(MKDIR_P)
'
$(DESTDIR)$(includedir)
/
$$
dir'"
;
\
$(MKDIR_P)
"
$(DESTDIR)$(includedir)
/
$$
dir"
;
}
;
\
echo
"
$(INSTALL_HEADER)
$$
xfiles '
$(DESTDIR)$(includedir)
/
$$
dir'"
;
\
$(INSTALL_HEADER)
$$
xfiles
"
$(DESTDIR)$(includedir)
/
$$
dir"
||
exit
$$
?
;
}
;
\
done
uninstall-nobase_nodist_includeHEADERS
:
@
$(NORMAL_UNINSTALL)
@
list
=
'
$(nobase_nodist_include_HEADERS)
'
;
test
-n
"
$(includedir)
"
||
list
=
;
\
$(am__nobase_strip_setup)
;
files
=
`
$(am__nobase_strip)
`
;
\
dir
=
'
$(DESTDIR)$(includedir)
'
;
$(am__uninstall_files_from_dir)
ID
:
$(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list
=
'
$(SOURCES)
$(HEADERS)
$(LISP)
$(TAGS_FILES)
'
;
\
unique
=
`
for
i
in
$$
list
;
do
\
if
test
-f
"
$$
i"
;
then
echo
$$
i
;
else
echo
$(srcdir)
/
$$
i
;
fi
;
\
done
|
\
$(AWK)
'{ files[$$0] = 1; nonempty = 1; } \
END { if (nonempty) { for (i in files) print i; }; }'
`
;
\
mkid
-fID
$$
unique
tags
:
TAGS
TAGS
:
$(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES)
\
$(TAGS_FILES) $(LISP)
set
x
;
\
here
=
`
pwd
`
;
\
list
=
'
$(SOURCES)
$(HEADERS)
$(LISP)
$(TAGS_FILES)
'
;
\
unique
=
`
for
i
in
$$
list
;
do
\
if
test
-f
"
$$
i"
;
then
echo
$$
i
;
else
echo
$(srcdir)
/
$$
i
;
fi
;
\
done
|
\
$(AWK)
'{ files[$$0] = 1; nonempty = 1; } \
END { if (nonempty) { for (i in files) print i; }; }'
`
;
\
shift
;
\
if
test
-z
"
$(ETAGS_ARGS)$$
*
$$
unique"
;
then
:
;
else
\
test
-n
"
$$
unique"
||
unique
=
$$
empty_fix
;
\
if
test
$$
# -gt 0; then
\
$(ETAGS)
$(ETAGSFLAGS)
$(AM_ETAGSFLAGS)
$(ETAGS_ARGS)
\
"
$$
@"
$$
unique
;
\
else
\
$(ETAGS)
$(ETAGSFLAGS)
$(AM_ETAGSFLAGS)
$(ETAGS_ARGS)
\
$$
unique
;
\
fi
;
\
fi
ctags
:
CTAGS
CTAGS
:
$(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES)
\
$(TAGS_FILES) $(LISP)
list
=
'
$(SOURCES)
$(HEADERS)
$(LISP)
$(TAGS_FILES)
'
;
\
unique
=
`
for
i
in
$$
list
;
do
\
if
test
-f
"
$$
i"
;
then
echo
$$
i
;
else
echo
$(srcdir)
/
$$
i
;
fi
;
\
done
|
\
$(AWK)
'{ files[$$0] = 1; nonempty = 1; } \
END { if (nonempty) { for (i in files) print i; }; }'
`
;
\
test
-z
"
$(CTAGS_ARGS)$$
unique"
\
||
$(CTAGS)
$(CTAGSFLAGS)
$(AM_CTAGSFLAGS)
$(CTAGS_ARGS)
\
$$
unique
GTAGS
:
here
=
`
$(am__cd)
$(top_builddir)
&&
pwd
`
\
&&
$(am__cd)
$(top_srcdir)
\
&&
gtags
-i
$(GTAGS_ARGS)
"
$$
here"
distclean-tags
:
-
rm
-f
TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir
:
$(DISTFILES)
@
srcdirstrip
=
`
echo
"
$(srcdir)
"
|
sed
's/[].[^$$\\*]/\\\\&/g'
`
;
\
topsrcdirstrip
=
`
echo
"
$(top_srcdir)
"
|
sed
's/[].[^$$\\*]/\\\\&/g'
`
;
\
list
=
'
$(DISTFILES)
'
;
\
dist_files
=
`
for
file
in
$$
list
;
do
echo
$$
file
;
done
|
\
sed
-e
"s|^
$$
srcdirstrip/||;t"
\
-e
"s|^
$$
topsrcdirstrip/|
$(top_builddir)
/|;t"
`
;
\
case
$$
dist_files
in
\
*
/
*
)
$(MKDIR_P)
`
echo
"
$$
dist_files"
|
\
sed
'/\//!d;s|^|
$(distdir)
/|;s,/[^/]*$$,,'
|
\
sort
-u
`
;;
\
esac
;
\
for
file
in
$$
dist_files
;
do
\
if
test
-f
$$
file
||
test
-d
$$
file
;
then
d
=
.
;
else
d
=
$(srcdir)
;
fi
;
\
if
test
-d
$$
d/
$$
file
;
then
\
dir
=
`
echo
"/
$$
file"
|
sed
-e
's,/[^/]*$$,,'
`
;
\
if
test
-d
"
$(distdir)
/
$$
file"
;
then
\
find
"
$(distdir)
/
$$
file"
-type
d
!
-perm
-700
-exec
chmod
u+rwx
{}
\;
;
\
fi
;
\
if
test
-d
$(srcdir)
/
$$
file
&&
test
$$
d
!=
$(srcdir)
;
then
\
cp
-fpR
$(srcdir)
/
$$
file
"
$(distdir)$$
dir"
||
exit
1
;
\
find
"
$(distdir)
/
$$
file"
-type
d
!
-perm
-700
-exec
chmod
u+rwx
{}
\;
;
\
fi
;
\
cp
-fpR
$$
d/
$$
file
"
$(distdir)$$
dir"
||
exit
1
;
\
else
\
test
-f
"
$(distdir)
/
$$
file"
\
||
cp
-p
$$
d/
$$
file
"
$(distdir)
/
$$
file"
\
||
exit
1
;
\
fi
;
\
done
check-am
:
all-am
check
:
check-am
all-am
:
Makefile $(HEADERS)
installdirs
:
for
dir
in
"
$(DESTDIR)$(includedir)
"
"
$(DESTDIR)$(includedir)
"
;
do
\
test
-z
"
$$
dir"
||
$(MKDIR_P)
"
$$
dir"
;
\
done
install
:
install-am
install-exec
:
install-exec-am
install-data
:
install-data-am
uninstall
:
uninstall-am
install-am
:
all-am
@
$(MAKE)
$(AM_MAKEFLAGS)
install-exec-am install-data-am
installcheck
:
installcheck-am
install-strip
:
if
test
-z
'
$(STRIP)
'
;
then
\
$(MAKE)
$(AM_MAKEFLAGS)
INSTALL_PROGRAM
=
"
$(INSTALL_STRIP_PROGRAM)
"
\
install_sh_PROGRAM
=
"
$(INSTALL_STRIP_PROGRAM)
"
INSTALL_STRIP_FLAG
=
-s
\
install
;
\
else
\
$(MAKE)
$(AM_MAKEFLAGS)
INSTALL_PROGRAM
=
"
$(INSTALL_STRIP_PROGRAM)
"
\
install_sh_PROGRAM
=
"
$(INSTALL_STRIP_PROGRAM)
"
INSTALL_STRIP_FLAG
=
-s
\
"INSTALL_PROGRAM_ENV=STRIPPROG='
$(STRIP)
'"
install
;
\
fi
mostlyclean-generic
:
clean-generic
:
distclean-generic
:
-
test
-z
"
$(CONFIG_CLEAN_FILES)
"
||
rm
-f
$(CONFIG_CLEAN_FILES)
-
test
.
=
"
$(srcdir)
"
||
test
-z
"
$(CONFIG_CLEAN_VPATH_FILES)
"
||
rm
-f
$(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic
:
@
echo
"This command is intended for maintainers to use"
@
echo
"it deletes files that may require special tools to rebuild."
clean
:
clean-am
clean-am
:
clean-generic clean-libtool mostlyclean-am
distclean
:
distclean-am
-
rm
-f
Makefile
distclean-am
:
clean-am distclean-generic distclean-tags
dvi
:
dvi-am
dvi-am
:
html
:
html-am
html-am
:
info
:
info-am
info-am
:
install-data-am
:
install-nobase_includeHEADERS
\
install-nobase_nodist_includeHEADERS
install-dvi
:
install-dvi-am
install-dvi-am
:
install-exec-am
:
install-html
:
install-html-am
install-html-am
:
install-info
:
install-info-am
install-info-am
:
install-man
:
install-pdf
:
install-pdf-am
install-pdf-am
:
install-ps
:
install-ps-am
install-ps-am
:
installcheck-am
:
maintainer-clean
:
maintainer-clean-am
-
rm
-f
Makefile
maintainer-clean-am
:
distclean-am maintainer-clean-generic
mostlyclean
:
mostlyclean-am
mostlyclean-am
:
mostlyclean-generic mostlyclean-libtool
pdf
:
pdf-am
pdf-am
:
ps
:
ps-am
ps-am
:
uninstall-am
:
uninstall-nobase_includeHEADERS
\
uninstall-nobase_nodist_includeHEADERS
.MAKE
:
install-am install-strip
.PHONY
:
CTAGS GTAGS all all-am check check-am clean clean-generic
\
clean-libtool ctags distclean distclean-generic
\
distclean-libtool distclean-tags distdir dvi dvi-am html
\
html-am info info-am install install-am install-data
\
install-data-am install-dvi install-dvi-am install-exec
\
install-exec-am install-html install-html-am install-info
\
install-info-am install-man install-nobase_includeHEADERS
\
install-nobase_nodist_includeHEADERS install-pdf
\
install-pdf-am install-ps install-ps-am install-strip
\
installcheck installcheck-am installdirs maintainer-clean
\
maintainer-clean-generic mostlyclean mostlyclean-generic
\
mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall
\
uninstall-am uninstall-nobase_includeHEADERS
\
uninstall-nobase_nodist_includeHEADERS
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT
:
jni/libevent/include/event2/event-config.h
View file @
620d48df
...
...
@@ -316,7 +316,7 @@
#define _EVENT_HAVE_SYS_WAIT_H 1
/* Define if TAILQ_FOREACH is defined in <sys/queue.h> */
#define _EVENT_HAVE_TAILQFOREACH 1
/* #undef _EVENT_HAVE_TAILQFOREACH */
/* Define if timeradd is defined in <sys/time.h> */
#define _EVENT_HAVE_TIMERADD 1
...
...
jni/obfsproxy/micro-revision.i
0 → 100644
View file @
620d48df
"94ebc4c3edf1e3e5"
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment