Check-in [2c8d3629bc]

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Better handling of shared/static naming issues
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256:2c8d3629bccf84a05d12f7db4c9f9f4d4b208bae2de4e90c61ced93174c755a7
User & Date: rkeene 2019-04-12 16:58:33
Context
2019-06-19
17:45
Make hardening optional, disabled by default when statically linking because it requires the linking program to fully participate check-in: 25024a31b0 user: rkeene tags: trunk
2019-04-25
16:51
Merged in changes from trunk check-in: a64e691ada user: rkeene tags: tls-1-7
2019-04-12
16:58
Better handling of shared/static naming issues check-in: 2c8d3629bc user: rkeene tags: trunk
2019-04-09
18:47
Make extension filename more centralized check-in: 8e730964e5 user: rkeene tags: trunk
Changes

Changes to Makefile.in.

    14     14   INSTALL = @INSTALL@
    15     15   INSTALL_PROGRAM = @INSTALL_PROGRAM@
    16     16   INSTALL_DATA = @INSTALL_DATA@
    17     17   VPATH = @srcdir@
    18     18   
    19     19   all: @EXTENSION_TARGET@
    20     20   
    21         -ifeq (@TCLEXT_BUILD@,shared)
           21  +@EXTENSION_TARGET@: @TCLEXT_BUILD@-@EXTENSION_TARGET@
           22  +	mv @TCLEXT_BUILD@-@EXTENSION_TARGET@ @EXTENSION_TARGET@
           23  +
    22     24   # The shared object target
    23         -@EXTENSION_TARGET@: tls.o tlsBIO.o tlsIO.o tlsX509.o Makefile
    24         -	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o tcltls.@SHOBJEXT@ tls.o tlsBIO.o tlsIO.o tlsX509.o $(LIBS)
    25         -else
           25  +shared-@EXTENSION_TARGET@: tls.o tlsBIO.o tlsIO.o tlsX509.o Makefile
           26  +	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o shared-@EXTENSION_TARGET@ tls.o tlsBIO.o tlsIO.o tlsX509.o $(LIBS)
           27  +
    26     28   # The static target
    27         -@EXTENSION_TARGET@: tls.o tlsBIO.o tlsIO.o tlsX509.o Makefile
    28         -	$(AR) rcu tcltls.a.new tls.o tlsBIO.o tlsIO.o tlsX509.o
    29         -	-$(RANLIB) tcltls.a.new
    30         -	mv tcltls.a.new tcltls.a
    31         -endif
           29  +static-@EXTENSION_TARGET@: tls.o tlsBIO.o tlsIO.o tlsX509.o Makefile
           30  +	$(AR) rcu static-@EXTENSION_TARGET@ tls.o tlsBIO.o tlsIO.o tlsX509.o
           31  +	-$(RANLIB) static-@EXTENSION_TARGET@
    32     32   
    33     33   # Dependencies for all our targets
    34     34   tls.o: @srcdir@/tls.c @srcdir@/tlsInt.h @srcdir@/tclOpts.h tls.tcl.h dh_params.h Makefile
    35     35   tlsBIO.o: @srcdir@/tlsBIO.c @srcdir@/tlsInt.h Makefile
    36     36   tlsIO.o: @srcdir@/tlsIO.c @srcdir@/tlsInt.h Makefile
    37     37   tlsX509.o: @srcdir@/tlsX509.c @srcdir@/tlsInt.h Makefile
    38     38   
................................................................................
    70     70   # Test target, run the automated test suite
    71     71   test: @EXTENSION_TARGET@
    72     72   	@TCLSH_PROG@ @srcdir@/tests/all.tcl $(TESTFLAGS) -load "lappend auto_path $(shell pwd)"
    73     73   
    74     74   # Clean the local build directory for rebuild against the same configuration
    75     75   clean:
    76     76   	rm -f tls.o tlsBIO.o tlsIO.o tlsX509.o
    77         -	rm -f tcltls.@SHOBJEXT@
    78         -	rm -f tcltls.@SHOBJEXT@.a tcltls.@SHOBJEXT@.def
    79         -	rm -f tcltls.a.new tcltls.a
           77  +	rm -f @EXTENSION_TARGET@ shared-@EXTENSION_TARGET@ static-@EXTENSION_TARGET@
           78  +	rm -f shared-@EXTENSION_TARGET@.def shared-@EXTENSION_TARGET@.lib
    80     79   	rm -f tls.tcl.h tls.tcl.h.new.1 tls.tcl.h.new.2
    81     80   
    82     81   # Clean the local build directory back to what it was after unpacking the
    83     82   # distribution tarball
    84     83   distclean: clean
    85     84   	rm -f config.log config.status
    86     85   	rm -f dh_params.h.new dh_params.h