From a70e38da357e60867bad63b3e52282f2c748281e Mon Sep 17 00:00:00 2001 From: Max Lv Date: Tue, 18 Jun 2013 03:08:59 +0000 Subject: [PATCH] fix makefile for solaris --- src/Makefile.am | 2 +- src/Makefile.in | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 7756b145..4e4e4eea 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -4,7 +4,7 @@ AM_CFLAGS += -I$(top_builddir)/libasyncns AM_LDFLAGS = -static -SS_COMMON_LIBS = $(top_builddir)/libev/libev.la $(INET_ATON_LIB) $(INET_NTOA_LIB) +SS_COMMON_LIBS = $(top_builddir)/libev/libev.la $(INET_NTOP_LIB) bin_PROGRAMS = ss-local ss-server ss_local_SOURCES = utils.c \ diff --git a/src/Makefile.in b/src/Makefile.in index 89e5c435..d7c0e151 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -57,18 +57,20 @@ PROGRAMS = $(bin_PROGRAMS) am_ss_local_OBJECTS = utils.$(OBJEXT) jconf.$(OBJEXT) json.$(OBJEXT) \ encrypt.$(OBJEXT) local.$(OBJEXT) ss_local_OBJECTS = $(am_ss_local_OBJECTS) -am__DEPENDENCIES_1 = $(top_builddir)/libev/libev.la -ss_local_DEPENDENCIES = $(am__DEPENDENCIES_1) +am__DEPENDENCIES_1 = +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) -@BUILD_REDIRECTOR_TRUE@ss_redir_DEPENDENCIES = $(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 = $(am__DEPENDENCIES_1) \ +ss_server_DEPENDENCIES = $(am__DEPENDENCIES_2) \ $(top_builddir)/libasyncns/libasyncns.la DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp @@ -208,7 +210,7 @@ top_srcdir = @top_srcdir@ AM_CFLAGS = -g -O2 -Wall -I$(top_builddir)/libev \ -I$(top_builddir)/libasyncns AM_LDFLAGS = -static -SS_COMMON_LIBS = $(top_builddir)/libev/libev.la $(INET_ATON_LIB) $(INET_NTOA_LIB) +SS_COMMON_LIBS = $(top_builddir)/libev/libev.la $(INET_NTOP_LIB) ss_local_SOURCES = utils.c \ jconf.c \ json.c \