Skip to content

Commit 96e1a99

Browse files
committed
Revert "Don't compile ss-manager ss-server and ss-tunnel"
This reverts commit 44ae136.
1 parent 9a8b81d commit 96e1a99

20 files changed

+6687
-10380
lines changed

Makefile.in

+23-35
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
# Makefile.in generated by automake 1.15 from Makefile.am.
1+
# Makefile.in generated by automake 1.14.1 from Makefile.am.
22
# @configure_input@
33

4-
# Copyright (C) 1994-2014 Free Software Foundation, Inc.
4+
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
55

66
# This Makefile.in is free software; the Free Software Foundation
77
# gives unlimited permission to copy and/or distribute it,
@@ -15,17 +15,7 @@
1515
@SET_MAKE@
1616

1717
VPATH = @srcdir@
18-
am__is_gnu_make = { \
19-
if test -z '$(MAKELEVEL)'; then \
20-
false; \
21-
elif test -n '$(MAKE_HOST)'; then \
22-
true; \
23-
elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
24-
true; \
25-
else \
26-
false; \
27-
fi; \
28-
}
18+
am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
2919
am__make_running_with_option = \
3020
case $${target_option-} in \
3121
?) ;; \
@@ -90,6 +80,16 @@ build_triplet = @build@
9080
host_triplet = @host@
9181
@ENABLE_DOCUMENTATION_TRUE@am__append_1 = doc
9282
subdir = .
83+
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
84+
$(top_srcdir)/configure $(am__configure_deps) \
85+
$(srcdir)/config.h.in $(srcdir)/shadowsocks-libev.pc.in \
86+
AUTHORS COPYING INSTALL auto/ar-lib auto/compile \
87+
auto/config.guess auto/config.rpath auto/config.sub \
88+
auto/depcomp auto/install-sh auto/missing auto/ltmain.sh \
89+
$(top_srcdir)/auto/ar-lib $(top_srcdir)/auto/compile \
90+
$(top_srcdir)/auto/config.guess $(top_srcdir)/auto/config.sub \
91+
$(top_srcdir)/auto/install-sh $(top_srcdir)/auto/ltmain.sh \
92+
$(top_srcdir)/auto/missing
9393
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
9494
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pthread.m4 \
9595
$(top_srcdir)/m4/ax_tls.m4 $(top_srcdir)/m4/inet_ntop.m4 \
@@ -102,8 +102,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pthread.m4 \
102102
$(top_srcdir)/libev/libev.m4 $(top_srcdir)/configure.ac
103103
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
104104
$(ACLOCAL_M4)
105-
DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
106-
$(am__configure_deps) $(am__DIST_COMMON)
107105
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
108106
configure.lineno config.status.lineno
109107
mkinstalldirs = $(install_sh) -d
@@ -196,14 +194,6 @@ ETAGS = etags
196194
CTAGS = ctags
197195
CSCOPE = cscope
198196
DIST_SUBDIRS = libsodium libcork libipset libudns libev src doc
199-
am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
200-
$(srcdir)/shadowsocks-libev.pc.in $(top_srcdir)/auto/ar-lib \
201-
$(top_srcdir)/auto/compile $(top_srcdir)/auto/config.guess \
202-
$(top_srcdir)/auto/config.sub $(top_srcdir)/auto/install-sh \
203-
$(top_srcdir)/auto/ltmain.sh $(top_srcdir)/auto/missing \
204-
AUTHORS COPYING INSTALL auto/ar-lib auto/compile \
205-
auto/config.guess auto/config.rpath auto/config.sub \
206-
auto/depcomp auto/install-sh auto/ltmain.sh auto/missing
207197
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
208198
distdir = $(PACKAGE)-$(VERSION)
209199
top_distdir = $(distdir)
@@ -289,7 +279,6 @@ LIBTOOL = @LIBTOOL@
289279
LIPO = @LIPO@
290280
LN_S = @LN_S@
291281
LTLIBOBJS = @LTLIBOBJS@
292-
LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
293282
MAINT = @MAINT@
294283
MAKEINFO = @MAKEINFO@
295284
MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -314,6 +303,7 @@ PTHREAD_CC = @PTHREAD_CC@
314303
PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
315304
PTHREAD_LIBS = @PTHREAD_LIBS@
316305
RANLIB = @RANLIB@
306+
RM = @RM@
317307
SED = @SED@
318308
SET_MAKE = @SET_MAKE@
319309
SHELL = @SHELL@
@@ -367,7 +357,6 @@ pdfdir = @pdfdir@
367357
prefix = @prefix@
368358
program_transform_name = @program_transform_name@
369359
psdir = @psdir@
370-
runstatedir = @runstatedir@
371360
sbindir = @sbindir@
372361
sharedstatedir = @sharedstatedir@
373362
srcdir = @srcdir@
@@ -403,6 +392,7 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
403392
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
404393
$(am__cd) $(top_srcdir) && \
405394
$(AUTOMAKE) --foreign Makefile
395+
.PRECIOUS: Makefile
406396
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
407397
@case '$?' in \
408398
*config.status*) \
@@ -656,15 +646,15 @@ dist-xz: distdir
656646
$(am__post_remove_distdir)
657647

658648
dist-tarZ: distdir
659-
@echo WARNING: "Support for distribution archives compressed with" \
660-
"legacy program 'compress' is deprecated." >&2
649+
@echo WARNING: "Support for shar distribution archives is" \
650+
"deprecated." >&2
661651
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
662652
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
663653
$(am__post_remove_distdir)
664654

665655
dist-shar: distdir
666-
@echo WARNING: "Support for shar distribution archives is" \
667-
"deprecated." >&2
656+
@echo WARNING: "Support for distribution archives compressed with" \
657+
"legacy program 'compress' is deprecated." >&2
668658
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
669659
shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
670660
$(am__post_remove_distdir)
@@ -700,17 +690,17 @@ distcheck: dist
700690
esac
701691
chmod -R a-w $(distdir)
702692
chmod u+w $(distdir)
703-
mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
693+
mkdir $(distdir)/_build $(distdir)/_inst
704694
chmod a-w $(distdir)
705695
test -d $(distdir)/_build || exit 0; \
706696
dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
707697
&& dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
708698
&& am__cwd=`pwd` \
709-
&& $(am__cd) $(distdir)/_build/sub \
710-
&& ../../configure \
699+
&& $(am__cd) $(distdir)/_build \
700+
&& ../configure \
711701
$(AM_DISTCHECK_CONFIGURE_FLAGS) \
712702
$(DISTCHECK_CONFIGURE_FLAGS) \
713-
--srcdir=../.. --prefix="$$dc_install_base" \
703+
--srcdir=.. --prefix="$$dc_install_base" \
714704
&& $(MAKE) $(AM_MAKEFLAGS) \
715705
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
716706
&& $(MAKE) $(AM_MAKEFLAGS) check \
@@ -891,8 +881,6 @@ uninstall-am: uninstall-pkgconfiglibDATA
891881
ps ps-am tags tags-am uninstall uninstall-am \
892882
uninstall-pkgconfiglibDATA
893883

894-
.PRECIOUS: Makefile
895-
896884

897885
# Tell versions [3.59,3.63) of GNU make to not export all variables.
898886
# Otherwise a system limit (for SysV at least) may be exceeded.

0 commit comments

Comments
 (0)