Skip to content

Commit 90efb44

Browse files
ray2501ray2501
committed
Update tclconfig files
1 parent 41d68fb commit 90efb44

14 files changed

+4508
-4384
lines changed

‎ChangeLog

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
2023-12-15 Danilo Chang
2+
3+
* Update tclconfig files
4+
15
2018-06-11 Danilo Chang
26

37
* Bump version to 1.0

‎Makefile

+80-74
Large diffs are not rendered by default.

‎Makefile.in

+69-63
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,8 @@ PKG_HEADERS = @PKG_HEADERS@
5858
#========================================================================
5959

6060
PKG_LIB_FILE = @PKG_LIB_FILE@
61+
PKG_LIB_FILE8 = @PKG_LIB_FILE8@
62+
PKG_LIB_FILE9 = @PKG_LIB_FILE9@
6163
PKG_STUB_LIB_FILE = @PKG_STUB_LIB_FILE@
6264

6365
lib_BINARIES = $(PKG_LIB_FILE)
@@ -73,6 +75,7 @@ bindir = @bindir@
7375
libdir = @libdir@
7476
includedir = @includedir@
7577
datarootdir = @datarootdir@
78+
runstatedir = @runstatedir@
7679
datadir = @datadir@
7780
mandir = @mandir@
7881

@@ -83,10 +86,10 @@ pkgdatadir = $(datadir)/$(PKG_DIR)
8386
pkglibdir = $(libdir)/$(PKG_DIR)
8487
pkgincludedir = $(includedir)/$(PKG_DIR)
8588

86-
top_builddir = .
89+
top_builddir = @abs_top_builddir@
8790

8891
INSTALL_OPTIONS =
89-
INSTALL = @INSTALL@ ${INSTALL_OPTIONS}
92+
INSTALL = @INSTALL@ $(INSTALL_OPTIONS)
9093
INSTALL_DATA_DIR = @INSTALL_DATA_DIR@
9194
INSTALL_DATA = @INSTALL_DATA@
9295
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -96,13 +99,12 @@ INSTALL_LIBRARY = @INSTALL_LIBRARY@
9699
PACKAGE_NAME = @PACKAGE_NAME@
97100
PACKAGE_VERSION = @PACKAGE_VERSION@
98101
CC = @CC@
102+
CCLD = @CCLD@
99103
CFLAGS_DEFAULT = @CFLAGS_DEFAULT@
100104
CFLAGS_WARNING = @CFLAGS_WARNING@
101105
EXEEXT = @EXEEXT@
102106
LDFLAGS_DEFAULT = @LDFLAGS_DEFAULT@
103107
MAKE_LIB = @MAKE_LIB@
104-
MAKE_SHARED_LIB = @MAKE_SHARED_LIB@
105-
MAKE_STATIC_LIB = @MAKE_STATIC_LIB@
106108
MAKE_STUB_LIB = @MAKE_STUB_LIB@
107109
OBJEXT = @OBJEXT@
108110
RANLIB = @RANLIB@
@@ -136,15 +138,15 @@ PKG_ENV = @LD_LIBRARY_PATH_VAR@="$(EXTRA_PATH):$(@LD_LIBRARY_PATH_VAR@)" \
136138
TCLLIBPATH="$(TCLLIBPATH)"
137139

138140
TCLSH_PROG = @TCLSH_PROG@
139-
TCLSH = $(PKG_ENV) $(TCLSH_ENV) $(TCLSH_PROG)
141+
TCLSH = $(TCLSH_ENV) $(PKG_ENV) $(TCLSH_PROG)
140142

141143
#WISH_ENV = TK_LIBRARY=`@CYGPATH@ $(TK_SRC_DIR)/library`
142144
#WISH_PROG = @WISH_PROG@
143-
#WISH = $(PKG_ENV) $(TCLSH_ENV) $(WISH_ENV) $(WISH_PROG)
145+
#WISH = $(TCLSH_ENV) $(WISH_ENV) $(PKG_ENV) $(WISH_PROG)
144146

145147
SHARED_BUILD = @SHARED_BUILD@
146148

147-
INCLUDES = @PKG_INCLUDES@ @TCL_INCLUDES@
149+
INCLUDES = @PKG_INCLUDES@ @TCL_INCLUDES@ -I.
148150
#INCLUDES = @PKG_INCLUDES@ @TCL_INCLUDES@ @TK_INCLUDES@ @TK_XINCLUDES@
149151

