Skip to content

Commit 998144f

Browse files
committed
update TEA 3.13
1 parent 8def567 commit 998144f

File tree

3 files changed

+251
-875
lines changed

3 files changed

+251
-875
lines changed

Makefile.in

+52-39
Original file line numberDiff line numberDiff line change
@@ -83,15 +83,15 @@ pkgdatadir = $(datadir)/$(PKG_DIR)
8383
pkglibdir = $(libdir)/$(PKG_DIR)
8484
pkgincludedir = $(includedir)/$(PKG_DIR)
8585

86-
top_builddir = .
86+
top_builddir = @abs_top_builddir@
8787

8888
INSTALL_OPTIONS =
89-
INSTALL = @INSTALL@ ${INSTALL_OPTIONS}
90-
INSTALL_DATA_DIR = @INSTALL_DATA_DIR@
89+
INSTALL = @INSTALL@ $(INSTALL_OPTIONS)
90+
INSTALL_DATA_DIR = ${INSTALL} -d -m 755
9191
INSTALL_DATA = @INSTALL_DATA@
9292
INSTALL_PROGRAM = @INSTALL_PROGRAM@
9393
INSTALL_SCRIPT = @INSTALL_SCRIPT@
94-
INSTALL_LIBRARY = @INSTALL_LIBRARY@
94+
INSTALL_LIBRARY = ${INSTALL_DATA}
9595

9696
PACKAGE_NAME = @PACKAGE_NAME@
9797
PACKAGE_VERSION = @PACKAGE_VERSION@
@@ -136,11 +136,11 @@ PKG_ENV = @LD_LIBRARY_PATH_VAR@="$(EXTRA_PATH):$(@LD_LIBRARY_PATH_VAR@)" \
136136
TCLLIBPATH="$(TCLLIBPATH)"
137137

138138
TCLSH_PROG = @TCLSH_PROG@
139-
TCLSH = $(PKG_ENV) $(TCLSH_ENV) $(TCLSH_PROG)
139+
TCLSH = $(TCLSH_ENV) $(PKG_ENV) $(TCLSH_PROG)
140140

141141
#WISH_ENV = TK_LIBRARY=`@CYGPATH@ $(TK_SRC_DIR)/library`
142142
#WISH_PROG = @WISH_PROG@
143-
#WISH = $(PKG_ENV) $(TCLSH_ENV) $(WISH_ENV) $(WISH_PROG)
143+
#WISH = $(TCLSH_ENV) $(WISH_ENV) $(PKG_ENV) $(WISH_PROG)
144144

145145
SHARED_BUILD = @SHARED_BUILD@
146146

@@ -168,7 +168,13 @@ CPPFLAGS = @CPPFLAGS@
168168
LIBS = @PKG_LIBS@ @LIBS@
169169
AR = @AR@
170170
CFLAGS = @CFLAGS@
171-
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
171+
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) \
172+
$(CFLAGS_DEFAULT) $(CFLAGS_WARNING) $(SHLIB_CFLAGS) $(CFLAGS)
173+
174+
GDB = gdb
175+
VALGRIND = valgrind
176+
VALGRINDARGS = --tool=memcheck --num-callers=8 --leak-resolution=high \
177+
--leak-check=yes --show-reachable=yes -v
172178

173179
.SUFFIXES: .c .$(OBJEXT)
174180

@@ -204,6 +210,10 @@ libraries:
204210
#========================================================================
205211

206212
doc:
213+
@echo "If you have documentation to create, place the commands to"
214+
@echo "build the docs in the 'doc:' target. For example:"
215+
@echo " xml2nroff sample.xml > sample.n"
216+
@echo " xml2html sample.xml > sample.html"
207217

208218
install: all install-binaries install-libraries install-doc
209219

@@ -237,24 +247,28 @@ install-doc: doc
237247

238248
test: binaries libraries
239249
$(TCLSH) `@CYGPATH@ $(srcdir)/tests/all.tcl` $(TESTFLAGS) \
240-
-load "package ifneeded ${PACKAGE_NAME} ${PACKAGE_VERSION} \
241-
[list load `@CYGPATH@ $(PKG_LIB_FILE)` $(PACKAGE_NAME)]"
250+
-load "package ifneeded $(PACKAGE_NAME) $(PACKAGE_VERSION) \
251+
[list load `@CYGPATH@ $(PKG_LIB_FILE)` $(PACKAGE_NAME)]"
242252

243253
shell: binaries libraries
244254
@$(TCLSH) $(SCRIPT)
245255

246256
gdb:
247-
$(TCLSH_ENV) gdb $(TCLSH_PROG) $(SCRIPT)
257+
$(TCLSH_ENV) $(PKG_ENV) $(GDB) $(TCLSH_PROG) $(SCRIPT)
248258

249-
VALGRINDARGS = --tool=memcheck --num-callers=8 --leak-resolution=high \
250-
--leak-check=yes --show-reachable=yes -v
259+
gdb-test: binaries libraries
260+
$(TCLSH_ENV) $(PKG_ENV) $(GDB) \
261+
--args $(TCLSH_PROG) `@CYGPATH@ $(srcdir)/tests/all.tcl` \
262+
$(TESTFLAGS) -singleproc 1 \
263+
-load "package ifneeded $(PACKAGE_NAME) $(PACKAGE_VERSION) \
264+
[list load `@CYGPATH@ $(PKG_LIB_FILE)` $(PACKAGE_NAME)]"
251265

