Check-in [e58c3fc866]
Bounty program for improvements to Tcl and certain Tcl packages.
Overview
Comment:Updated to support a static and shared build
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | tls-1-7
Files: files | file ages | folders
SHA1: e58c3fc866231973dbaf21e5eaffe723e2dea652
User & Date: rkeene on 2016-11-24 04:38:13
Other Links: branch diff | manifest | tags
Context
2016-11-24
04:44
Added comments to Makefile check-in: 4a2c0df32c user: rkeene tags: tls-1-7
04:38
Updated to support a static and shared build check-in: e58c3fc866 user: rkeene tags: tls-1-7
04:20
Updated to load a local copy of "tls.tcl" if it is found, for backward compatibilty reasons check-in: 691ec7b72a user: rkeene tags: tls-1-7
Changes

Modified Makefile.in from [0c2cd26227] to [12ff01b8da].

1

2
3
4
5
6
7
8
9
10
11
12
13
14
15


16
17
18
19
20
21
22
23
24
25
26
27
28
29


30
31
32

33
34
35
36
37
38
39
40
41
42
43
44
CC = @[email protected]

CFLAGS = @[email protected] @[email protected]
CPPFLAGS = @[email protected] [email protected]@ @[email protected]
LDFLAGS = @[email protected] @[email protected]
LIBS = @[email protected]
INSTALL = @[email protected]
PACKAGE_VERSION = @[email protected]
TCL_PACKAGE_PATH = @[email protected]
PACKAGE_INSTALL_DIR = $(TCL_PACKAGE_PATH)/tcltls$(PACKAGE_VERSION)

all: [email protected][email protected]

[email protected]@: tls.o tlsBIO.o tlsIO.o tlsX509.o
	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o [email protected]@ tls.o tlsBIO.o tlsIO.o tlsX509.o $(LIBS)



install: tcltls.@[email protected] pkgIndex.tcl

tls.o: @[email protected]/tls.c @[email protected]/tlsInt.h @[email protected]/tclOpts.h @[email protected]/tls.tcl.h
tlsBIO.o: @[email protected]/tlsBIO.c @[email protected]/tlsInt.h
tlsIO.o: @[email protected]/tlsIO.c @[email protected]/tlsInt.h
tlsX509.o: @[email protected]/tlsX509.c @[email protected]/tlsInt.h

@[email protected]/tls.tcl.h: tls.tcl
	xxd -i < tls.tcl > '@[email protected]/tls.tcl.h.new'
	mv '@[email protected]/tls.tcl.h.new' '@[email protected]/tls.tcl.h'

%.o: @[email protected]/%.c
	$(CC) $(CPPFLAGS) $(CFLAGS) -o "[email protected]" -c "$<"



clean:
	rm -f tls.o tlsBIO.o tlsIO.o tlsX509.o
	rm -f [email protected]@


distclean: clean
	rm -f config.log config.status
	rm -f Makefile pkgIndex.tcl

mrproper: distclean
	rm -f @[email protected]/tls.tcl.h
	rm -f @[email protected]/configure @[email protected]/config.sub @[email protected]/config.guess @[email protected]/install-sh
	rm -f @[email protected]/aclocal.m4
	rm -rf @[email protected]/aclocal @[email protected]/autom4te.cache

.PHONY: all install clean distclean mrproper
>









|




>
>
|













>
>



>












1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
CC = @[email protected]
AR = @[email protected]
CFLAGS = @[email protected] @[email protected]
CPPFLAGS = @[email protected] [email protected]@ @[email protected]
LDFLAGS = @[email protected] @[email protected]
LIBS = @[email protected]
INSTALL = @[email protected]
PACKAGE_VERSION = @[email protected]
TCL_PACKAGE_PATH = @[email protected]
PACKAGE_INSTALL_DIR = $(TCL_PACKAGE_PATH)/tcltls$(PACKAGE_VERSION)

