Attachment #2657 for bug #5707

Lines 37-43 Link Here

(-)tclx8.3/unix/Common.mk.in.makecfg (-11 / +18 lines)
37	# Programs and options used by build	37	# Programs and options used by build
38	#	38	#
39	CC = @CC@	39	CC = @CC@
40	CFLAGS = @CFLAGS@ @TCL_CFLAGS_WARNING@ @TCL_EXTRA_CFLAGS@	40	CFLAGS = -O2 @TCL_EXTRA_CFLAGS@ -fPIC
41	SYSCFLAGS = @SYSCFLAGS@	41	SYSCFLAGS = @SYSCFLAGS@
42	RANLIB = @RANLIB@	42	RANLIB = @RANLIB@
43	AR = ar	43	AR = ar
Lines 72-77 Link Here
72	bldbasedir = @bldbasedir@	72	bldbasedir = @bldbasedir@
73	prefix = @prefix@	73	prefix = @prefix@
74	exec_prefix = @exec_prefix@	74	exec_prefix = @exec_prefix@
		75	libdir = @exec_prefix@/lib
		76
		77	# Path to use at runtime to refer to LIB_INSTALL_DIR:
		78	LIB_RUNTIME_DIR =
		79
		80	# Directory in which to install the .a or .so binary.
		81	LIB_INSTALL_DIR =
75		82
76	TCLX_PREFIX="${prefix}"	83	TCLX_PREFIX="${prefix}"
77	TCLX_EXEC_PREFIX="${exec_prefix}"	84	TCLX_EXEC_PREFIX="${exec_prefix}"
Lines 82-88 Link Here
82	# TclX configuration information determined by configure.	89	# TclX configuration information determined by configure.
83	#	90	#
84	TKX_BUILD = @TKX_BUILD@	91	TKX_BUILD = @TKX_BUILD@
85	TCLX_DEFS = @DEFS@	92	TCLX_DEFS = -DSTDC_HEADERS=1 -DNDEBUG=1 -DRETSIGTYPE=void
86	TCLX_LIBS = @TCLX_LIBS@	93	TCLX_LIBS = @TCLX_LIBS@
87		94
88	#------------------------------------------------------------------------------	95	#------------------------------------------------------------------------------
Lines 91-103 Link Here
91	TCL_STLIB_NAME = @TCL_STLIB_NAME@	98	TCL_STLIB_NAME = @TCL_STLIB_NAME@
92	TK_STLIB_NAME = @TK_STLIB_NAME@	99	TK_STLIB_NAME = @TK_STLIB_NAME@
93		100
94	TCLX_SHLIB_NAME = @TCLX_SHLIB_NAME@	101	TCLX_SHLIB_NAME = libtclx.so
95	TCLX_STLIB_NAME = @TCLX_STLIB_NAME@	102	TCLX_STLIB_NAME = libtclx${DBGX}.a
96	TCLX_LIB_NAME = @TCLX_LIB_NAME@	103	TCLX_LIB_NAME = libtclx.so
97		104
98	TKX_SHLIB_NAME = @TKX_SHLIB_NAME@	105	TKX_SHLIB_NAME = libtkx.so
99	TKX_STLIB_NAME = @TKX_STLIB_NAME@	106	TKX_STLIB_NAME = libtkx${DBGX}.a
100	TKX_LIB_NAME = @TKX_LIB_NAME@	107	TKX_LIB_NAME = libtkx.so
101		108
102	#------------------------------------------------------------------------------	109	#------------------------------------------------------------------------------
103	# Compiler flag to use when generating shared object files. Unixware cc will	110	# Compiler flag to use when generating shared object files. Unixware cc will
Lines 108-115 Link Here
108	#------------------------------------------------------------------------------	115	#------------------------------------------------------------------------------
109	# Linker arguments to pick up TclX libraries.	116	# Linker arguments to pick up TclX libraries.
110	#	117	#
111	TCLX_BUILD_LIB_SPEC = @TCLX_BUILD_LIB_SPEC@	118	TCLX_BUILD_LIB_SPEC = -L${TCLX_UNIX_SRC_DIR} -ltclx
112	TKX_BUILD_LIB_SPEC = @TKX_BUILD_LIB_SPEC@	119	TKX_BUILD_LIB_SPEC = -L${TKX_UNIX_SRC_DIR} -ltkx
113		120
114	#------------------------------------------------------------------------------	121	#------------------------------------------------------------------------------
115	# Configuration information from tclConfig.sh.	122	# Configuration information from tclConfig.sh.





