Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build fixes #1

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

build fixes #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dcc8724
build fixes
joequant Aug 1, 2013
34ba047
add deps to allow parallel make
joequant Aug 1, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions rtd/Makefile.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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@

#========================================================================
Expand All @@ -469,15 +469,18 @@ $(RTD_REMOTE_LIB): $(RTD_REMOTE_OBJ)
#========================================================================
test: binaries libraries $(TEST_APPS)

tImageEvent: tImageEvent.o
tImageEvent: tImageEvent.o $(RTDEVT_LIB)
$(CXXCOMPILE) -o $@ [email protected] $(RTDEVT_LIB) @LIBS@

trtdRemote: trtdRemote.o
trtdRemote: trtdRemote.o $(RTD_REMOTE_LIB)
$(COMPILE) -o $@ [email protected] $(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 $@ [email protected] 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
Expand Down
2 changes: 1 addition & 1 deletion rtd/configure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion rtd/configure.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

#--------------------------------------------------------------------
Expand Down