Check-in [fc9a2d4694]
Overview
Comment:Updated to support accepting extra objects supplied by the EXTRA_OBJS environment variable
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:fc9a2d46949c452356966a26e18e6dc66936d0b8
User & Date: rkeene on 2010-09-26 04:43:20
Other Links: manifest | tags
Context
2010-09-26
04:43
Fixed issue with zlib checking

Added support for checking for "tkbase.res.o" (present on Win32 builds) and adding to EXTRA_OBJS to link to the "kit" application check-in: fd276919ad user: rkeene tags: trunk

04:43
Updated to support accepting extra objects supplied by the EXTRA_OBJS environment variable check-in: fc9a2d4694 user: rkeene tags: trunk
04:43
Updated to create "tkbase.res.o" if building for Win32 check-in: d7a9831961 user: rkeene tags: trunk
Changes

Modified kitsh/buildsrc/kitsh-0.0/Makefile.in from [ec9cb72516] to [28bd753a6b].

     1      1   CC = @CC@
     2      2   CFLAGS = @CFLAGS@ @DEFS@ -DSTDC_HEADERS=1 -DTK_LOCAL_APPINIT=TclKit_AppInit
     3      3   CPPFLAGS = @CPPFLAGS@ @DEFS@ -DSTDC_HEADERS=1 -DTK_LOCAL_APPINIT=TclKit_AppInit
     4      4   LDFLAGS = @LDFLAGS@
     5      5   LIBS = @LIBS@
     6      6   ARCHS = @ARCHS@
     7         -OBJS = kitInit.o main.o pwb.o rechan.o zlib.o winMain.o
            7  +OBJS = kitInit.o main.o pwb.o rechan.o zlib.o winMain.o @EXTRA_OBJS@
     8      8   
     9      9   all: kit
    10     10   
    11     11   kit: $(OBJS) $(ARCHS)
    12     12   	$(CC) $(CPPFLAGS) $(CFLAGS) -o kit $(OBJS) $(ARCHS) $(LDFLAGS) $(LIBS)
    13     13   
    14     14   mk4tcl.tcl.h: mk4tcl.tcl

Modified kitsh/buildsrc/kitsh-0.0/configure.ac from [dc10e35060] to [66c2193783].

    16     16   DC_STATIC_LIBGCC
    17     17   
    18     18   dnl Find the appropriate Tcl headers and libraries
    19     19   DC_DO_TCL
    20     20   
    21     21   dnl Find archives we need to link to
    22     22   DC_FIND_TCLKIT_LIBS
           23  +
           24  +dnl Find extra objects we need to link as a part of "kit"
           25  +AC_SUBST(EXTRA_OBJS)
    23     26   
    24     27   dnl Determine if we have "Tcl_SetStartupScript" (8.6.x) or "TclSetStartupScriptPath" (8.4.x)
    25     28   SAVE_LIBS="${LIBS}"
    26     29   LIBS="${ARCHS} ${LIBS}"
    27     30   AC_CHECK_FUNCS(Tcl_SetStartupScript TclSetStartupScriptPath)
    28     31   LIBS="${SAVE_LIBS}"
    29     32