GENERIC_SOBJS = \
    @TCLX_BUILD_DUMMY_STANDALONE@ \
    tclXbsearch.o    tclXchmod.o    \
    tclXcmdInit.o    tclXcmdloop.o  \
    tclXdebug.o      tclXdup.o      \
    tclXfcntl.o      tclXfilecmds.o \
    tclXfilescan.o   tclXflock.o    \
    tclXfstat.o      tclXgeneral.o  \
    tclXhandles.o    tclXunixId.o   \
    tclXinit.o       tclXkeylist.o  \
    tclXlib.o        tclXlist.o     \
    tclXmath.o       tclXmsgcat.o   \
    tclXlibInit.o    tclXprocess.o  \
    tclXprofile.o    \
    tclXselect.o     tclXunixSock.o \
    tclXsignal.o     tclXshell.o    \
    tclXstring.o     tclXsocket.o   \
    tclXunixCmds.o   tclXutil.o     \
    tclXunixOS.o     tclXoscmds.o   \
    tclXunixDup.o    tclXlgets.o

COMPAT_OBJS = @LIBOBJS@


    stringfile.o     tcllib.o         fmath.o          buildhelp.o \
    buildidx.o       autoload.o       tclx.o

HELP_DIR = ${srcbasedir}/tcl/help

TEST_OBJS = tclTest.o tclTestObj.o tclUnixTest.o tclXtest.o \
	tclThreadTest.o tclXunixTest.o


standalone: tcl.standalone tclXtest.standalone hello

tcl: tclXAppInit.o libtclx.so libtclx.so.0 libtclx${DBGX}.a Makefile
	${CC} ${LD_SWITCHES} tclXAppInit.o ${ALL_LIBS} \
	    -o $@ || (rm -f $@; exit 1)

tcl.static: tclXAppInit.o libtclx${DBGX}.a Makefile
	${CC} ${LD_SWITCHES} tclXAppInit.o ${STATIC_LIBS} \
	    -o $@ || (rm -f $@; exit 1)

tcl.standalone: tclXAppInitSA.o libtclx${DBGX}.a Makefile
	${CC} ${LD_SWITCHES} tclXAppInitSA.o ${STATIC_LIBS} \
	    -o $@ || (rm -f $@; exit 1)


	${AR} cr ${TCLX_STLIB_NAME} ${OBJS}
	${RANLIB} ${TCLX_STLIB_NAME}

libtclx.so.0: ${SOBJS}
	rm -f ${TCLX_SHLIB_NAME}
	${CC} -pipe -shared -Wl,-soname,$@ -o $@ ${SOBJS} ${TCL_SHLIB_LD_LIBS} -L${TCL_UNIX_DIR} -ltcl

libtclx.so: libtclx.so.0
	ln -sf $< $@

hello:	hello.c
	${CC} ${LD_SWITCHES} -o $@ hello.c ${STATIC_LIBS}

BUILDHELP=@BUILDHELP@
buildhelp: tcl tcl.tndx
	rm -rf ${HELP_DIR} help help.tmp
#	if test ! -d ${HELP_DIR} ; then \
#	    mkdir ${HELP_DIR} ; \
#	fi
	mkdir ${HELP_DIR}
	${BLDMANHELP} ${TCL_SRC_DIR}/doc ${TCLX_TOOLS_SRC_DIR}/tclmanpages \
	    ${HELP_DIR} Tcl.brf

	fi
	${INSTCOPY} tclxConfig.sh ${INSTALL_ROOT}${TCLX_INST_LIB}
	if test "@SHARED_BUILD@" = "1"; then \
	    ${INSTCOPY} libtclx.so.0 ${INSTALL_ROOT}${TCLX_INST_LIB} ;\
	    cp -fd libtclx.so ${INSTALL_ROOT}${TCLX_INST_LIB} ;\
	    ${INSTCOPY} pkgIndex.tcl ${INSTALL_ROOT}${TCLX_EXEC_RUNTIME} ;\
	fi





