diff --git a/src/Makefile.am b/src/Makefile.am index cbcd4be3..ab2d6bcf 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -3,7 +3,8 @@ AM_CFLAGS += -I$(top_builddir)/libev AM_CFLAGS += -I$(top_builddir)/libasyncns AM_LDFLAGS = -static -LDADD = $(top_builddir)/libev/libev.la $(INET_ATON_LIB) + +SS_COMMON_LIBS = $(top_builddir)/libev/libev.la $(INET_ATON_LIB) bin_PROGRAMS = ss-local ss-server ss_local_SOURCES = utils.c \ @@ -16,7 +17,9 @@ ss_server_SOURCES = utils.c \ json.c \ encrypt.c \ server.c -ss_server_LDADD = $(top_builddir)/libasyncns/libasyncns.la +ss_local_LDADD = $(SS_COMMON_LIBS) +ss_server_LDADD = $(SS_COMMON_LIBS) +ss_server_LDADD += $(top_builddir)/libasyncns/libasyncns.la if BUILD_REDIRECTOR bin_PROGRAMS += ss-redir @@ -25,5 +28,6 @@ ss_redir_SOURCES = utils.c \ json.c \ encrypt.c \ redir.c +ss_redir_LDADD = $(SS_COMMON_LIBS) endif diff --git a/src/Makefile.in b/src/Makefile.in index f5a3b328..8c782565 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -57,22 +57,21 @@ PROGRAMS = $(bin_PROGRAMS) am_ss_local_OBJECTS = utils.$(OBJEXT) jconf.$(OBJEXT) json.$(OBJEXT) \ encrypt.$(OBJEXT) local.$(OBJEXT) ss_local_OBJECTS = $(am_ss_local_OBJECTS) -ss_local_LDADD = $(LDADD) am__DEPENDENCIES_1 = -ss_local_DEPENDENCIES = $(top_builddir)/libev/libev.la \ +am__DEPENDENCIES_2 = $(top_builddir)/libev/libev.la \ $(am__DEPENDENCIES_1) +ss_local_DEPENDENCIES = $(am__DEPENDENCIES_2) am__ss_redir_SOURCES_DIST = utils.c jconf.c json.c encrypt.c redir.c @BUILD_REDIRECTOR_TRUE@am_ss_redir_OBJECTS = utils.$(OBJEXT) \ @BUILD_REDIRECTOR_TRUE@ jconf.$(OBJEXT) json.$(OBJEXT) \ @BUILD_REDIRECTOR_TRUE@ encrypt.$(OBJEXT) redir.$(OBJEXT) ss_redir_OBJECTS = $(am_ss_redir_OBJECTS) -ss_redir_LDADD = $(LDADD) -ss_redir_DEPENDENCIES = $(top_builddir)/libev/libev.la \ - $(am__DEPENDENCIES_1) +@BUILD_REDIRECTOR_TRUE@ss_redir_DEPENDENCIES = $(am__DEPENDENCIES_2) am_ss_server_OBJECTS = utils.$(OBJEXT) jconf.$(OBJEXT) json.$(OBJEXT) \ encrypt.$(OBJEXT) server.$(OBJEXT) ss_server_OBJECTS = $(am_ss_server_OBJECTS) -ss_server_DEPENDENCIES = $(top_builddir)/libasyncns/libasyncns.la +ss_server_DEPENDENCIES = $(am__DEPENDENCIES_2) \ + $(top_builddir)/libasyncns/libasyncns.la DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -211,7 +210,7 @@ top_srcdir = @top_srcdir@ AM_CFLAGS = -g -O2 -Wall -fno-strict-aliasing -I$(top_builddir)/libev \ -I$(top_builddir)/libasyncns AM_LDFLAGS = -static -LDADD = $(top_builddir)/libev/libev.la $(INET_ATON_LIB) +SS_COMMON_LIBS = $(top_builddir)/libev/libev.la $(INET_ATON_LIB) ss_local_SOURCES = utils.c \ jconf.c \ json.c \ @@ -224,13 +223,16 @@ ss_server_SOURCES = utils.c \ encrypt.c \ server.c -ss_server_LDADD = $(top_builddir)/libasyncns/libasyncns.la +ss_local_LDADD = $(SS_COMMON_LIBS) +ss_server_LDADD = $(SS_COMMON_LIBS) \ + $(top_builddir)/libasyncns/libasyncns.la @BUILD_REDIRECTOR_TRUE@ss_redir_SOURCES = utils.c \ @BUILD_REDIRECTOR_TRUE@ jconf.c \ @BUILD_REDIRECTOR_TRUE@ json.c \ @BUILD_REDIRECTOR_TRUE@ encrypt.c \ @BUILD_REDIRECTOR_TRUE@ redir.c +@BUILD_REDIRECTOR_TRUE@ss_redir_LDADD = $(SS_COMMON_LIBS) all: all-am .SUFFIXES: