diff --git a/moo/Makefile.in b/moo/Makefile.in index c5f890b..28ff8c8 100644 --- a/moo/Makefile.in +++ b/moo/Makefile.in @@ -166,8 +166,8 @@ am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/ac/ar-lib \ $(top_srcdir)/ac/compile $(top_srcdir)/ac/config.guess \ $(top_srcdir)/ac/config.sub $(top_srcdir)/ac/install-sh \ $(top_srcdir)/ac/ltmain.sh $(top_srcdir)/ac/missing ac/ar-lib \ - ac/compile ac/config.guess ac/config.sub ac/depcomp \ - ac/install-sh ac/ltmain.sh ac/missing + ac/compile ac/config.guess ac/config.sub ac/install-sh \ + ac/ltmain.sh ac/missing DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) diff --git a/moo/bin/Makefile.am b/moo/bin/Makefile.am index ee76a09..1f76c27 100644 --- a/moo/bin/Makefile.am +++ b/moo/bin/Makefile.am @@ -22,9 +22,6 @@ moo_SOURCES = main.c moo_CPPFLAGS = $(CPPFLAGS_ALL_COMMON) moo_LDFLAGS = $(LDFLAGS_ALL_COMMON) moo_LDADD = $(LIBADD_BIN_COMMON) -lmoox -if WIN32 -moo_LDADD += $(SOCKET_LIBS) -endif if ENABLE_STATIC_MODULE moo_DEPENDENCIES = ../lib/libmoox.la endif diff --git a/moo/bin/Makefile.in b/moo/bin/Makefile.in index aef5841..68c936e 100644 --- a/moo/bin/Makefile.in +++ b/moo/bin/Makefile.in @@ -89,9 +89,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ bin_PROGRAMS = moo$(EXEEXT) -@WIN32_TRUE@am__append_1 = $(SOCKET_LIBS) -@ENABLE_STATIC_MODULE_FALSE@moo_DEPENDENCIES = $(am__DEPENDENCIES_2) \ -@ENABLE_STATIC_MODULE_FALSE@ $(am__DEPENDENCIES_3) +@ENABLE_STATIC_MODULE_FALSE@moo_DEPENDENCIES = $(am__DEPENDENCIES_2) subdir = bin ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_sign.m4 \ @@ -113,7 +111,6 @@ am_moo_OBJECTS = moo-main.$(OBJEXT) moo_OBJECTS = $(am_moo_OBJECTS) am__DEPENDENCIES_1 = am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) -@WIN32_TRUE@am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent @@ -328,7 +325,6 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ -runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -356,7 +352,7 @@ LIBADD_BIN_COMMON = $(LIBM) moo_SOURCES = main.c moo_CPPFLAGS = $(CPPFLAGS_ALL_COMMON) moo_LDFLAGS = $(LDFLAGS_ALL_COMMON) -moo_LDADD = $(LIBADD_BIN_COMMON) -lmoox $(am__append_1) +moo_LDADD = $(LIBADD_BIN_COMMON) -lmoox @ENABLE_STATIC_MODULE_TRUE@moo_DEPENDENCIES = ../lib/libmoox.la all: all-am diff --git a/moo/lib/Makefile.am b/moo/lib/Makefile.am index d53b578..83b5b57 100644 --- a/moo/lib/Makefile.am +++ b/moo/lib/Makefile.am @@ -136,7 +136,7 @@ if ENABLE_LIBUNWIND libmoox_la_LIBADD += $(UNWIND_LIBS) endif if WIN32 -libmoox_la_LIBADD += -lpsapi +libmoox_la_LIBADD += -lpsapi $(SOCKET_LIBS) endif libmoox_la_DEPENDENCIES = libmoo.la diff --git a/moo/lib/Makefile.in b/moo/lib/Makefile.in index 01a799a..167eb96 100644 --- a/moo/lib/Makefile.in +++ b/moo/lib/Makefile.in @@ -109,7 +109,7 @@ host_triplet = @host@ @ENABLE_LIBLTDL_TRUE@am__append_13 = $(LTDL_LIBS) @ENABLE_LIBLTDL_FALSE@am__append_14 = $(DL_LIBS) @ENABLE_LIBUNWIND_TRUE@am__append_15 = $(UNWIND_LIBS) -@WIN32_TRUE@am__append_16 = -lpsapi +@WIN32_TRUE@am__append_16 = -lpsapi $(SOCKET_LIBS) subdir = lib ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_sign.m4 \ @@ -176,6 +176,7 @@ libmoo_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ @ENABLE_LIBLTDL_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) @ENABLE_LIBLTDL_FALSE@am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1) @ENABLE_LIBUNWIND_TRUE@am__DEPENDENCIES_4 = $(am__DEPENDENCIES_1) +@WIN32_TRUE@am__DEPENDENCIES_5 = $(am__DEPENDENCIES_1) am__libmoox_la_SOURCES_DIST = moo-opt.h moo-std.h opt-impl.h opt.c \ std.c poll-msw.c poll-msw.h @WIN32_TRUE@am__objects_1 = libmoox_la-poll-msw.lo @@ -405,7 +406,6 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ -runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff --git a/moo/t/Makefile.am b/moo/t/Makefile.am index 2209eb1..1cbbf91 100644 --- a/moo/t/Makefile.am +++ b/moo/t/Makefile.am @@ -12,10 +12,6 @@ AM_CPPFLAGS = \ AM_LDFLAGS = -L$(abs_builddir)/../lib -L$(libdir) LDADD = -lmoo $(PTHREAD_LIBS) -if WIN32 -LDADD += $(SOCKET_LIBS) -endif - bin_PROGRAMS = t-001 t-002 t_001_SOURCES = t-001.c t_002_SOURCES = t-002.c diff --git a/moo/t/Makefile.in b/moo/t/Makefile.in index 1dbe965..a26bd0a 100644 --- a/moo/t/Makefile.in +++ b/moo/t/Makefile.in @@ -88,7 +88,6 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -@WIN32_TRUE@am__append_1 = $(SOCKET_LIBS) bin_PROGRAMS = t-001$(EXEEXT) t-002$(EXEEXT) subdir = t ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -111,8 +110,7 @@ am_t_001_OBJECTS = t-001.$(OBJEXT) t_001_OBJECTS = $(am_t_001_OBJECTS) t_001_LDADD = $(LDADD) am__DEPENDENCIES_1 = -@WIN32_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) -t_001_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) +t_001_DEPENDENCIES = $(am__DEPENDENCIES_1) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent @@ -120,7 +118,7 @@ am__v_lt_1 = am_t_002_OBJECTS = t-002.$(OBJEXT) t_002_OBJECTS = $(am_t_002_OBJECTS) t_002_LDADD = $(LDADD) -t_002_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) +t_002_DEPENDENCIES = $(am__DEPENDENCIES_1) AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) am__v_P_0 = false @@ -346,7 +344,7 @@ AM_CPPFLAGS = \ -I$(includedir) AM_LDFLAGS = -L$(abs_builddir)/../lib -L$(libdir) -LDADD = -lmoo $(PTHREAD_LIBS) $(am__append_1) +LDADD = -lmoo $(PTHREAD_LIBS) t_001_SOURCES = t-001.c t_002_SOURCES = t-002.c all: all-am