From dcc8724d99326cf30291453c01a500d3a03f5c26 Mon Sep 17 00:00:00 2001 From: joequant Date: Thu, 1 Aug 2013 18:36:12 +0800 Subject: [PATCH 1/2] build fixes --- rtd/Makefile.in | 5 ++++- rtd/configure | 2 +- rtd/configure.in | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/rtd/Makefile.in b/rtd/Makefile.in index b635564..9b774d4 100755 --- a/rtd/Makefile.in +++ b/rtd/Makefile.in @@ -475,9 +475,12 @@ tImageEvent: tImageEvent.o trtdRemote: trtdRemote.o $(COMPILE) -o $@ $@.o $(RTD_REMOTE_LIB) @LIBS@ +# put libs before TK so that the libpath from TK does not override +# the libpath for the local shared libraries in $LIBS tRtd: tRtd.o tRtdEvt.o tRtdEvtData.o $(CXXCOMPILE) -o $@ $@.o tRtdEvt.o tRtdEvtData.o \ - @rtd_BUILD_LIB_SPEC@ @TK_LIB_SPEC@ @TCL_LIB_SPEC@ ${LDFLAGS_DEFAULT} ${LIBS} + @rtd_BUILD_LIB_SPEC@ ${LDFLAGS_DEFAULT} ${LIBS} @TK_LIB_SPEC@ @TCL_LIB_SPEC@ + #======================================================================== # Run Tcl test cases diff --git a/rtd/configure b/rtd/configure index 079c208..224d78d 100755 --- a/rtd/configure +++ b/rtd/configure @@ -7798,7 +7798,7 @@ cat >>confdefs.h <<\_ACEOF _ACEOF - vars="-I$TK_SRC_DIR/generic" + vars="-I$TK_SRC_DIR/generic -I$TCL_SRC_DIR/generic" for i in $vars; do PKG_INCLUDES="$PKG_INCLUDES $i" done diff --git a/rtd/configure.in b/rtd/configure.in index b2fb844..67dcbc4 100644 --- a/rtd/configure.in +++ b/rtd/configure.in @@ -127,7 +127,7 @@ AC_SUBST(CLEANFILES) if test -f $TK_SRC_DIR/generic/tkCanvas.h ; then AC_DEFINE(HAVE_TKCANVAS_H, 1, [See if we can include tkCanvas.h, an internal tk header]) - TEA_ADD_INCLUDES([-I$TK_SRC_DIR/generic]) + TEA_ADD_INCLUDES([-I$TK_SRC_DIR/generic,-I$TCL_SRC_DIR/generic]) fi #-------------------------------------------------------------------- From 34ba04781296d159fede761e3ec71344c6205f8f Mon Sep 17 00:00:00 2001 From: joequant Date: Thu, 1 Aug 2013 21:23:55 +0800 Subject: [PATCH 2/2] add deps to allow parallel make --- rtd/Makefile.in | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/rtd/Makefile.in b/rtd/Makefile.in index 9b774d4..9fe2f70 100755 --- a/rtd/Makefile.in +++ b/rtd/Makefile.in @@ -447,13 +447,13 @@ $(RTDEVT_LIB): $(RTDEVT_OBJ) $(AR) r $@ $(RTDEVT_OBJ) $(RANLIB_STUB) $@ -$(RTD_SERVER): $(RTD_SERVER_OBJS) +$(RTD_SERVER): $(RTD_SERVER_OBJS) $(RTDEVT_LIB) $(CXXCOMPILE) -o $@ $(RTD_SERVER_OBJS) $(RTDEVT_LIB) @LIBS@ -rtdClient: rtdClient.o +rtdClient: rtdClient.o $(RTDEVT_LIB) $(CXXCOMPILE) -o $@ $? $(RTDEVT_LIB) @LIBS@ -rtdCubeDisplay: rtdCubeDisplay.o +rtdCubeDisplay: rtdCubeDisplay.o $(RTDEVT_LIB) $(CXXCOMPILE) -o $@ $? $(RTDEVT_LIB) @LIBS@ #======================================================================== @@ -469,10 +469,10 @@ $(RTD_REMOTE_LIB): $(RTD_REMOTE_OBJ) #======================================================================== test: binaries libraries $(TEST_APPS) -tImageEvent: tImageEvent.o +tImageEvent: tImageEvent.o $(RTDEVT_LIB) $(CXXCOMPILE) -o $@ $@.o $(RTDEVT_LIB) @LIBS@ -trtdRemote: trtdRemote.o +trtdRemote: trtdRemote.o $(RTD_REMOTE_LIB) $(COMPILE) -o $@ $@.o $(RTD_REMOTE_LIB) @LIBS@ # put libs before TK so that the libpath from TK does not override