Check-in [d62ac8ffe1]
Overview
Comment:Build system improvements
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: d62ac8ffe1cf37c6b1659719fcf3f7fa635fbb7a8cb36f6a8192222cd27fe4a3
User & Date: rkeene on 2018-07-02 06:12:22
Other Links: manifest | tags
Context
2018-07-02
06:20
Removed some changes left over from debugging check-in: c947dc3c9c user: rkeene tags: trunk
06:12
Build system improvements check-in: d62ac8ffe1 user: rkeene tags: trunk
06:12
Improved tests check-in: d603b4fb49 user: rkeene tags: trunk
Changes

Modified .fossil-settings/ignore-glob from [f4ce2e79db] to [003b6d91a2].

1
2
3

4
5
6
7
8
9
10
nano.so
nano.o
nano.syms

Makefile
pkgIndex.tcl
aclocal.m4
config.guess
config.sub
configure
install-sh



>







1
2
3
4
5
6
7
8
9
10
11
nano.so
nano.o
nano.syms
nano.tcl.h
Makefile
pkgIndex.tcl
aclocal.m4
config.guess
config.sub
configure
install-sh

Modified Makefile.in from [36321d6c7b] to [86dc23739a].

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
CC            := @CC@
CFLAGS        := @CFLAGS@ @SHOBJFLAGS@
CPPFLAGS      := -I./tweetnacl/ -I./blake2b/ -DSUPERCOP=1 @CPPFLAGS@ @SHOBJCPPFLAGS@ @DEFS@
LDFLAGS       := @LDFLAGS@
LIBS          := @LIBS@
SHOBJLDFLAGS  := @SHOBJLDFLAGS@

export CC CFLAGS CPPFLAGS


all: @EXTENSION_TARGET@

ifeq (@TCLEXT_BUILD@,shared)
@EXTENSION_TARGET@: tweetnacl/tweetnacl.o blake2b/blake2b.o nano.o Makefile
	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $(SHOBJLDFLAGS) -o @EXTENSION_TARGET@ nano.o tweetnacl/tweetnacl.o blake2b/blake2b.o $(LIBS)
	-@WEAKENSYMS@ @EXTENSION_TARGET@
	-@REMOVESYMS@ @EXTENSION_TARGET@
else
@EXTENSION_TARGET@: tweetnacl/tweetnacl.o blake2b/blake2b.o nano.o Makefile
	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $(SHOBJLDFLAGS) -o @EXTENSION_TARGET@ nano.o tweetnacl/tweetnacl.o blake2b/blake2b.o $(LIBS)
endif

nano.o: nano.c
	$(CC) $(CPPFLAGS) $(CFLAGS) -o nano.o -c nano.c







tweetnacl/tweetnacl.o:
	$(MAKE) -C tweetnacl tweetnacl.o

blake2b/blake2b.o:
	$(MAKE) -C blake2b blake2b.o

test: @EXTENSION_TARGET@
	cd build/test && ./test.tcl

clean:
	rm -f @EXTENSION_TARGET@ nano.o
	$(MAKE) -C tweetnacl clean
	$(MAKE) -C blake2b clean

distclean:
	rm -f @EXTENSION_TARGET@ nano.o
	rm -f Makefile pkgIndex.tcl config.log config.status

	$(MAKE) -C tweetnacl distclean
	$(MAKE) -C blake2b distclean

mrproper: distclean
	rm -f configure aclocal.m4 config.guess config.sub install-sh

.PHONY: all test 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
51
52
53
54
55
56
CC            := @CC@
CFLAGS        := @CFLAGS@ @SHOBJFLAGS@
CPPFLAGS      := -I. -I@srcdir@/tweetnacl/ -I@srcdir@/blake2b/ -DSUPERCOP=1 @CPPFLAGS@ @SHOBJCPPFLAGS@ @DEFS@
LDFLAGS       := @LDFLAGS@
LIBS          := @LIBS@
SHOBJLDFLAGS  := @SHOBJLDFLAGS@
srcdir        := @srcdir@
export CC CFLAGS CPPFLAGS
@SET_MAKE@

all: @EXTENSION_TARGET@

ifeq (@TCLEXT_BUILD@,shared)
@EXTENSION_TARGET@: @srcdir@/tweetnacl/tweetnacl.o @srcdir@/blake2b/blake2b.o nano.o Makefile
	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $(SHOBJLDFLAGS) -o @EXTENSION_TARGET@ nano.o @srcdir@/tweetnacl/tweetnacl.o @srcdir@/blake2b/blake2b.o $(LIBS)
	-@WEAKENSYMS@ @EXTENSION_TARGET@
	-@REMOVESYMS@ @EXTENSION_TARGET@
else
@EXTENSION_TARGET@: @srcdir@/tweetnacl/tweetnacl.o @srcdir@/blake2b/blake2b.o nano.o Makefile
	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $(SHOBJLDFLAGS) -o @EXTENSION_TARGET@ nano.o tweetnacl/tweetnacl.o blake2b/blake2b.o $(LIBS)
endif

nano.o: @srcdir@/nano.c nano.tcl.h Makefile
	$(CC) $(CPPFLAGS) $(CFLAGS) -o nano.o -c @srcdir@/nano.c

nano.tcl.h: @srcdir@/nano.tcl Makefile
	od -A n -v -t xC < '@srcdir@/nano.tcl' > nano.tcl.h.new.1
	sed 's@  *@@g;s@..@0x&, @g' < nano.tcl.h.new.1 > nano.tcl.h.new.2
	rm -f nano.tcl.h.new.1
	mv nano.tcl.h.new.2 nano.tcl.h

@srcdir@/tweetnacl/tweetnacl.o:
	$(MAKE) -C @srcdir@/tweetnacl tweetnacl.o

@srcdir@/blake2b/blake2b.o:
	$(MAKE) -C @srcdir@/blake2b blake2b.o

test: @EXTENSION_TARGET@
	@srcdir@/build/test/test.tcl

clean:
	rm -f @EXTENSION_TARGET@ nano.o
	$(MAKE) -C @srcdir@/tweetnacl clean
	$(MAKE) -C @srcdir@/blake2b clean

distclean:
	rm -f @EXTENSION_TARGET@ nano.o
	rm -f Makefile pkgIndex.tcl config.log config.status nano.syms
	rm -f nano.tcl.h
	$(MAKE) -C @srcdir@/tweetnacl distclean
	$(MAKE) -C @srcdir@/blake2b distclean

mrproper: distclean
	rm -f configure aclocal.m4 config.guess config.sub install-sh

.PHONY: all test clean distclean mrproper

Modified pkgIndex.tcl.in from [67b9989fc7] to [3e4b7e87f5].

1
2
3
4
package ifneeded nano @PACKAGE_VERSION@ [list apply {{dir} {
	load [file join $dir nano.so]
	source [file join $dir nano.tcl]
}} $dir]
|
<
<
<
1



package ifneeded nano @PACKAGE_VERSION@ [list load [file join $dir nano.so]]