LIBTCLX = ../../tcl/unix/${TCLX_STLIB_NAME}
TCL = ../../tcl/unix/tcl

HELP_DIR = ${srcbasedir}/tk/help

TEST_OBJS = tkTest.o tkSquare.o tclThreadTest.o tkXunixTest.o



standalone: wishx.standalone tktest.standalone hello

wishx: tkXAppInit.o libtkx.so.0 libtkx.so libtkx${DBGX}.a ${TCL} Makefile
	${CC} ${LD_SWITCHES} tkXAppInit.o ${ALL_LIBS} \
	    -o $@ || (rm -f $@; exit 1)

wishx.static: tkXAppInit.o libtkx${DBGX}.a ${LIBTCLX} Makefile
	${CC} ${LD_SWITCHES} tkXAppInit.o ${STATIC_LIBS} -o $@ || \
	    (rm -f $@; exit 1)

wishx.standalone: tkXAppInitSA.o libtkx${DBGX}.a ${LIBTCLX} Makefile
	${CC} ${LD_SWITCHES} tkXAppInitSA.o ${STATIC_LIBS} -o $@ || \
	    (rm -f $@; exit 1)

libtkx${DBGX}.a: ${OBJS}
	${AR} cr $@ ${OBJS}
	${RANLIB} $@

libtkx.so.0: ${SOBJS}
	rm -f ${TKX_SHLIB_NAME}
	${CC} -pipe -shared -Wl,-soname,$@ -o $@ ${SOBJS} ${TCL_SHLIB_LD_LIBS} -L${TCL_UNIX_DIR} -ltcl -L${TK_UNIX_DIR} -ltk ${TCLX_BUILD_LIB_SPEC}

libtkx.so: libtkx.so.0
	ln -sf $< $@

hello:	hello.c
	${CC} ${LD_SWITCHES} -o $@ hello.c ${STATIC_LIBS}

# Generate the test program.
#

tktest: ${TEST_OBJS} libtkx.so.0 libtkx.so libtkx${DBGX}.a ${TCL}
	${CC} ${LD_SWITCHES} ${TEST_OBJS} ${ALL_LIBS} \
	    -o $@ || (rm -f $@; exit 1)

tktest.static: ${TEST_OBJS} libtkx${DBGX}.a ${TCL}
	${CC} ${LD_SWITCHES} ${TEST_OBJS} ${STATIC_LIBS} \
	    -o $@ || (rm -f $@; exit 1)

tktest.standalone: ${TEST_SAOBJS} libtkx${DBGX}.a ${TCL}
	${CC} ${LD_SWITCHES} ${TEST_SAOBJS} ${STATIC_LIBS} \
	    -o $@ || (rm -f $@; exit 1)


BUILDHELP=@BUILDHELP@
buildhelp:
	rm -rf ${HELP_DIR} help help.tmp
#	if test ! -d ${HELP_DIR} ; then \
#	    mkdir ${HELP_DIR} ;\
#	fi
	mkdir ${HELP_DIR}
	${BLDMANHELP} ${TK_SRC_DIR}/doc ${TCLX_TOOLS_SRC_DIR}/tkmanpages \
	    ${HELP_DIR} Tk.brf

	fi
	${INSTCOPY} tkxConfig.sh ${INSTALL_ROOT}${TKX_INST_LIB}
	if test "@SHARED_BUILD@" = "1"; then \
	    ${INSTCOPY} libtkx.so.0 ${INSTALL_ROOT}${TKX_INST_LIB} ;\
	    cp -df libtkx.so ${INSTALL_ROOT}${TKX_INST_LIB} ;\
	    ${INSTCOPY} pkgIndex.tcl ${INSTALL_ROOT}${TKX_EXEC_RUNTIME} ;\
	fi
	${INSTCOPY} tclhelp ${INSTALL_ROOT}${TKX_INST_BIN}




#
# Defines for cpp.
#
TCLX_DEFS=' -DSTDC_HEADERS=1 -DNDEBUG=1 -DRETSIGTYPE=void '

#
# Additional libraries added by TclX.

# String to pass to linker to pick up the TclX library from its
# installed directory.
#
TCLX_LIB_SPEC='-ltclx'

