From b9ea252237d43f9293b70eb0359f46638827d01d Mon Sep 17 00:00:00 2001 From: Max Lv Date: Sat, 3 May 2014 04:49:38 -0400 Subject: [PATCH] fix the build sequence --- libcork/Makefile | 2 +- libcork/Makefile.in | 2 +- src/Makefile.am | 2 +- src/Makefile.in | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libcork/Makefile b/libcork/Makefile index cefa8d09..043039a2 100644 --- a/libcork/Makefile +++ b/libcork/Makefile @@ -70,7 +70,7 @@ POST_UNINSTALL = : build_triplet = x86_64-unknown-linux-gnu host_triplet = x86_64-unknown-linux-gnu subdir = libcork -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in COPYING ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \ $(top_srcdir)/m4/inet_ntop.m4 $(top_srcdir)/m4/libtool.m4 \ diff --git a/libcork/Makefile.in b/libcork/Makefile.in index 45c28cfc..c8f1ebf4 100644 --- a/libcork/Makefile.in +++ b/libcork/Makefile.in @@ -70,7 +70,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = libcork -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in COPYING ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \ $(top_srcdir)/m4/inet_ntop.m4 $(top_srcdir)/m4/libtool.m4 \ diff --git a/src/Makefile.am b/src/Makefile.am index dad43b41..be6573e6 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -7,8 +7,8 @@ AM_CFLAGS += -I$(top_builddir)/libcork/include AM_LDFLAGS = -static SS_COMMON_LIBS = $(top_builddir)/libev/libev.la \ - $(top_builddir)/libcork/libcork.la \ $(top_builddir)/libipset/libipset.la \ + $(top_builddir)/libcork/libcork.la \ $(INET_NTOP_LIB) bin_PROGRAMS = ss-local ss-tunnel diff --git a/src/Makefile.in b/src/Makefile.in index e7a814c8..a7622165 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -87,8 +87,8 @@ am_ss_local_OBJECTS = ss_local-utils.$(OBJEXT) \ ss_local_OBJECTS = $(am_ss_local_OBJECTS) am__DEPENDENCIES_1 = am__DEPENDENCIES_2 = $(top_builddir)/libev/libev.la \ - $(top_builddir)/libcork/libcork.la \ - $(top_builddir)/libipset/libipset.la $(am__DEPENDENCIES_1) + $(top_builddir)/libipset/libipset.la \ + $(top_builddir)/libcork/libcork.la $(am__DEPENDENCIES_1) ss_local_DEPENDENCIES = $(am__DEPENDENCIES_2) ss_local_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CCLD) $(ss_local_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ @@ -273,8 +273,8 @@ AM_CFLAGS = -g -O2 -Wall -Werror -Wno-deprecated-declarations \ -I$(top_builddir)/libcork/include AM_LDFLAGS = -static SS_COMMON_LIBS = $(top_builddir)/libev/libev.la \ - $(top_builddir)/libcork/libcork.la \ $(top_builddir)/libipset/libipset.la \ + $(top_builddir)/libcork/libcork.la \ $(INET_NTOP_LIB) ss_local_SOURCES = utils.c jconf.c json.c encrypt.c udprelay.c cache.c \