252266
valgrind: binaries libraries
253-
$(TCLSH_ENV) valgrind $(VALGRINDARGS) $(TCLSH_PROG) \
254-
`@CYGPATH@ $(srcdir)/tests/all.tcl` $(TESTFLAGS)
267+
$(TCLSH_ENV) $(PKG_ENV) $(VALGRIND) $(VALGRINDARGS) $(TCLSH_PROG) \
268+
`@CYGPATH@ $(srcdir)/tests/all.tcl` $(TESTFLAGS)
255269

256270
valgrindshell: binaries libraries
257-
$(TCLSH_ENV) valgrind $(VALGRINDARGS) $(TCLSH_PROG) $(SCRIPT)
271+
$(TCLSH_ENV) $(PKG_ENV) $(VALGRIND) $(VALGRINDARGS) $(TCLSH_PROG) $(SCRIPT)
258272

259273
depend:
260274

@@ -313,34 +327,40 @@ COMPRESS = tar zcvf $(PKG_DIR).tar.gz $(PKG_DIR)
313327
DIST_ROOT = /tmp/dist
314328
DIST_DIR = $(DIST_ROOT)/$(PKG_DIR)
315329

330+
DIST_INSTALL_DATA = CPPROG='cp -p' $(INSTALL) -m 644
331+
DIST_INSTALL_SCRIPT = CPPROG='cp -p' $(INSTALL) -m 755
332+
316333
dist-clean:
317334
rm -rf $(DIST_DIR) $(DIST_ROOT)/$(PKG_DIR).tar.*
318335

319336
dist: dist-clean
320337
$(INSTALL_DATA_DIR) $(DIST_DIR)
321-
cp -p $(srcdir)/ChangeLog $(srcdir)/README* $(srcdir)/license* \
322-
$(srcdir)/aclocal.m4 $(srcdir)/configure $(srcdir)/*.in \
323-
$(srcdir)/configure.ac $(DIST_DIR)/
324-
chmod 664 $(DIST_DIR)/Makefile.in $(DIST_DIR)/aclocal.m4
325-
chmod 775 $(DIST_DIR)/configure $(DIST_DIR)/configure.ac
326-
327-
for i in $(srcdir)/*.[ch]; do \
328-
if [ -f $$i ]; then \
329-
cp -p $$i $(DIST_DIR)/ ; \
330-
fi; \
331-
done;
338+
339+
# TEA files
340+
$(DIST_INSTALL_DATA) $(srcdir)/Makefile.in \
341+
$(srcdir)/aclocal.m4 $(srcdir)/configure.ac \
342+
$(DIST_DIR)/
343+
$(DIST_INSTALL_SCRIPT) $(srcdir)/configure $(DIST_DIR)/
332344

333345
$(INSTALL_DATA_DIR) $(DIST_DIR)/tclconfig
334-
cp $(srcdir)/tclconfig/install-sh $(srcdir)/tclconfig/tcl.m4 \
335-
$(DIST_DIR)/tclconfig/
336-
chmod 664 $(DIST_DIR)/tclconfig/tcl.m4
337-
chmod +x $(DIST_DIR)/tclconfig/install-sh
346+
$(DIST_INSTALL_DATA) $(srcdir)/tclconfig/README.txt \
347+
$(srcdir)/tclconfig/tcl.m4 $(srcdir)/tclconfig/install-sh \
348+
$(DIST_DIR)/tclconfig/
349+
350+
# Extension files
351+
$(DIST_INSTALL_DATA) \
352+
$(srcdir)/ChangeLog \
353+
$(srcdir)/README.sha \
354+
$(srcdir)/license.terms \
355+
$(srcdir)/README \
356+
$(srcdir)/pkgIndex.tcl.in \
357+
$(DIST_DIR)/
338358

339359
list='demos doc generic library mac tests unix win'; \
340360
for p in $$list; do \
341361
if test -d $(srcdir)/$$p ; then \
342362
$(INSTALL_DATA_DIR) $(DIST_DIR)/$$p; \
343-
cp -p $(srcdir)/$$p/*.* $(DIST_DIR)/$$p/; \
363+
$(DIST_INSTALL_DATA) $(srcdir)/$$p/* $(DIST_DIR)/$$p/; \
344364
fi; \
345365
done
346366

@@ -382,14 +402,6 @@ install-lib-binaries: binaries
382402
if test -f $$p; then \
383403
echo " $(INSTALL_LIBRARY) $$p $(DESTDIR)$(pkglibdir)/$$p"; \
384404
$(INSTALL_LIBRARY) $$p $(DESTDIR)$(pkglibdir)/$$p; \
385-
stub=`echo $$p|sed -e "s/.*\(stub\).*/\1/"`; \
386-
if test "x$$stub" = "xstub"; then \
387-
echo " $(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p"; \
388-
$(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p; \
389-
else \
390-
echo " $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p"; \
391-
$(RANLIB) $(DESTDIR)$(pkglibdir)/$$p; \
392-
fi; \
393405
ext=`echo $$p|sed -e "s/.*\.//"`; \
394406
if test "x$$ext" = "xdll"; then \
395407
lib=`basename $$p|sed -e 's/.[^.]*$$//'`.lib; \
@@ -448,6 +460,7 @@ uninstall-binaries:
448460
done
449461

450462
.PHONY: all binaries clean depend distclean doc install libraries test
463+
.PHONY: gdb gdb-test valgrind valgrindshell
451464

452465
# Tell versions [3.59,3.63) of GNU make to not export all variables.
453466
# Otherwise a system limit (for SysV at least) may be exceeded.

0 commit comments

Comments
 (0)