Attachment "sampleextension.diff" to
ticket [794741ffff]
added by
das
2003-08-25 22:21:22.
Index: Makefile.in
===================================================================
RCS file: /cvsroot/tcl/sampleextension/Makefile.in,v
retrieving revision 1.41
diff -u -u -r1.41 Makefile.in
--- Makefile.in 12 Jul 2002 00:12:19 -0000 1.41
+++ Makefile.in 4 Aug 2003 20:49:17 -0000
@@ -47,6 +47,9 @@
sample_OBJECTS = $(sample_SOURCES:.c=.@OBJEXT@)
sample_LIB_FILE = @sample_LIB_FILE@
+#samplestub_OBJECTS = sampleStubLib.$(OBJEXT)
+#samplestub_LIB_FILE = @samplestub_LIB_FILE@
+
#========================================================================
# RUNTIME_SOURCES identifies Tcl runtime files that are associated with
# this package that need to be installed, if any.
@@ -123,6 +126,7 @@
MAKE_STATIC_LIB = @MAKE_STATIC_LIB@
OBJEXT = @OBJEXT@
RANLIB = @RANLIB@
+RANLIB_STUB = @RANLIB_STUB@
SHLIB_CFLAGS = @SHLIB_CFLAGS@
SHLIB_LD = @SHLIB_LD@
SHLIB_LDFLAGS = @SHLIB_LDFLAGS@
@@ -146,6 +150,7 @@
EXTRA_PATH = $(top_builddir):$(TCL_BIN_DIR)
TCLSH_ENV = TCL_LIBRARY=`@CYGPATH@ $(TCL_SRC_DIR)/library` \
LD_LIBRARY_PATH="$(EXTRA_PATH):$(LD_LIBRARY_PATH)" \
+ DYLD_LIBRARY_PATH="$(EXTRA_PATH):$(DYLD_LIBRARY_PATH)" \
LIBPATH="$(EXTRA_PATH):${LIBPATH}" \
SHLIB_PATH="$(EXTRA_PATH):${SHLIB_PATH}" \
PATH="$(EXTRA_PATH):$(PATH)" \
@@ -258,6 +263,11 @@
${MAKE_LIB}
$(RANLIB) $($(PACKAGE)_LIB_FILE)
+$($(PACKAGE)stub_LIB_FILE): $($(PACKAGE)stub_OBJECTS)
+ -rm -f $($(PACKAGE)stub_LIB_FILE)
+ ${MAKE_STUB_LIB}
+ $(RANLIB_STUB) $($(PACKAGE)stub_LIB_FILE)
+
#========================================================================
# We need to enumerate the list of .c to .o lines here.
#
@@ -369,8 +379,14 @@
if test -f $$p; then \
echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p"; \
$(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p; \
+ stub=`echo $$p|sed -e "s/.*\(stub\).*/\1/"`; \
+ if test "x$$stub" = "xstub"; then \
+ echo " $(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p"; \
+ $(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p; \
+ else \
echo " $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p"; \
$(RANLIB) $(DESTDIR)$(pkglibdir)/$$p; \
+ fi; \
ext=`echo $$p|sed -e "s/.*\.//"`; \
if test "x$$ext" = "xdll"; then \
lib=`basename $$p|sed -e 's/.[^.]*$$//'`.lib; \
Index: tclconfig/tcl.m4
===================================================================
RCS file: /cvsroot/tcl/tclconfig/tcl.m4,v
retrieving revision 1.33
diff -u -u -r1.33 tcl.m4
--- tclconfig/tcl.m4 22 Apr 2003 17:17:59 -0000 1.33
+++ tclconfig/tcl.m4 4 Aug 2003 20:49:18 -0000
@@ -2670,6 +2670,7 @@
# substituted.
#--------------------------------------------------------------------
+ RANLIB_STUB="${RANLIB}"
if test "${TEA_PLATFORM}" = "windows" ; then
if test "${SHARED_BUILD}" = "1" ; then
# We force the unresolved linking of symbols that are really in
@@ -2711,6 +2712,7 @@
AC_SUBST(MAKE_SHARED_LIB)
AC_SUBST(MAKE_STATIC_LIB)
AC_SUBST(MAKE_STUB_LIB)
+ AC_SUBST(RANLIB_STUB)
])
#------------------------------------------------------------------------
