Browse Source

fix the build sequence

pull/77/head
Max Lv 10 years ago
parent
commit
b9ea252237
4 changed files with 6 additions and 6 deletions
  1. 2
      libcork/Makefile
  2. 2
      libcork/Makefile.in
  3. 2
      src/Makefile.am
  4. 6
      src/Makefile.in

2
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 \

2
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 \

2
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

6
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 \

Loading…
Cancel
Save