#
# Search flags that specify how to find the TclX shared libraries at run time
# on some systems.
#
TCLX_LD_SEARCH_FLAGS=''



Lines 19-25 Link Here

(-)tclx8.3/tk/unix/tkxConfig.sh.in.makecfg (-2 / +2 lines)
19	#	19	#
20	# Defines for cpp.	20	# Defines for cpp.
21	#	21	#
22	TKX_DEFS='@DEFS@'	22	TKX_DEFS=' -DSTDC_HEADERS=1 -DNDEBUG=1 -DRETSIGTYPE=void '
23		23
24	#	24	#
25	# Additional libraries added by TclX.	25	# Additional libraries added by TclX.
Lines 36-41 Link Here
36	# String to pass to linker to pick up the TclX library from its	36	# String to pass to linker to pick up the TclX library from its
37	# installed directory.	37	# installed directory.
38	#	38	#
39	TKX_LIB_SPEC='@TKX_LIB_SPEC@'	39	TKX_LIB_SPEC='-ltkx'
40		40
41		41

Return to bug 5707

Lines 67-90 Link Here

(-)tclx8.3/tcl/unix/Makefile.in.makecfg (-31 / +32 lines)
67		67
68	GENERIC_SOBJS = \	68	GENERIC_SOBJS = \
69	@TCLX_BUILD_DUMMY_STANDALONE@ \	69	@TCLX_BUILD_DUMMY_STANDALONE@ \
70	tclXbsearch@SHOBJ_SUFFIX@ tclXchmod@SHOBJ_SUFFIX@ \	70	tclXbsearch.o tclXchmod.o \
71	tclXcmdInit@SHOBJ_SUFFIX@ tclXcmdloop@SHOBJ_SUFFIX@ \	71	tclXcmdInit.o tclXcmdloop.o \
72	tclXdebug@SHOBJ_SUFFIX@ tclXdup@SHOBJ_SUFFIX@ \	72	tclXdebug.o tclXdup.o \
73	tclXfcntl@SHOBJ_SUFFIX@ tclXfilecmds@SHOBJ_SUFFIX@ \	73	tclXfcntl.o tclXfilecmds.o \
74	tclXfilescan@SHOBJ_SUFFIX@ tclXflock@SHOBJ_SUFFIX@ \	74	tclXfilescan.o tclXflock.o \
75	tclXfstat@SHOBJ_SUFFIX@ tclXgeneral@SHOBJ_SUFFIX@ \	75	tclXfstat.o tclXgeneral.o \
76	tclXhandles@SHOBJ_SUFFIX@ tclXunixId@SHOBJ_SUFFIX@ \	76	tclXhandles.o tclXunixId.o \
77	tclXinit@SHOBJ_SUFFIX@ tclXkeylist@SHOBJ_SUFFIX@ \	77	tclXinit.o tclXkeylist.o \
78	tclXlib@SHOBJ_SUFFIX@ tclXlist@SHOBJ_SUFFIX@ \	78	tclXlib.o tclXlist.o \
79	tclXmath@SHOBJ_SUFFIX@ tclXmsgcat@SHOBJ_SUFFIX@ \	79	tclXmath.o tclXmsgcat.o \
80	tclXlibInit@SHOBJ_SUFFIX@ tclXprocess@SHOBJ_SUFFIX@ \	80	tclXlibInit.o tclXprocess.o \
81	tclXprofile@SHOBJ_SUFFIX@ \	81	tclXprofile.o \
82	tclXselect@SHOBJ_SUFFIX@ tclXunixSock@SHOBJ_SUFFIX@ \	82	tclXselect.o tclXunixSock.o \
83	tclXsignal@SHOBJ_SUFFIX@ tclXshell@SHOBJ_SUFFIX@ \	83	tclXsignal.o tclXshell.o \
84	tclXstring@SHOBJ_SUFFIX@ tclXsocket@SHOBJ_SUFFIX@ \	84	tclXstring.o tclXsocket.o \
85	tclXunixCmds@SHOBJ_SUFFIX@ tclXutil@SHOBJ_SUFFIX@ \	85	tclXunixCmds.o tclXutil.o \
86	tclXunixOS@SHOBJ_SUFFIX@ tclXoscmds@SHOBJ_SUFFIX@ \	86	tclXunixOS.o tclXoscmds.o \
87	tclXunixDup@SHOBJ_SUFFIX@ tclXlgets@SHOBJ_SUFFIX@	87	tclXunixDup.o tclXlgets.o
88		88
89	COMPAT_OBJS = @LIBOBJS@	89	COMPAT_OBJS = @LIBOBJS@
90		90
Lines 121-127 Link Here
121	stringfile.o tcllib.o fmath.o buildhelp.o \	121	stringfile.o tcllib.o fmath.o buildhelp.o \
122	buildidx.o autoload.o tclx.o	122	buildidx.o autoload.o tclx.o
123		123
124	HELP_DIR = @HELP_DIR@/tcl	124	HELP_DIR = ${srcbasedir}/tcl/help
125		125
126	TEST_OBJS = tclTest.o tclTestObj.o tclUnixTest.o tclXtest.o \	126	TEST_OBJS = tclTest.o tclTestObj.o tclUnixTest.o tclXtest.o \
127	tclThreadTest.o tclXunixTest.o	127	tclThreadTest.o tclXunixTest.o
Lines 146-160 Link Here
146		146
147	standalone: tcl.standalone tclXtest.standalone hello	147	standalone: tcl.standalone tclXtest.standalone hello
148		148
149	tcl: tclXAppInit.o @TCLX_SHLIB_BUILD_REF@ @TCLX_STLIB_BUILD_REF@ Makefile	149	tcl: tclXAppInit.o libtclx.so libtclx.so.0 libtclx${DBGX}.a Makefile
150	${CC} ${LD_SWITCHES} tclXAppInit.o ${ALL_LIBS} \	150	${CC} ${LD_SWITCHES} tclXAppInit.o ${ALL_LIBS} \
151	-o $@ \|\| (rm -f $@; exit 1)	151	-o $@ \|\| (rm -f $@; exit 1)
152		152
153	tcl.static: tclXAppInit.o @TCLX_STLIB_BUILD_REF@ Makefile	153	tcl.static: tclXAppInit.o libtclx${DBGX}.a Makefile
154	${CC} ${LD_SWITCHES} tclXAppInit.o ${STATIC_LIBS} \	154	${CC} ${LD_SWITCHES} tclXAppInit.o ${STATIC_LIBS} \
155	-o $@ \|\| (rm -f $@; exit 1)	155	-o $@ \|\| (rm -f $@; exit 1)
156		156
157	tcl.standalone: tclXAppInitSA.o @TCLX_STLIB_BUILD_REF@ Makefile	157	tcl.standalone: tclXAppInitSA.o libtclx${DBGX}.a Makefile
158	${CC} ${LD_SWITCHES} tclXAppInitSA.o ${STATIC_LIBS} \	158	${CC} ${LD_SWITCHES} tclXAppInitSA.o ${STATIC_LIBS} \
159	-o $@ \|\| (rm -f $@; exit 1)	159	-o $@ \|\| (rm -f $@; exit 1)
160		160
Lines 162-173 Link Here
162	${AR} cr ${TCLX_STLIB_NAME} ${OBJS}	162	${AR} cr ${TCLX_STLIB_NAME} ${OBJS}
163	${RANLIB} ${TCLX_STLIB_NAME}	163	${RANLIB} ${TCLX_STLIB_NAME}
164		164
165	@TCLX_SHLIB_BUILD_TARGET@: ${SOBJS}	165	libtclx.so.0: ${SOBJS}
166	rm -f ${TCLX_SHLIB_NAME}	166	rm -f ${TCLX_SHLIB_NAME}
167	PATH=${TCL_UNIX_DIR}:${PATH}; export PATH; \	167	${CC} -pipe -shared -Wl,-soname,$@ -o $@ ${SOBJS} ${TCL_SHLIB_LD_LIBS} -L${TCL_UNIX_DIR} -ltcl
168	TCL_LIBRARY=${TCL_UNIX_DIR}/../library; export TCL_LIBRARY; \	168
169	LD_LIBRARY_PATH=${TCL_UNIX_DIR}:${LD_LIBRARY_PATH}; export LD_LIBRARY_PATH; \	169	libtclx.so: libtclx.so.0
170	${TCL_SHLIB_LD} -o ${TCLX_SHLIB_NAME} ${SOBJS} ${TCL_SHLIB_LD_LIBS}	170	ln -sf $< $@
171		171
172	hello: hello.c	172	hello: hello.c
173	${CC} ${LD_SWITCHES} -o $@ hello.c ${STATIC_LIBS}	173	${CC} ${LD_SWITCHES} -o $@ hello.c ${STATIC_LIBS}
Lines 311-319 Link Here
311	BUILDHELP=@BUILDHELP@	311	BUILDHELP=@BUILDHELP@
312	buildhelp: tcl tcl.tndx	312	buildhelp: tcl tcl.tndx
313	rm -rf ${HELP_DIR} help help.tmp	313	rm -rf ${HELP_DIR} help help.tmp
314	if test ! -d @HELP_DIR@ ; then \	314	# if test ! -d ${HELP_DIR} ; then \
315	mkdir @HELP_DIR@ ; \	315	# mkdir ${HELP_DIR} ; \
316	fi	316	# fi
317	mkdir ${HELP_DIR}	317	mkdir ${HELP_DIR}
318	${BLDMANHELP} ${TCL_SRC_DIR}/doc ${TCLX_TOOLS_SRC_DIR}/tclmanpages \	318	${BLDMANHELP} ${TCL_SRC_DIR}/doc ${TCLX_TOOLS_SRC_DIR}/tclmanpages \
319	${HELP_DIR} Tcl.brf	319	${HELP_DIR} Tcl.brf
Lines 349-355 Link Here
349	fi	349	fi
350	${INSTCOPY} tclxConfig.sh ${INSTALL_ROOT}${TCLX_INST_LIB}	350	${INSTCOPY} tclxConfig.sh ${INSTALL_ROOT}${TCLX_INST_LIB}
351	if test "@SHARED_BUILD@" = "1"; then \	351	if test "@SHARED_BUILD@" = "1"; then \
352	${INSTCOPY} ${TCLX_SHLIB_NAME} ${INSTALL_ROOT}${TCLX_INST_LIB} ;\	352	${INSTCOPY} libtclx.so.0 ${INSTALL_ROOT}${TCLX_INST_LIB} ;\
		353	cp -fd libtclx.so ${INSTALL_ROOT}${TCLX_INST_LIB} ;\
