[Spread-cvs] commit: r500 - in trunk: daemon examples
jonathan at spread.org
jonathan at spread.org
Tue Mar 20 19:26:01 EDT 2012
Author: jonathan
Date: 2012-03-20 19:26:01 -0400 (Tue, 20 Mar 2012)
New Revision: 500
Modified:
trunk/daemon/Makefile.in
trunk/examples/Makefile.in
Log:
Fix linux executable build to work with new libspreadutil
Modified: trunk/daemon/Makefile.in
===================================================================
--- trunk/daemon/Makefile.in 2012-03-20 22:19:15 UTC (rev 499)
+++ trunk/daemon/Makefile.in 2012-03-20 23:26:01 UTC (rev 500)
@@ -29,15 +29,17 @@
#libspread-util includes
LIBSPREADUTIL_DIR=../libspread-util
LIBSPREADUTIL_PATHS=-I$(LIBSPREADUTIL_DIR)/include -I$(top_srcdir)/libspread-util/include
+LIBSPREADUTIL_LDFLAGS=-rdynamic
+LIBSPREADUTIL_LIBS=-ldl
CC=@CC@
LD=@LD@
CFLAGS=@CFLAGS@
CPPFLAGS=-I. -I$(srcdir) -I$(top_srcdir)/include -I../stdutil/src -I$(top_srcdir)/stdutil/src $(LIBSPREADUTIL_PATHS) @CPPFLAGS@ $(PATHS) @DEFS@
-LDFLAGS=@LDFLAGS@
-LIBS=@LIBS@
-THLDFLAGS=@THLDFLAGS@
-THLIBS=@THLIBS@
+LDFLAGS=@LDFLAGS@ $(LIBSPREADUTIL_LDFLAGS)
+LIBS=@LIBS@ $(LIBSPREADUTIL_LIBS)
+THLDFLAGS=@THLDFLAGS@ $(LIBSPREADUTIL_LDFLAGS)
+THLIBS=@THLIBS@ $(LIBSPREADUTIL_LIBS)
LEX=@LEX@
INSTALL=@INSTALL@
SOFTLINK=@LN_S@
@@ -78,21 +80,21 @@
# $(YACC) -d config_parse.y
spread$(EXEEXT): $(SPREADOBJS) $(LIBSPREADUTIL_DIR)/lib/libspread-util.a ../stdutil/lib/libstdutil-threaded-release.a
- $(LD) -o $@ $(SPREADOBJS) $(LIBSPREADUTIL_DIR)/lib/libspread-util.a ../stdutil/lib/libstdutil-threaded-release.a $(LDFLAGS) $(LIBS)
+ $(LD) -o $@ $(LDFLAGS) $(SPREADOBJS) $(LIBSPREADUTIL_DIR)/lib/libspread-util.a ../stdutil/lib/libstdutil-threaded-release.a $(LIBS)
spmonitor$(EXEEXT): $(MONITOR_OBJS) $(LIBSPREADUTIL_DIR)/lib/libspread-util.a
- $(LD) -o $@ $(MONITOR_OBJS) $(LDFLAGS) $(LIBS) $(LIBSPREADUTIL_DIR)/lib/libspread-util.a
+ $(LD) -o $@ $(LDFLAGS) $(MONITOR_OBJS) $(LIBS) $(LIBSPREADUTIL_DIR)/lib/libspread-util.a
sptmonitor$(EXEEXT): $(TMONITOR_OBJS) $(LIBSPREADUTIL_DIR)/lib/libspread-util.a
- $(LD) $(THLDFLAGS) -o $@ $(TMONITOR_OBJS) $(LDFLAGS) $(LIBS) $(THLIBS) $(LIBSPREADUTIL_DIR)/lib/libspread-util.a
+ $(LD) $(THLDFLAGS) -o $@ $(TMONITOR_OBJS) $(THLIBS) $(LIBSPREADUTIL_DIR)/lib/libspread-util.a
testprog: spsend$(EXEEXT) sprecv$(EXEEXT)
spsend$(EXEEXT): s.o $(LIBSPREADUTIL_DIR)/lib/libspread-util.a
- $(LD) -o $@ s.o $(LDFLAGS) $(LIBS) $(LIBSPREADUTIL_DIR)/lib/libspread-util.a
+ $(LD) -o $@ $(LDFLAGS) s.o $(LIBS) $(LIBSPREADUTIL_DIR)/lib/libspread-util.a
sprecv$(EXEEXT): r.o $(LIBSPREADUTIL_DIR)/lib/libspread-util.a
- $(LD) -o $@ r.o $(LDFLAGS) $(LIBS) $(LIBSPREADUTIL_DIR)/lib/libspread-util.a
+ $(LD) -o $@ $(LDFLAGS) r.o $(LIBS) $(LIBSPREADUTIL_DIR)/lib/libspread-util.a
clean:
rm -f *.lo *.tlo *.to *.o *.a *.dylib $(TARGETS) spsimple_user
Modified: trunk/examples/Makefile.in
===================================================================
--- trunk/examples/Makefile.in 2012-03-20 22:19:15 UTC (rev 499)
+++ trunk/examples/Makefile.in 2012-03-20 23:26:01 UTC (rev 500)
@@ -26,14 +26,20 @@
PATHS=
+#libspread-util includes
+LIBSPREADUTIL_DIR=../libspread-util
+LIBSPREADUTIL_PATHS=-I$(LIBSPREADUTIL_DIR)/include -I$(top_srcdir)/libspread-util/include
+LIBSPREADUTIL_LDFLAGS=-rdynamic
+LIBSPREADUTIL_LIBS=-ldl
+
CC=@CC@
LD=@LD@
CFLAGS=@CFLAGS@
CPPFLAGS=-I. -I$(srcdir) -I$(top_srcdir)/include @CPPFLAGS@ $(PATHS) @DEFS@
-LDFLAGS=@LDFLAGS@
-LIBS=@LIBS@
-THLDFLAGS=@THLDFLAGS@
-THLIBS=@THLIBS@
+LDFLAGS=@LDFLAGS@ $(LIBSPREADUTIL_LDFLAGS)
+LIBS=@LIBS@ $(LIBSPREADUTIL_LIBS)
+THLDFLAGS=@THLDFLAGS@ $(LIBSPREADUTIL_LDFLAGS)
+THLIBS=@THLIBS@ $(LIBSPREADUTIL_LIBS)
AR=@AR@
LEX=@LEX@
RANLIB=@RANLIB@
@@ -70,7 +76,7 @@
$(LD) $(THLDFLAGS) -o $@ user.to $(SP_LIBRARY_DIR)/libtspread-core.a $(LDFLAGS) $(LIBS) $(THLIBS)
spsimple_user$(EXEEXT): simple_user.o $(SP_LIBRARY_DIR)/libspread-core.a
- $(LD) -o $@ simple_user.o $(LDFLAGS) $(SP_LIBRARY_DIR)/libspread-core.a $(LIBS)
+ $(LD) -o $@ $(LDFLAGS) simple_user.o $(SP_LIBRARY_DIR)/libspread-core.a $(LIBS)
flush_user$(EXEEXT): $(SP_LIBRARY_DIR)/libspread.a fl_user.to
$(LD) $(LDFLAGS) -o flush_user fl_user.to $(SP_LIBRARY_DIR)/libspread.a $(LIBS) $(THLIBS)
More information about the Spread-cvs
mailing list