all: @EXTENSION_TARGE[email protected]

[email protected]@: tls.o tlsBIO.o tlsIO.o tlsX509.o
	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o [email protected]@ tls.o tlsBIO.o tlsIO.o tlsX509.o $(LIBS)

tcltls.a: tls.o tlsBIO.o tlsIO.o tlsX509.o
	$(AR) rcu tcltls.a.new tls.o tlsBIO.o tlsIO.o tlsX509.o
	mv tcltls.a.new tcltls.a

tls.o: @[email protected]/tls.c @[email protected]/tlsInt.h @[email protected]/tclOpts.h @[email protected]/tls.tcl.h
tlsBIO.o: @[email protected]/tlsBIO.c @[email protected]/tlsInt.h
tlsIO.o: @[email protected]/tlsIO.c @[email protected]/tlsInt.h
tlsX509.o: @[email protected]/tlsX509.c @[email protected]/tlsInt.h

@[email protected]/tls.tcl.h: tls.tcl
	xxd -i < tls.tcl > '@[email protected]/tls.tcl.h.new'
	mv '@[email protected]/tls.tcl.h.new' '@[email protected]/tls.tcl.h'

%.o: @[email protected]/%.c
	$(CC) $(CPPFLAGS) $(CFLAGS) -o "[email protected]" -c "$<"

install: @[email protected] pkgIndex.tcl

clean:
	rm -f tls.o tlsBIO.o tlsIO.o tlsX509.o
	rm -f [email protected]@
	rm -f tcltls.a.new tcltls.a

distclean: clean
	rm -f config.log config.status
	rm -f Makefile pkgIndex.tcl

mrproper: distclean
	rm -f @[email protected]/tls.tcl.h
	rm -f @[email protected]/configure @[email protected]/config.sub @[email protected]/config.guess @[email protected]/install-sh
	rm -f @[email protected]/aclocal.m4
	rm -rf @[email protected]/aclocal @[email protected]/autom4te.cache

.PHONY: all install clean distclean mrproper

Modified configure.in from [c984774d96] to [00e446188b].

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20












21
22
23
dnl Define ourselves
AC_INIT(tcltls, @@[email protected]@)

dnl Checks for programs.
AC_PROG_CC
AC_PROG_MAKE_SET
AC_PROG_INSTALL
AC_GNU_SOURCE

dnl Determine system information
DC_CHK_OS_INFO

dnl Determine how to make shared objects
DC_GET_SHOBJFLAGS

dnl Look for appropriate headers
AC_CHECK_HEADERS(unistd.h stdlib.h string.h strings.h)

dnl Perform Tcl Extension required stuff
TCLEXT_INIT













dnl Produce output
AC_OUTPUT(Makefile pkgIndex.tcl)











<
<
<





>
>
>
>
>
>
>
>
>
>
>
>



1
2
3
4
5
6
7
8
9
10
11
12



13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
dnl Define ourselves
AC_INIT(tcltls, @@[email protected]@)

dnl Checks for programs.
AC_PROG_CC
AC_PROG_MAKE_SET
AC_PROG_INSTALL
AC_GNU_SOURCE

dnl Determine system information
DC_CHK_OS_INFO




dnl Look for appropriate headers
AC_CHECK_HEADERS(unistd.h stdlib.h string.h strings.h)

dnl Perform Tcl Extension required stuff
TCLEXT_INIT

if test "$TCLEXT_BUILD" != 'static'; then
	dnl Determine how to make shared objects
	DC_GET_SHOBJFLAGS

	EXTENSION_TARGET="tcltls.${SHOBJEXT}"
else
	AC_CHECK_TOOL([AR], [ar], [false])
	AC_CHECK_TOOL([RANLIB], [ranlib], [:])
	EXTENSION_TARGET="tcltls.a"
fi
AC_SUBST(EXTENSION_TARGET)

dnl Produce output
AC_OUTPUT(Makefile pkgIndex.tcl)