353	${INSTCOPY} pkgIndex.tcl ${INSTALL_ROOT}${TCLX_EXEC_RUNTIME} ;\	354	${INSTCOPY} pkgIndex.tcl ${INSTALL_ROOT}${TCLX_EXEC_RUNTIME} ;\
354	fi	355	fi
355		356

Lines 72-78 Link Here

(-)tclx8.3/tk/unix/Makefile.in.makecfg (-18 / +20 lines)
72	LIBTCLX = ../../tcl/unix/${TCLX_STLIB_NAME}	72	LIBTCLX = ../../tcl/unix/${TCLX_STLIB_NAME}
73	TCL = ../../tcl/unix/tcl	73	TCL = ../../tcl/unix/tcl
74		74
75	HELP_DIR = @HELP_DIR@/tk	75	HELP_DIR = ${srcbasedir}/tk/help
76		76
77	TEST_OBJS = tkTest.o tkSquare.o tclThreadTest.o tkXunixTest.o	77	TEST_OBJS = tkTest.o tkSquare.o tclThreadTest.o tkXunixTest.o
78		78
Lines 95-121 Link Here
95		95
96	standalone: wishx.standalone tktest.standalone hello	96	standalone: wishx.standalone tktest.standalone hello
97		97
98	wishx: tkXAppInit.o @TKX_SHLIB_BUILD_REF@ @TKX_STLIB_BUILD_REF@ ${TCL} Makefile	98	wishx: tkXAppInit.o libtkx.so.0 libtkx.so libtkx${DBGX}.a ${TCL} Makefile
99	${CC} ${LD_SWITCHES} tkXAppInit.o ${ALL_LIBS} \	99	${CC} ${LD_SWITCHES} tkXAppInit.o ${ALL_LIBS} \
100	-o $@ \|\| (rm -f $@; exit 1)	100	-o $@ \|\| (rm -f $@; exit 1)
101		101
102	wishx.static: tkXAppInit.o ${TKX_STLIB_NAME} ${LIBTCLX} Makefile	102	wishx.static: tkXAppInit.o libtkx${DBGX}.a ${LIBTCLX} Makefile
103	${CC} ${LD_SWITCHES} tkXAppInit.o ${STATIC_LIBS} -o $@ \|\| \	103	${CC} ${LD_SWITCHES} tkXAppInit.o ${STATIC_LIBS} -o $@ \|\| \
104	(rm -f $@; exit 1)	104	(rm -f $@; exit 1)
105		105
106	wishx.standalone: tkXAppInitSA.o ${TKX_STLIB_NAME} ${LIBTCLX} Makefile	106	wishx.standalone: tkXAppInitSA.o libtkx${DBGX}.a ${LIBTCLX} Makefile
107	${CC} ${LD_SWITCHES} tkXAppInitSA.o ${STATIC_LIBS} -o $@ \|\| \	107	${CC} ${LD_SWITCHES} tkXAppInitSA.o ${STATIC_LIBS} -o $@ \|\| \
108	(rm -f $@; exit 1)	108	(rm -f $@; exit 1)
109		109
110	${TKX_STLIB_NAME}: ${OBJS}	110	libtkx${DBGX}.a: ${OBJS}
111	${AR} cr ${TKX_STLIB_NAME} ${OBJS}	111	${AR} cr $@ ${OBJS}
112	${RANLIB} ${TKX_STLIB_NAME}	112	${RANLIB} $@
113		113
114	@TKX_SHLIB_BUILD_TARGET@: ${SOBJS}	114	libtkx.so.0: ${SOBJS}
115	rm -f ${TKX_SHLIB_NAME}	115	rm -f ${TKX_SHLIB_NAME}
116	${TCL_SHLIB_LD} -o ${TKX_SHLIB_NAME} ${SOBJS} \	116	${CC} -pipe -shared -Wl,-soname,$@ -o $@ ${SOBJS} ${TCL_SHLIB_LD_LIBS} -L${TCL_UNIX_DIR} -ltcl -L${TK_UNIX_DIR} -ltk ${TCLX_BUILD_LIB_SPEC}
117	${TK_BUILD_STUB_LIB_SPEC} ${TCLX_BUILD_LIB_SPEC} \	117
118	${TCL_BUILD_STUB_LIB_SPEC} ${TCL_SHLIB_LD_LIBS}	118	libtkx.so: libtkx.so.0
		119	ln -sf $< $@
