Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Use INSTALL_* and new DIST_INSTALL_* macros to make dist. Align with latest TEA. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
58de4fac9c95a8f783b1be580c050856 |
| User & Date: | stu 2018-01-04 07:23:50 |
Context
|
2018-01-05
| ||
| 06:43 | Merge stu-pkgIndex. Companion to https://core.tcl.tk/tdbc/info/2386d26cfb8a34c3. check-in: e095b00bdd user: stu tags: trunk | |
| 06:42 | Merge trunk. Closed-Leaf check-in: d2ab795efa user: stu tags: stu-pkgIndex | |
|
2018-01-04
| ||
| 07:23 | Use INSTALL_* and new DIST_INSTALL_* macros to make dist. Align with latest TEA. check-in: 58de4fac9c user: stu tags: trunk | |
|
2017-12-22
| ||
| 13:42 | Convert all win/*.vc files to crlf style check-in: 24cec214c3 user: jan.nijtmans tags: trunk | |
Changes
Changes to Makefile.in.
7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 .. 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 .. 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 ... 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 ... 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 ... 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 |
# replaced in the actual Makefile. # # Copyright (c) 1999 Scriptics Corporation. # Copyright (c) 2002-2005 ActiveState Corporation. # # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # # RCS: @(#) $Id: Makefile.in,v 1.64 2007/10/23 22:08:06 hobbs Exp $ #======================================================================== # Nothing of the variables below this line should need to be changed. # Please check the TARGETS section below to make sure the make targets # are correct. #======================================================================== ................................................................................ srcdir = @[email protected] prefix = @[email protected] exec_prefix = @[email protected] bindir = @[email protected] libdir = @[email protected] includedir = @[email protected] datarootdir = @[email protected] datadir = @[email protected] mandir = @[email protected] DESTDIR = PKG_DIR = $(PACKAGE_NAME)-$(PACKAGE_VERSION) pkgdatadir = $(datadir)/$(PKG_DIR) ................................................................................ tmdir = $(libdir)/tcl$(TCL_MAJOR_VERSION)/$(TCL_VERSION) pkgslash = `echo $(PACKAGE_NAME) | sed s=tdbc=tdbc/=` pkgtmdir = $(tmdir)/tdbc pkgtmfile = $(tmdir)/$(pkgslash)-$(PACKAGE_VERSION).tm top_builddir = . INSTALL_OPTIONS = INSTALL = $(SHELL) $(srcdir)/tclconfig/install-sh -c ${INSTALL_OPTIONS} INSTALL_DATA_DIR = ${INSTALL} -d -m 755 INSTALL_PROGRAM = ${INSTALL} -m 555 INSTALL_DATA = ${INSTALL} -m 444 INSTALL_SCRIPT = ${INSTALL_PROGRAM} INSTALL_LIBRARY = ${INSTALL_DATA} TCL_VERSION = @[email protected] TCL_MAJOR_VERSION = @[email protected] PACKAGE_NAME = @[email protected] PACKAGE_VERSION = @[email protected] #TCL_DEFS = @[email protected] ................................................................................ TCLLIBPATH = $(top_builddir) TCLSH_ENV = TCL_LIBRARY=`@[email protected] $(TCL_SRC_DIR)/library` \ TDBC_LIBRARY=`@[email protected] @[email protected]` PKG_ENV = PATH="$(EXTRA_PATH):$(PATH)" \ TCLLIBPATH="$(TCLLIBPATH)" TCLSH_PROG = @[email protected] TCLSH = $(PKG_ENV) $(TCLSH_ENV) $(TCLSH_PROG) #WISH_ENV = TK_LIBRARY=`@[email protected] $(TK_SRC_DIR)/library` #WISH_PROG = @[email protected] #WISH = $(PKG_ENV) $(TCLSH_ENV) $(WISH_ENV) $(WISH_PROG) SHARED_BUILD = @[email protected] INCLUDES = @[email protected] @[email protected] # Move pkgIndex.tcl to 'BINARIES' var if it is generated in the Makefile CONFIG_CLEAN_FILES = Makefile pkgIndex.tcl ................................................................................ #======================================================================== # Start of user-definable TARGETS section #======================================================================== #======================================================================== # TEA TARGETS. Please note that the "libraries:" target refers to platform # independent files, and the "binaries:" target inclues executable programs and # platform-dependent libraries. Modify these targets so that they install # the various pieces of your package. The make and install rules # for the BINARIES that you specified above have already been done. #======================================================================== all: libraries doc ................................................................................ #======================================================================== #COMPRESS = tar cvf $(PKG_DIR).tar $(PKG_DIR); compress $(PKG_DIR).tar COMPRESS = tar zcvf $(PKG_DIR).tar.gz $(PKG_DIR) DIST_ROOT = /tmp/dist DIST_DIR = $(DIST_ROOT)/$(PKG_DIR) dist-clean: rm -rf $(DIST_DIR) $(DIST_ROOT)/$(PKG_DIR).tar.* dist: dist-clean mkdir -p $(DIST_DIR) cp -p $(srcdir)/ChangeLog $(srcdir)/README* $(srcdir)/license* \ $(srcdir)/aclocal.m4 $(srcdir)/configure $(srcdir)/*.in \ $(srcdir)/configure.ac $(DIST_DIR)/ chmod 664 $(DIST_DIR)/Makefile.in $(DIST_DIR)/aclocal.m4 chmod 775 $(DIST_DIR)/configure $(DIST_DIR)/configure.ac for i in $(srcdir)/*.[ch]; do \ if [ -f $$i ]; then \ cp -p $$i $(DIST_DIR)/ ; \ fi; \ done; mkdir $(DIST_DIR)/tclconfig cp $(srcdir)/tclconfig/install-sh $(srcdir)/tclconfig/tcl.m4 \ $(DIST_DIR)/tclconfig/ chmod 664 $(DIST_DIR)/tclconfig/tcl.m4 chmod +x $(DIST_DIR)/tclconfig/install-sh mkdir $(DIST_DIR)/doc cp -p $(srcdir)/doc/tdbc_sqlite3.n $(DIST_DIR)/doc/ mkdir $(DIST_DIR)/library cp -p $(srcdir)/library/tdbcsqlite3.tcl $(DIST_DIR)/library/ mkdir $(DIST_DIR)/tests cp -p $(srcdir)/tests/all.tcl $(srcdir)/tests/tdbcsqlite3.test \ $(DIST_DIR)/tests/ mkdir $(DIST_DIR)/win cp -p $(srcdir)/win/makefile.vc $(srcdir)/win/nmakehlp.c \ $(srcdir)/win/targets.vc $(srcdir)/win/rules-ext.vc \ $(srcdir)/win/rules.vc $(DIST_DIR)/win/ (cd $(DIST_ROOT); $(COMPRESS);) #======================================================================== # End of user-definable section #======================================================================== #======================================================================== # Don't modify the file to clean here. Instead, set the "CLEANFILES" # variable in configure.in #======================================================================== clean: -rm -f *.core *.core -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean: clean |
< < | | | | | | | | | | | > > > | > | | > | < | | | > | < < | | | | | | | | | |
7 8 9 10 11 12 13 14 15 16 17 18 19 20 .. 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 .. 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 ... 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 ... 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 ... 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 |
# replaced in the actual Makefile. # # Copyright (c) 1999 Scriptics Corporation. # Copyright (c) 2002-2005 ActiveState Corporation. # # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. #======================================================================== # Nothing of the variables below this line should need to be changed. # Please check the TARGETS section below to make sure the make targets # are correct. #======================================================================== ................................................................................ srcdir = @[email protected] prefix = @[email protected] exec_prefix = @[email protected] bindir = @[email protected] libdir = @[email protected] includedir = @[email protected] datarootdir = @[email protected] datadir = @[email protected] mandir = @[email protected] DESTDIR = PKG_DIR = $(PACKAGE_NAME)-$(PACKAGE_VERSION) pkgdatadir = $(datadir)/$(PKG_DIR) ................................................................................ tmdir = $(libdir)/tcl$(TCL_MAJOR_VERSION)/$(TCL_VERSION) pkgslash = `echo $(PACKAGE_NAME) | sed s=tdbc=tdbc/=` pkgtmdir = $(tmdir)/tdbc pkgtmfile = $(tmdir)/$(pkgslash)-$(PACKAGE_VERSION).tm top_builddir = . INSTALL_OPTIONS = INSTALL = @[email protected] $(INSTALL_OPTIONS) INSTALL_DATA_DIR = @INSTALL[email protected] INSTALL_DATA = @INSTALL[email protected] INSTALL_PROGRAM = @INSTALL[email protected] INSTALL_SCRIPT = @INSTALL_[email protected] INSTALL_LIBRARY = @INSTALL_[email protected] TCL_VERSION = @[email protected] TCL_MAJOR_VERSION = @[email protected] PACKAGE_NAME = @[email protected] PACKAGE_VERSION = @[email protected] #TCL_DEFS = @[email protected] ................................................................................ TCLLIBPATH = $(top_builddir) TCLSH_ENV = TCL_LIBRARY=`@[email protected] $(TCL_SRC_DIR)/library` \ TDBC_LIBRARY=`@[email protected] @[email protected]` PKG_ENV = PATH="$(EXTRA_PATH):$(PATH)" \ TCLLIBPATH="$(TCLLIBPATH)" TCLSH_PROG = @[email protected] TCLSH = $(PKG_ENV) $(TCLSH_ENV) $(TCLSH_PROG) #WISH_ENV = TK_LIBRARY=`@[email protected] $(TK_SRC_DIR)/library` #WISH_PROG = @[email protected] #WISH = $(PKG_ENV) $(TCLSH_ENV) $(WISH_ENV) $(WISH_PROG) SHARED_BUILD = @[email protected] INCLUDES = @[email protected] @[email protected] # Move pkgIndex.tcl to 'BINARIES' var if it is generated in the Makefile CONFIG_CLEAN_FILES = Makefile pkgIndex.tcl ................................................................................ #======================================================================== # Start of user-definable TARGETS section #======================================================================== #======================================================================== # TEA TARGETS. Please note that the "libraries:" target refers to platform # independent files, and the "binaries:" target includes executable programs and # platform-dependent libraries. Modify these targets so that they install # the various pieces of your package. The make and install rules # for the BINARIES that you specified above have already been done. #======================================================================== all: libraries doc ................................................................................ #======================================================================== #COMPRESS = tar cvf $(PKG_DIR).tar $(PKG_DIR); compress $(PKG_DIR).tar COMPRESS = tar zcvf $(PKG_DIR).tar.gz $(PKG_DIR) DIST_ROOT = /tmp/dist DIST_DIR = $(DIST_ROOT)/$(PKG_DIR) DIST_INSTALL_DATA = CPPROG='cp -p' $(INSTALL) -m 644 DIST_INSTALL_SCRIPT = CPPROG='cp -p' $(INSTALL) -m 755 dist-clean: rm -rf $(DIST_DIR) $(DIST_ROOT)/$(PKG_DIR).tar.* dist: dist-clean $(INSTALL_DATA_DIR) $(DIST_DIR) $(DIST_INSTALL_DATA) $(srcdir)/license.terms \ $(srcdir)/ChangeLog $(srcdir)/README \ $(srcdir)/aclocal.m4 $(srcdir)/configure.ac \ $(srcdir)/Makefile.in $(srcdir)/pkgIndex.tcl.in \ $(DIST_DIR)/ $(DIST_INSTALL_SCRIPT) $(srcdir)/configure $(DIST_DIR)/ for i in $(srcdir)/*.[ch]; do \ if [ -f $$i ]; then \ $(DIST_INSTALL_DATA) $$i $(DIST_DIR)/ ; \ fi; \ done; $(INSTALL_DATA_DIR) $(DIST_DIR)/tclconfig $(DIST_INSTALL_DATA) $(srcdir)/tclconfig/README.txt \ $(srcdir)/tclconfig/tcl.m4 $(srcdir)/tclconfig/install-sh \ $(DIST_DIR)/tclconfig/ $(INSTALL_DATA_DIR) $(DIST_DIR)/doc $(DIST_INSTALL_DATA) $(srcdir)/doc/tdbc_sqlite3.n $(DIST_DIR)/doc/ $(INSTALL_DATA_DIR) $(DIST_DIR)/library $(DIST_INSTALL_DATA) $(srcdir)/library/tdbcsqlite3.tcl $(DIST_DIR)/library/ $(INSTALL_DATA_DIR) $(DIST_DIR)/tests $(DIST_INSTALL_DATA) $(srcdir)/tests/all.tcl $(srcdir)/tests/tdbcsqlite3.test \ $(DIST_DIR)/tests/ $(INSTALL_DATA_DIR) $(DIST_DIR)/win $(DIST_INSTALL_DATA) $(srcdir)/win/makefile.vc $(srcdir)/win/nmakehlp.c \ $(srcdir)/win/targets.vc $(srcdir)/win/rules-ext.vc \ $(srcdir)/win/rules.vc $(DIST_DIR)/win/ (cd $(DIST_ROOT); $(COMPRESS);) #======================================================================== # End of user-definable section #======================================================================== #======================================================================== # Don't modify the file to clean here. Instead, set the "CLEANFILES" # variable in configure.ac #======================================================================== clean: -rm -f *.core *.core -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean: clean |
Changes to configure.
629 630 631 632 633 634 635 636 637 638 639 640 641 642 .... 1840 1841 1842 1843 1844 1845 1846 1847 1848 1849 1850 1851 1852 1853 1854 1855 1856 1857 1858 1859 1860 1861 1862 1863 1864 1865 1866 1867 1868 1869 1870 1871 1872 1873 .... 1938 1939 1940 1941 1942 1943 1944 1945 1946 1947 1948 1949 1950 1951 1952 1953 1954 |
PKG_HEADERS PKG_TCL_SOURCES PKG_STUB_OBJECTS PKG_STUB_SOURCES PKG_STUB_LIB_FILE PKG_LIB_FILE EXEEXT CYGPATH target_alias host_alias build_alias LIBS ECHO_T ECHO_N ................................................................................ #-------------------------------------------------------------------- # Call TEA_INIT as the first TEA_ macro to set up initial vars. # This will define a ${TEA_PLATFORM} variable == "unix" or "windows" # as well as PKG_LIB_FILE and PKG_STUB_LIB_FILE. #-------------------------------------------------------------------- # TEA extensions pass this us the version of TEA they think they # are compatible with. TEA_VERSION="3.10" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for correct TEA configuration" >&5 $as_echo_n "checking for correct TEA configuration... " >&6; } if test x"${PACKAGE_NAME}" = x ; then as_fn_error $? " The PACKAGE_NAME variable must be defined by your TEA configure.ac" "$LINENO" 5 fi if test x"3.10" = x ; then as_fn_error $? " TEA version not specified." "$LINENO" 5 elif test "3.10" != "${TEA_VERSION}" ; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: warning: requested TEA version \"3.10\", have \"${TEA_VERSION}\"" >&5 $as_echo "warning: requested TEA version \"3.10\", have \"${TEA_VERSION}\"" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok (TEA ${TEA_VERSION})" >&5 $as_echo "ok (TEA ${TEA_VERSION})" >&6; } fi # If the user did not set CFLAGS, set it now to keep macros # like AC_PROG_CC and AC_TRY_COMPILE from adding "-g -O2". if test "${CFLAGS+set}" != "set" ; then CFLAGS="" fi ................................................................................ # Note when adjusted, so that TEA_PREFIX can correct for this. # This is needed for recursive configures, since autoconf propagates # $prefix, but not $exec_prefix (doh!). if test x$exec_prefix = xNONE ; then exec_prefix_default=yes exec_prefix=$prefix fi { $as_echo "$as_me:${as_lineno-$LINENO}: configuring ${PACKAGE_NAME} ${PACKAGE_VERSION}" >&5 $as_echo "$as_me: configuring ${PACKAGE_NAME} ${PACKAGE_VERSION}" >&6;} # This package name must be replaced statically for AC_SUBST to work # Substitute STUB_LIB_FILE in case package creates a stub library too. |
> > > > > > < < | | | < < < < < < < | < > > > > > > > > > > > > > > |
629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 .... 1846 1847 1848 1849 1850 1851 1852 1853 1854 1855 1856 1857 1858 1859 1860 1861 1862 1863 1864 1865 1866 1867 1868 1869 .... 1934 1935 1936 1937 1938 1939 1940 1941 1942 1943 1944 1945 1946 1947 1948 1949 1950 1951 1952 1953 1954 1955 1956 1957 1958 1959 1960 1961 1962 1963 1964 |
PKG_HEADERS PKG_TCL_SOURCES PKG_STUB_OBJECTS PKG_STUB_SOURCES PKG_STUB_LIB_FILE PKG_LIB_FILE EXEEXT INSTALL_LIBRARY INSTALL_SCRIPT INSTALL_PROGRAM INSTALL_DATA INSTALL_DATA_DIR INSTALL CYGPATH target_alias host_alias build_alias LIBS ECHO_T ECHO_N ................................................................................ #-------------------------------------------------------------------- # Call TEA_INIT as the first TEA_ macro to set up initial vars. # This will define a ${TEA_PLATFORM} variable == "unix" or "windows" # as well as PKG_LIB_FILE and PKG_STUB_LIB_FILE. #-------------------------------------------------------------------- TEA_VERSION="3.13" { $as_echo "$as_me:${as_lineno-$LINENO}: checking TEA configuration" >&5 $as_echo_n "checking TEA configuration... " >&6; } if test x"${PACKAGE_NAME}" = x ; then as_fn_error $? " The PACKAGE_NAME variable must be defined by your TEA configure.ac" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok (TEA ${TEA_VERSION})" >&5 $as_echo "ok (TEA ${TEA_VERSION})" >&6; } # If the user did not set CFLAGS, set it now to keep macros # like AC_PROG_CC and AC_TRY_COMPILE from adding "-g -O2". if test "${CFLAGS+set}" != "set" ; then CFLAGS="" fi ................................................................................ # Note when adjusted, so that TEA_PREFIX can correct for this. # This is needed for recursive configures, since autoconf propagates # $prefix, but not $exec_prefix (doh!). if test x$exec_prefix = xNONE ; then exec_prefix_default=yes exec_prefix=$prefix fi INSTALL='$(SHELL) $(srcdir)/tclconfig/install-sh -c' INSTALL_DATA_DIR='${INSTALL} -d -m 755' INSTALL_DATA='${INSTALL} -m 644' INSTALL_PROGRAM='${INSTALL} -m 755' INSTALL_SCRIPT='${INSTALL} -m 755' INSTALL_LIBRARY='${INSTALL} -m 644' { $as_echo "$as_me:${as_lineno-$LINENO}: configuring ${PACKAGE_NAME} ${PACKAGE_VERSION}" >&5 $as_echo "$as_me: configuring ${PACKAGE_NAME} ${PACKAGE_VERSION}" >&6;} # This package name must be replaced statically for AC_SUBST to work # Substitute STUB_LIB_FILE in case package creates a stub library too. |
Changes to configure.ac.
9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 |
#--------------------------------------------------------------------
# Call TEA_INIT as the first TEA_ macro to set up initial vars.
# This will define a ${TEA_PLATFORM} variable == "unix" or "windows"
# as well as PKG_LIB_FILE and PKG_STUB_LIB_FILE.
#--------------------------------------------------------------------
TEA_INIT([3.10])
AC_CONFIG_AUX_DIR(tclconfig)
#--------------------------------------------------------------------
# Load the tclConfig.sh file
#--------------------------------------------------------------------
TEA_PATH_TCLCONFIG
|
| |
9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 |
#--------------------------------------------------------------------
# Call TEA_INIT as the first TEA_ macro to set up initial vars.
# This will define a ${TEA_PLATFORM} variable == "unix" or "windows"
# as well as PKG_LIB_FILE and PKG_STUB_LIB_FILE.
#--------------------------------------------------------------------
TEA_INIT()
AC_CONFIG_AUX_DIR(tclconfig)
#--------------------------------------------------------------------
# Load the tclConfig.sh file
#--------------------------------------------------------------------
TEA_PATH_TCLCONFIG
|