150152
PKG_CFLAGS = @PKG_CFLAGS@
@@ -165,7 +167,15 @@ CPPFLAGS = @CPPFLAGS@
165167
LIBS = @PKG_LIBS@ @LIBS@
166168
AR = @AR@
167169
CFLAGS = @CFLAGS@
168-
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
170+
LDFLAGS = @LDFLAGS@
171+
LDFLAGS_DEFAULT = @LDFLAGS_DEFAULT@
172+
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) \
173+
$(CFLAGS_DEFAULT) $(CFLAGS_WARNING) $(SHLIB_CFLAGS) $(CFLAGS)
174+
175+
GDB = gdb
176+
VALGRIND = valgrind
177+
VALGRINDARGS = --tool=memcheck --num-callers=8 --leak-resolution=high \
178+
--leak-check=yes --show-reachable=yes -v
169179

170180
.SUFFIXES: .c .$(OBJEXT)
171181

@@ -210,46 +220,42 @@ install-binaries: binaries install-lib-binaries install-bin-binaries
210220
#========================================================================
211221

212222
install-libraries: libraries
213-
@$(INSTALL_DATA_DIR) $(DESTDIR)$(includedir)
223+
@$(INSTALL_DATA_DIR) "$(DESTDIR)$(includedir)"
214224
@echo "Installing header files in $(DESTDIR)$(includedir)"
215225
@list='$(PKG_HEADERS)'; for i in $$list; do \
216226
echo "Installing $(srcdir)/$$i" ; \
217-
$(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(includedir) ; \
227+
$(INSTALL_DATA) $(srcdir)/$$i "$(DESTDIR)$(includedir)" ; \
218228
done;
219229

220230
#========================================================================
221231
# Install documentation. Unix manpages should go in the $(mandir)
222232
# directory.
223233
#========================================================================
224234

225-
install-doc: doc
226-
@$(INSTALL_DATA_DIR) $(DESTDIR)$(mandir)/mann
227-
@echo "Installing documentation in $(DESTDIR)$(mandir)"
228-
@list='$(srcdir)/doc/*.n'; for i in $$list; do \
229-
echo "Installing $$i"; \
230-
$(INSTALL_DATA) $$i $(DESTDIR)$(mandir)/mann ; \
231-
done
232-
233235
test: binaries libraries
234236
$(TCLSH) `@CYGPATH@ $(srcdir)/tests/all.tcl` $(TESTFLAGS) \
235-
-load "package ifneeded ${PACKAGE_NAME} ${PACKAGE_VERSION} \
236-
[list load `@CYGPATH@ $(PKG_LIB_FILE)` $(PACKAGE_NAME)]"
237+
-load "package ifneeded $(PACKAGE_NAME) $(PACKAGE_VERSION) \
238+
[list load `@CYGPATH@ $(PKG_LIB_FILE)` [string totitle $(PACKAGE_NAME)]]"
237239

238240
shell: binaries libraries
239241
@$(TCLSH) $(SCRIPT)
240242

241243
gdb:
242-
$(TCLSH_ENV) gdb $(TCLSH_PROG) $(SCRIPT)
244+
$(TCLSH_ENV) $(PKG_ENV) $(GDB) $(TCLSH_PROG) $(SCRIPT)
243245

244-
VALGRINDARGS = --tool=memcheck --num-callers=8 --leak-resolution=high \
245-
--leak-check=yes --show-reachable=yes -v
246+
gdb-test: binaries libraries
247+
$(TCLSH_ENV) $(PKG_ENV) $(GDB) \
248+
--args $(TCLSH_PROG) `@CYGPATH@ $(srcdir)/tests/all.tcl` \
249+
$(TESTFLAGS) -singleproc 1 \
250+
-load "package ifneeded $(PACKAGE_NAME) $(PACKAGE_VERSION) \
251+
[list load `@CYGPATH@ $(PKG_LIB_FILE)` [string totitle $(PACKAGE_NAME)]]"
246252

247253
valgrind: binaries libraries
248-
$(TCLSH_ENV) valgrind $(VALGRINDARGS) $(TCLSH_PROG) \
249-
`@CYGPATH@ $(srcdir)/tests/all.tcl` $(TESTFLAGS)
254+
$(TCLSH_ENV) $(PKG_ENV) $(VALGRIND) $(VALGRINDARGS) $(TCLSH_PROG) \
255+
`@CYGPATH@ $(srcdir)/tests/all.tcl` $(TESTFLAGS)
250256

251257
valgrindshell: binaries libraries
252-
$(TCLSH_ENV) valgrind $(VALGRINDARGS) $(TCLSH_PROG) $(SCRIPT)
258+
$(TCLSH_ENV) $(PKG_ENV) $(VALGRIND) $(VALGRINDARGS) $(TCLSH_PROG) $(SCRIPT)
253259

254260
depend:
255261

@@ -303,34 +309,41 @@ COMPRESS = tar zcvf $(PKG_DIR).tar.gz $(PKG_DIR)
303309
DIST_ROOT = /tmp/dist
304310
DIST_DIR = $(DIST_ROOT)/$(PKG_DIR)
305311

312+
DIST_INSTALL_DATA = CPPROG='cp -p' $(INSTALL) -m 644
313+
DIST_INSTALL_SCRIPT = CPPROG='cp -p' $(INSTALL) -m 755
314+
306315
dist-clean:
307316
rm -rf $(DIST_DIR) $(DIST_ROOT)/$(PKG_DIR).tar.*
308317

309-
dist: dist-clean
318+
dist: dist-clean $(srcdir)/manifest.uuid
310319
$(INSTALL_DATA_DIR) $(DIST_DIR)
311-
cp -p $(srcdir)/ChangeLog $(srcdir)/README* $(srcdir)/license* \
312-
$(srcdir)/aclocal.m4 $(srcdir)/configure $(srcdir)/*.in \
313-
$(srcdir)/configure.ac $(DIST_DIR)/
314-
chmod 664 $(DIST_DIR)/Makefile.in $(DIST_DIR)/aclocal.m4
315-
chmod 775 $(DIST_DIR)/configure $(DIST_DIR)/configure.ac
316-
317-
for i in $(srcdir)/*.[ch]; do \
318-
if [ -f $$i ]; then \
319-
cp -p $$i $(DIST_DIR)/ ; \
320-
fi; \
321-
done;
322320

323-
$(INSTALL_DATA_DIR) $(DIST_DIR)/tclconfig
324-
cp $(srcdir)/tclconfig/install-sh $(srcdir)/tclconfig/tcl.m4 \
325-
$(DIST_DIR)/tclconfig/
326-
chmod 664 $(DIST_DIR)/tclconfig/tcl.m4
327-
chmod +x $(DIST_DIR)/tclconfig/install-sh
321+
# TEA files
322+
$(DIST_INSTALL_DATA) $(srcdir)/Makefile.in \
323+
$(srcdir)/aclocal.m4 $(srcdir)/configure.ac \
324+
$(DIST_DIR)/
325+
$(DIST_INSTALL_SCRIPT) $(srcdir)/configure $(DIST_DIR)/
328326

329-
list='demos doc generic library mac tests unix win'; \
327+
$(INSTALL_DATA_DIR) $(DIST_DIR)/tclconfig
328+
$(DIST_INSTALL_DATA) $(srcdir)/tclconfig/README.txt \
329+
$(srcdir)/manifest.uuid \
330+
$(srcdir)/tclconfig/tcl.m4 $(srcdir)/tclconfig/install-sh \
331+
$(DIST_DIR)/tclconfig/
332+
333+
# Extension files
334+
$(DIST_INSTALL_DATA) \
335+
$(srcdir)/ChangeLog \
336+
$(srcdir)/README.sha \
337+
$(srcdir)/license.terms \
338+
$(srcdir)/README \
339+
$(srcdir)/pkgIndex.tcl.in \
340+
$(DIST_DIR)/
341+
342+
list='demos doc generic library macosx tests unix win'; \
330343
for p in $$list; do \
331344
if test -d $(srcdir)/$$p ; then \
332345
$(INSTALL_DATA_DIR) $(DIST_DIR)/$$p; \
333-
cp -p $(srcdir)/$$p/*.* $(DIST_DIR)/$$p/; \
346+
$(DIST_INSTALL_DATA) $(srcdir)/$$p/* $(DIST_DIR)/$$p/; \
334347
fi; \
335348
done
336349

@@ -367,25 +380,17 @@ distclean: clean
367380
#========================================================================
368381

369382
install-lib-binaries: binaries
370-
@$(INSTALL_DATA_DIR) $(DESTDIR)$(pkglibdir)
383+
@$(INSTALL_DATA_DIR) "$(DESTDIR)$(pkglibdir)"
371384
@list='$(lib_BINARIES)'; for p in $$list; do \
372385
if test -f $$p; then \
373386
echo " $(INSTALL_LIBRARY) $$p $(DESTDIR)$(pkglibdir)/$$p"; \
374-
$(INSTALL_LIBRARY) $$p $(DESTDIR)$(pkglibdir)/$$p; \
375-
stub=`echo $$p|sed -e "s/.*\(stub\).*/\1/"`; \
376-
if test "x$$stub" = "xstub"; then \
377-
echo " $(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p"; \
378-
$(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p; \
379-
else \
380-
echo " $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p"; \
381-
$(RANLIB) $(DESTDIR)$(pkglibdir)/$$p; \
382-
fi; \
387+
$(INSTALL_LIBRARY) $$p "$(DESTDIR)$(pkglibdir)/$$p"; \
383388
ext=`echo $$p|sed -e "s/.*\.//"`; \
384389
if test "x$$ext" = "xdll"; then \
385390
lib=`basename $$p|sed -e 's/.[^.]*$$//'`.lib; \
386391
if test -f $$lib; then \
387392
echo " $(INSTALL_DATA) $$lib $(DESTDIR)$(pkglibdir)/$$lib"; \
388-
$(INSTALL_DATA) $$lib $(DESTDIR)$(pkglibdir)/$$lib; \
393+
$(INSTALL_DATA) $$lib "$(DESTDIR)$(pkglibdir)/$$lib"; \
389394
fi; \
390395
fi; \
391396
fi; \
@@ -394,12 +399,12 @@ install-lib-binaries: binaries
394399
if test -f $(srcdir)/$$p; then \
395400
destp=`basename $$p`; \
396401
echo " Install $$destp $(DESTDIR)$(pkglibdir)/$$destp"; \
397-
$(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkglibdir)/$$destp; \
402+
$(INSTALL_DATA) $(srcdir)/$$p "$(DESTDIR)$(pkglibdir)/$$destp"; \
398403
fi; \
399404
done
400405
@if test "x$(SHARED_BUILD)" = "x1"; then \
401406
echo " Install pkgIndex.tcl $(DESTDIR)$(pkglibdir)"; \
402-
$(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(pkglibdir); \
407+
$(INSTALL_DATA) pkgIndex.tcl "$(DESTDIR)$(pkglibdir)"; \
403408
fi
404409

405410
#========================================================================
@@ -412,11 +417,11 @@ install-lib-binaries: binaries
412417
#========================================================================
413418

414419
install-bin-binaries: binaries
415-
@$(INSTALL_DATA_DIR) $(DESTDIR)$(bindir)
420+
@$(INSTALL_DATA_DIR) "$(DESTDIR)$(bindir)"
416421
@list='$(bin_BINARIES)'; for p in $$list; do \
417422
if test -f $$p; then \
418423
echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$p"; \
419-
$(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$p; \
424+
$(INSTALL_PROGRAM) $$p "$(DESTDIR)$(bindir)/$$p"; \
420425
fi; \
421426
done
422427

@@ -426,17 +431,18 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
426431

427432
uninstall-binaries:
428433
list='$(lib_BINARIES)'; for p in $$list; do \
429-
rm -f $(DESTDIR)$(pkglibdir)/$$p; \
434+
rm -f "$(DESTDIR)$(pkglibdir)/$$p"; \
430435
done
431436
list='$(PKG_TCL_SOURCES)'; for p in $$list; do \
432437
p=`basename $$p`; \
433-
rm -f $(DESTDIR)$(pkglibdir)/$$p; \
438+
rm -f "$(DESTDIR)$(pkglibdir)/$$p"; \
434439
done
435440
list='$(bin_BINARIES)'; for p in $$list; do \
436-
rm -f $(DESTDIR)$(bindir)/$$p; \
441+
rm -f "$(DESTDIR)$(bindir)/$$p"; \
437442
done
438443

439444
.PHONY: all binaries clean depend distclean doc install libraries test
445+
.PHONY: gdb gdb-test valgrind valgrindshell
440446

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

0 commit comments

Comments
 (0)