119		120
120	hello: hello.c	121	hello: hello.c
121	${CC} ${LD_SWITCHES} -o $@ hello.c ${STATIC_LIBS}	122	${CC} ${LD_SWITCHES} -o $@ hello.c ${STATIC_LIBS}
Lines 157-171 Link Here
157	# Generate the test program.	158	# Generate the test program.
158	#	159	#
159		160
160	tktest: ${TEST_OBJS} @TKX_SHLIB_BUILD_REF@ @TKX_STLIB_BUILD_REF@ ${TCL}	161	tktest: ${TEST_OBJS} libtkx.so.0 libtkx.so libtkx${DBGX}.a ${TCL}
161	${CC} ${LD_SWITCHES} ${TEST_OBJS} ${ALL_LIBS} \	162	${CC} ${LD_SWITCHES} ${TEST_OBJS} ${ALL_LIBS} \
162	-o $@ \|\| (rm -f $@; exit 1)	163	-o $@ \|\| (rm -f $@; exit 1)
163		164
164	tktest.static: ${TEST_OBJS} @TKX_STLIB_BUILD_REF@ ${TCL}	165	tktest.static: ${TEST_OBJS} libtkx${DBGX}.a ${TCL}
165	${CC} ${LD_SWITCHES} ${TEST_OBJS} ${STATIC_LIBS} \	166	${CC} ${LD_SWITCHES} ${TEST_OBJS} ${STATIC_LIBS} \
166	-o $@ \|\| (rm -f $@; exit 1)	167	-o $@ \|\| (rm -f $@; exit 1)
167		168
168	tktest.standalone: ${TEST_SAOBJS} @TKX_STLIB_BUILD_REF@ ${TCL}	169	tktest.standalone: ${TEST_SAOBJS} libtkx${DBGX}.a ${TCL}
169	${CC} ${LD_SWITCHES} ${TEST_SAOBJS} ${STATIC_LIBS} \	170	${CC} ${LD_SWITCHES} ${TEST_SAOBJS} ${STATIC_LIBS} \
170	-o $@ \|\| (rm -f $@; exit 1)	171	-o $@ \|\| (rm -f $@; exit 1)
171		172
Lines 203-211 Link Here
203	BUILDHELP=@BUILDHELP@	204	BUILDHELP=@BUILDHELP@
204	buildhelp:	205	buildhelp:
205	rm -rf ${HELP_DIR} help help.tmp	206	rm -rf ${HELP_DIR} help help.tmp
206	if test ! -d @HELP_DIR@ ; then \	207	# if test ! -d ${HELP_DIR} ; then \
207	mkdir @HELP_DIR@ ;\	208	# mkdir ${HELP_DIR} ;\
208	fi	209	# fi
209	mkdir ${HELP_DIR}	210	mkdir ${HELP_DIR}
210	${BLDMANHELP} ${TK_SRC_DIR}/doc ${TCLX_TOOLS_SRC_DIR}/tkmanpages \	211	${BLDMANHELP} ${TK_SRC_DIR}/doc ${TCLX_TOOLS_SRC_DIR}/tkmanpages \
211	${HELP_DIR} Tk.brf	212	${HELP_DIR} Tk.brf
Lines 237-243 Link Here
237	fi	238	fi
238	${INSTCOPY} tkxConfig.sh ${INSTALL_ROOT}${TKX_INST_LIB}	239	${INSTCOPY} tkxConfig.sh ${INSTALL_ROOT}${TKX_INST_LIB}
239	if test "@SHARED_BUILD@" = "1"; then \	240	if test "@SHARED_BUILD@" = "1"; then \
240	${INSTCOPY} ${TKX_SHLIB_NAME} ${INSTALL_ROOT}${TKX_INST_LIB} ;\	241	${INSTCOPY} libtkx.so.0 ${INSTALL_ROOT}${TKX_INST_LIB} ;\
		242	cp -df libtkx.so ${INSTALL_ROOT}${TKX_INST_LIB} ;\
