You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@mesos.apache.org by be...@apache.org on 2012/01/25 20:48:51 UTC

svn commit: r1235887 - /incubator/mesos/trunk/src/Makefile.am

Author: benh
Date: Wed Jan 25 19:48:50 2012
New Revision: 1235887

URL: http://svn.apache.org/viewvc?rev=1235887&view=rev
Log:
Added WEBUI_LDFLAGS to the libwebui_la_LIBADD as necessary on some systems, see MESOS-131 (contributed by Charles Reiss).

Modified:
    incubator/mesos/trunk/src/Makefile.am

Modified: incubator/mesos/trunk/src/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/Makefile.am?rev=1235887&r1=1235886&r2=1235887&view=diff
==============================================================================
--- incubator/mesos/trunk/src/Makefile.am (original)
+++ incubator/mesos/trunk/src/Makefile.am Wed Jan 25 19:48:50 2012
@@ -241,6 +241,7 @@ libwebui_la_SOURCES = master/webui.cpp s
 libwebui_la_SOURCES += master/webui.hpp slave/webui.hpp common/webui_utils.hpp
 libwebui_la_CPPFLAGS = $(MESOS_CPPFLAGS) $(WEBUI_CPPFLAGS)
 libwebui_la_CXXFLAGS = $(MESOS_CXXFLAGS)
+libwebui_la_LIBADD = $(WEBUI_LDFLAGS)
 endif
 
 
@@ -276,14 +277,12 @@ sbin_PROGRAMS += mesos-master
 mesos_master_SOURCES = master/main.cpp
 mesos_master_CPPFLAGS = $(MESOS_CPPFLAGS)
 mesos_master_CXXFLAGS = $(MESOS_CXXFLAGS)
-mesos_master_LDFLAGS = $(WEBUI_LDFLAGS) $(AM_LDFLAGS)
 mesos_master_LDADD = libwebui.la libmesos.la
 
 sbin_PROGRAMS += mesos-slave
 mesos_slave_SOURCES = slave/main.cpp
 mesos_slave_CPPFLAGS = $(MESOS_CPPFLAGS)
 mesos_slave_CXXFLAGS = $(MESOS_CXXFLAGS)
-mesos_slave_LDFLAGS = $(WEBUI_LDFLAGS) $(AM_LDFLAGS)
 mesos_slave_LDADD = libwebui.la libmesos.la
 
 bin_PROGRAMS += mesos-local