Diff

Differences From Artifact [024981b5ad]:

To Artifact [903bfeecb6]:


     1         -CC = @CC@
     2         -CFLAGS = @CFLAGS@ @SHOBJFLAGS@ -Wall
     3         -CPPFLAGS = @CPPFLAGS@ @DEFS@ -DKITDLL_MAKE_LOADABLE=1
     4         -WISH_CFLAGS = @WISH_CFLAGS@
     5         -LDFLAGS = @LDFLAGS@
     6         -SHOBJLDFLAGS = @SHOBJLDFLAGS@
     7         -LIBS = @LIBS@
     8         -STATICLIBS = @ARCHS@
     9         -OBJS = vfs_kitdll_data_tcl.o kitInit.o rechan.o pwb.o zlib.o
    10         -EXTRA_OBJS = @EXTRA_OBJS@
    11         -TCLSH_NATIVE = tclsh
            1  +OBJS = kitInit.o rechan.o pwb.o zlib.o
    12      2   
    13      3   # Default target
    14      4   all: libtclkit@KITDLL_LIB_VERSION@.@SHOBJEXT@
    15      5   
    16         -# Build targets
    17         -## VFS Build
    18         -vfs_kitdll_data_tcl.o: vfs_kitdll_data_tcl.c
    19         -vfs_kitdll_data_tcl.c: dir2c.tcl starpack.vfs vfs_kitdll_data.c
    20         -	"$(TCLSH_NATIVE)" dir2c.tcl tcl starpack.vfs > vfs_kitdll_data_tcl.c
    21         -
    22         -## Tclkit Build
    23         -kitInit.o: kitInit.c vfs_kitdll.tcl.h
    24         -vfs_kitdll.tcl.h: vfs_kitdll.tcl
    25         -	"$(TCLSH_NATIVE)" ./stringify.tcl vfs_kitdll.tcl > vfs_kitdll.tcl.h
    26         -
    27         -## Extensions
    28         -rechan.o: rechan.c
    29         -pwb.o: pwb.c
    30         -zlib.o: zlib.c
            6  +-include Makefile.common
    31      7   
    32      8   ## DLL Build
    33         -libtclkit@KITDLL_LIB_VERSION@.@SHOBJEXT@: $(OBJS) $(EXTRA_OBJS)
    34         -	$(CC) $(CPPFLAGS) $(CFLAGS) -o libtclkit@KITDLL_LIB_VERSION@.@SHOBJEXT@ $(OBJS) $(EXTRA_OBJS) $(LDFLAGS) $(SHOBJLDFLAGS) @WHOLEARCHIVE@ $(STATICLIBS) @NOWHOLEARCHIVE@ $(LIBS)
            9  +libtclkit@KITDLL_LIB_VERSION@.@SHOBJEXT@: $(OBJS) $(EXTRA_KIT_DEPS) $(EXTRA_OBJS) $(EXTRA_VFS_OBJS)
           10  +	$(CC) $(CPPFLAGS) $(CFLAGS) -o libtclkit@KITDLL_LIB_VERSION@.@SHOBJEXT@ $(OBJS) $(EXTRA_OBJS) $(EXTRA_VFS_OBJS) $(LDFLAGS) $(SHOBJLDFLAGS) @WHOLEARCHIVE@ $(ARCHS) @NOWHOLEARCHIVE@ $(LIBS)
           11  +	-for striplib in $(STRIPLIBS); do $(OBJCOPY) --weaken "$${striplib}"; done
           12  +	-mv libtclkit@KITDLL_LIB_VERSION@.@SHOBJEXT@ libtclkit@KITDLL_LIB_VERSION@.@SHOBJEXT@.safe; \
           13  +		$(CC) $(CPPFLAGS) $(CFLAGS) -o libtclkit@KITDLL_LIB_VERSION@.@SHOBJEXT@ $(OBJS) $(EXTRA_OBJS) $(EXTRA_VFS_OBJS) $(LDFLAGS) $(SHOBJLDFLAGS) @WHOLEARCHIVE@ $(ARCHS) @NOWHOLEARCHIVE@ $(LIBS) || \
           14  +			mv libtclkit@KITDLL_LIB_VERSION@.@SHOBJEXT@.safe libtclkit@KITDLL_LIB_VERSION@.@SHOBJEXT@
           15  +	-rm -f libtclkit@KITDLL_LIB_VERSION@.@SHOBJEXT@.safe
    35     16   
    36     17   # Test driver
    37     18   tclsh.o: tclsh.c
    38     19   tclsh: tclsh.o $(EXTRA_OBJS) libtclkit@KITDLL_LIB_VERSION@.@SHOBJEXT@
    39         -	$(CC) $(CPPFLAGS) $(CFLAGS) -o tclsh tclsh.o $(EXTRA_OBJS) -L. -ltclkit@KITDLL_LIB_VERSION@ -Wl,-rpath,.
           20  +	$(CC) $(CPPFLAGS) $(CFLAGS) -o tclsh tclsh.o $(EXTRA_OBJS) -L. -ltclkit@KITDLL_LIB_VERSION@ $(LDRUNPATH)
    40     21   
    41     22   wish.o: wish.c
    42     23   wish: wish.o $(EXTRA_OBJS) libtclkit@KITDLL_LIB_VERSION@.@SHOBJEXT@
    43         -	$(CC) $(CPPFLAGS) $(CFLAGS) $(WISH_CFLAGS) -o wish wish.o $(EXTRA_OBJS) -L. -ltclkit@KITDLL_LIB_VERSION@ -Wl,-rpath,.
    44         -
    45         -# Cleanup routeines
    46         -clean:
    47         -	rm -f libtclkit@KITDLL_LIB_VERSION@.@SHOBJEXT@
    48         -	rm -f $(OBJS)
    49         -	rm -f vfs_kitdll_data_tcl.c
    50         -	rm -f vfs_kitdll.tcl.h
    51         -	rm -f tclsh.o tclsh tclsh.exe
    52         -	rm -f wish.o wish wish.exe
    53         -
    54         -distclean: clean
    55         -	rm -f config.status config.log
    56         -	rm -f *~
    57         -	rm -f Makefile
    58         -	rm -rf starpack.vfs
    59         -
    60         -mrproper: distclean
    61         -
    62         -.PHONY: all clean distclean
           24  +	$(CC) $(CPPFLAGS) $(CFLAGS) $(WISH_CFLAGS) -o wish wish.o $(EXTRA_OBJS) -L. -ltclkit@KITDLL_LIB_VERSION@ $(LDRUNPATH)