241	${INSTCOPY} pkgIndex.tcl ${INSTALL_ROOT}${TKX_EXEC_RUNTIME} ;\	243	${INSTCOPY} pkgIndex.tcl ${INSTALL_ROOT}${TKX_EXEC_RUNTIME} ;\
242	fi	244	fi
243	${INSTCOPY} tclhelp ${INSTALL_ROOT}${TKX_INST_BIN}	245	${INSTCOPY} tclhelp ${INSTALL_ROOT}${TKX_INST_BIN}

Lines 18-24 Link Here

(-)tclx8.3/tcl/unix/tclxConfig.sh.in.makecfg (-3 / +3 lines)
18	#	18	#
19	# Defines for cpp.	19	# Defines for cpp.
20	#	20	#
21	TCLX_DEFS='@DEFS@'	21	TCLX_DEFS=' -DSTDC_HEADERS=1 -DNDEBUG=1 -DRETSIGTYPE=void '
22		22
23	#	23	#
24	# Additional libraries added by TclX.	24	# Additional libraries added by TclX.
Lines 35-46 Link Here
35	# String to pass to linker to pick up the TclX library from its	35	# String to pass to linker to pick up the TclX library from its
36	# installed directory.	36	# installed directory.
37	#	37	#
38	TCLX_LIB_SPEC='@TCLX_LIB_SPEC@'	38	TCLX_LIB_SPEC='-ltclx'
39		39
40	#	40	#
41	# Search flags that specify how to find the TclX shared libraries at run time	41	# Search flags that specify how to find the TclX shared libraries at run time
42	# on some systems.	42	# on some systems.
43	#	43	#
44	TCLX_LD_SEARCH_FLAGS='@TCLX_LD_SEARCH_FLAGS@'	44	TCLX_LD_SEARCH_FLAGS=''
45		45
46		46