izackp/mosh
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Set poll_LIBS = libpoll.a in Makefile.am so dependency tracking works

Browse Source 
Signed-off-by: Anders Kaseorg <andersk@mit.edu>
This commit is contained in:
Anders Kaseorg
2012-04-21 02:16:01 -04:00
parent 735dcd6ad5
commit 7fe9f29448
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.ac
-5
View File
@@ -304,11 +304,6 @@ if ( pollfds[ 0 ].revents & (POLLERR | POLLHUP | POLLNVAL) ) {
LIBS="$save_LIBS" LIBS="$save_LIBS"
]) ])
AM_CONDITIONAL([COND_THIRD_POLL], [test "x$ac_cv_poll_pty" = "xno"]) AM_CONDITIONAL([COND_THIRD_POLL], [test "x$ac_cv_poll_pty" = "xno"])
AM_COND_IF([COND_THIRD_POLL],
[
poll_CFLAGS="-I\$(top_srcdir)/third/poll"
poll_LIBS="\$(top_builddir)/third/poll/libpoll.a"
])
AC_MSG_CHECKING([whether pipe2(..., O_CLOEXEC) is supported]) AC_MSG_CHECKING([whether pipe2(..., O_CLOEXEC) is supported])
AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define _GNU_SOURCE AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define _GNU_SOURCE
src/examples/Makefile.am
+4
View File
@@ -3,6 +3,10 @@ if COND_THIRD_LIBSTDDJB
STDDJB_LDFLAGS += $(top_builddir)/third/libstddjb/libstddjb.a STDDJB_LDFLAGS += $(top_builddir)/third/libstddjb/libstddjb.a
STDDJB_CPPFLAGS += -I$(top_srcdir)/third/libstddjb STDDJB_CPPFLAGS += -I$(top_srcdir)/third/libstddjb
endif endif
if COND_THIRD_POLL
poll_LIBS += $(top_builddir)/third/poll/libpoll.a
poll_CFLAGS += -I$(top_srcdir)/third/poll
endif
AM_CXXFLAGS = $(WARNING_CXXFLAGS) $(PICKY_CXXFLAGS) $(HARDEN_CFLAGS) $(MISC_CXXFLAGS) AM_CXXFLAGS = $(WARNING_CXXFLAGS) $(PICKY_CXXFLAGS) $(HARDEN_CFLAGS) $(MISC_CXXFLAGS)
AM_LDFLAGS = $(HARDEN_LDFLAGS) AM_LDFLAGS = $(HARDEN_LDFLAGS)
src/frontend/Makefile.am
+4
View File
@@ -3,6 +3,10 @@ if COND_THIRD_LIBSTDDJB
STDDJB_LDFLAGS += $(top_builddir)/third/libstddjb/libstddjb.a STDDJB_LDFLAGS += $(top_builddir)/third/libstddjb/libstddjb.a
STDDJB_CPPFLAGS += -I$(top_srcdir)/third/libstddjb STDDJB_CPPFLAGS += -I$(top_srcdir)/third/libstddjb
endif endif
if COND_THIRD_POLL
poll_LIBS += $(top_builddir)/third/poll/libpoll.a
poll_CFLAGS += -I$(top_srcdir)/third/poll
endif
AM_CPPFLAGS = -I$(srcdir)/../statesync -I$(srcdir)/../terminal -I$(srcdir)/../network -I$(srcdir)/../crypto -I../protobufs -I$(srcdir)/../util $(STDDJB_CPPFLAGS) $(TINFO_CFLAGS) $(protobuf_CFLAGS) $(poll_CFLAGS) AM_CPPFLAGS = -I$(srcdir)/../statesync -I$(srcdir)/../terminal -I$(srcdir)/../network -I$(srcdir)/../crypto -I../protobufs -I$(srcdir)/../util $(STDDJB_CPPFLAGS) $(TINFO_CFLAGS) $(protobuf_CFLAGS) $(poll_CFLAGS)
AM_CXXFLAGS = $(WARNING_CXXFLAGS) $(PICKY_CXXFLAGS) $(HARDEN_CFLAGS) $(MISC_CXXFLAGS) AM_CXXFLAGS = $(WARNING_CXXFLAGS) $(PICKY_CXXFLAGS) $(HARDEN_CFLAGS) $(MISC_CXXFLAGS)