summaryrefslogtreecommitdiff
path: root/meta/Makefile.am
Commit message (Expand)AuthorAgeFilesLines
* build: Use pipe symbol instead of comma for substitutions....* meta/Makefile.am (substitute): Use pipe symbol instead of comma for substitutions. Mark H Weaver2015-03-071-24/+25
* Merge commit '47ca15c7dffd14a82e75c1a0aeeaf2e77f3fa5b4'Andy Wingo2015-01-221-15/+17
|\
| * build: Better handle substitutions in 'guile-2.0.pc' & co....* meta/Makefile.am (dependency_substitutions): Use '|' as the separate instead of ','. See <http://hydra.nixos.org/build/17684751>. Ludovic Courtès2014-12-061-15/+17
* | Merge commit '7c433cbbce83bc9f2f9967afba00bbb68e312657'...Conflicts: meta/Makefile.am Andy Wingo2015-01-221-18/+42
|\|
| * build: Add missing substitutions for 'guile-2.0.pc'....This is a followup to 5fac1a7. * meta/Makefile.am (substitute): Add GUILE_* and LIBGUILE_* substitutions, and $(dependency_substitutions). (dependency_substitutions): New variable. Ludovic Courtès2014-12-031-18/+42
* | Merge commit '5fac1a7ada362d78f13143acbc0ceca7f2f101de'...Conflicts: configure.ac doc/ref/libguile-parallel.texi Andy Wingo2015-01-221-18/+42
|\|
| * Add the 'guild' and 'guile' variables to 'guile-2.0.pc'....* configure.ac: Remove meta/guile-2.0.pc and meta/guile-2.0-uninstalled.pc from 'AC_CONFIG_FILES'. * meta/Makefile.am (substitute): New variable. (guile-2.0.pc, guile-2.0-uninstalled.pc): New targets. (guile-config, guild): Use $(substitute) instead of duplicated sed script. (CLEANFILES): Add the .pc files. * meta/guile-2.0.pc.in (bindir, guild, guile): New variables. * doc/ref/libguile-parallel.texi (Parallel Installations): Document the 'guild' and 'guile' pkg-config variables. Ludovic Courtès2014-12-031-13/+36
| * build: Clean up rules for meta/{guild,guile-config}....* meta/Makefile.am (guile-config, guild): Avoid useless 'cat' invocation'. Quote all occurrences of '@'. Suggested by Eric Blake <eblake@redhat.com>. Ludovic Courtès2014-04-241-12/+12
| * build: Honor program name transformation in 'guild'....* configure.ac: Remove erroneous 'guile_program_name' substitute; see <https://lists.gnu.org/archive/html/autoconf/2014-04/msg00010.html> for details. Remove 'meta/guild' config file. * meta/Makefile.am (guild): New target. (CLEANFILES): Add 'guild'. * meta/guild.in: Remove 'prefix' and 'exec_prefix' definitions; use @installed_guile@. Ludovic Courtès2014-04-241-2/+12
* | build: Clean up rules for meta/{guild,guile-config}....* meta/Makefile.am (guile-config, guild): Avoid useless 'cat' invocation'. Quote all occurrences of '@'. Suggested by Eric Blake <eblake@redhat.com>. Ludovic Courtès2014-04-241-12/+12
* | build: Honor program name transformation in 'guild'....* configure.ac: Remove erroneous 'guile_program_name' substitute; see <https://lists.gnu.org/archive/html/autoconf/2014-04/msg00010.html> for details. Remove 'meta/guild' config file. * meta/Makefile.am (guild): New target. (CLEANFILES): Add 'guild'. * meta/guild.in: Remove 'prefix' and 'exec_prefix' definitions; use @installed_guile@. Ludovic Courtès2014-04-241-2/+12
* | Merge remote-tracking branch 'origin/stable-2.0'...Conflicts: GUILE-VERSION libguile/array-map.c libguile/fports.h libguile/gc.h libguile/inline.h libguile/ports.c libguile/ports.h libguile/print.c libguile/r6rs-ports.c libguile/read.c test-suite/tests/00-socket.test Mark H Weaver2013-04-141-2/+2
|\|
| * Do not add $(EXEEXT) to guild or guile-tools....* meta/Makefile.am (install-exec-hook): Do not add $(EXEEXT) to guild or guile-tools. Mark H Weaver2013-04-101-2/+2
* | Merge remote-tracking branch 'origin/stable-2.0'...Conflicts: configure.ac libguile/deprecated.c libguile/deprecated.h libguile/filesys.h libguile/fluids.c libguile/fports.c libguile/gc.c libguile/guile.c libguile/numbers.c libguile/objcodes.c libguile/r6rs-ports.c libguile/smob.c libguile/socket.c libguile/threads.h module/language/scheme/decompile-tree-il.scm module/language/tree-il/peval.scm test-suite/tests/syncase.test Mark H Weaver2013-03-281-5/+5
|\|
| * build: Use portable sed constructs....Partly fixes <http://bugs.gnu.org/14042>. Reported by Marc Girod <marc.girod@gmail.com>. * meta/Makefile.am (guile-config): Use separate "s" expressions to accommodate Solaris sed. Ludovic Courtès2013-03-251-5/+5
* | Merge remote-tracking branch 'origin/stable-2.0'...Moved scm_i_struct_hash from struct.c to hash.c and made it static. The port's alist is now a field of 'scm_t_port'. Conflicts: libguile/arrays.c libguile/hash.c libguile/ports.c libguile/print.h libguile/read.c Mark H Weaver2012-10-301-1/+1
|\|
| * build: Fix race between installing `guild' and the `guile-tools' symlink....Fixes <http://bugs.gnu.org/12015>. Report and patch by Song.Li <Song.Li@windriver.com>. * meta/Makefile.am (install-data-hook): Rename to... (install-exec-hook): ... this. Ludovic Courtès2012-09-031-1/+1
* | Merge remote-tracking branch 'origin/stable-2.0'...Conflicts: module/language/tree-il/analyze.scm module/language/tree-il/effects.scm module/language/tree-il/fix-letrec.scm module/language/tree-il/peval.scm test-suite/tests/cse.test test-suite/tests/peval.test Andy Wingo2012-05-211-3/+8
|\|
| * Honor $(program_transform_name) for the `guile-tools' symlink....Fixes <http://bugs.gnu.org/11451>. Reported by Cyprien Nicolas <c.nicolas@gmail.com>. * meta/Makefile.am (install-data-hook): Honor $(program_transform_name). Ludovic Courtès2012-05-141-3/+8
* | Merge remote-tracking branch 'local-2.0/stable-2.0'...Conflicts: meta/Makefile.am Andy Wingo2011-06-021-2/+7
|\|
| * rename `guile-tools' to `guild'...* configure.ac: Look for ln -s. Write out `guild' instead of `guile-tools'. * meta/Makefile.am (install-data-hook): Link the installed `guild' to the backward-compatible `guile-tools' name. (bin_SCRIPTS, EXTRA_DIST): Fix up for guild change. * meta/guild.in: Moved here from `guile-tools.in'. * doc/ref/Makefile.am (autoconf-macros.texi): * doc/ref/api-evaluation.texi (Compilation): * doc/ref/autoconf.texi (Autofrisk, Using Autofrisk): * doc/ref/mod-getopt-long.texi (getopt-long Reference): * doc/ref/tools.texi (Miscellaneous Tools, Executable Modules): Minimal doc update. * .gitignore: * am/guilec (.scm.go): * libguile/Makefile.am (snarf2checkedtexi): * module/Makefile.am (ice-9/psyntax-pp.go): Update makefiles, etc. * module/scripts/README: * module/scripts/lint.scm: * module/scripts/list.scm: Update commentaries. Andy Wingo2011-05-311-3/+8
* | bump effective version to 2.2...* .gitignore: * GUILE-VERSION (GUILE_EFFECTIVE_VERSION): * configure.ac: * doc/example-smob/Makefile (CFLAGS, LIBS): * doc/guile.1: * doc/ref/libguile-concepts.texi: * doc/ref/srfi-modules.texi: * doc/ref/vm.texi: * meta/Makefile.am (EXTRA_DIST, pkgconfig_DATA): * meta/guile-config.in (guile-module): * meta/guile-2.2-uninstalled.pc.in: * meta/guile-2.2.pc.in: Bump effective version to 2.2. Andy Wingo2011-04-111-3/+3
|/
* guile-config depends on config.status...* meta/Makefile.am (guile-config): Depend on config.status, so that if $prefix changes, guile-config gets rebuilt. Andy Wingo2009-12-201-1/+1
* Fix makefile indentation....* benchmark-suite/Makefile.am, libguile/Makefile.am, meta/Makefile.am: Use TAB instead of 8 spaces... * .x-sc_makefile_check: New file. Ludovic Courtès2009-11-241-2/+2
* Clean meta/guile-config...* meta/Makefile.am (CLEANFILES): New, containing guile-config. Neil Jerram2009-09-261-0/+2
* Don't include guile-config and guile-tools in distribution...They need to be regenerated, with the correct prefix, when configure and make run. * meta/Makefile.am (EXTRA_DIST): Remove bin_SCRIPTS. Neil Jerram2009-09-251-1/+1
* Fix make distcheck by looking for guile-config in $(srcdir)...make distcheck is currently failing for me with: In file included from /usr/local/include/libguile/threads.h:35, from /usr/local/include/libguile/async.h:28, from /usr/local/include/libguile.h:37, from ../../examples/box/box.c:22: /usr/local/include/libguile/pthread-threads.h:33:31: error: libguile/boehm-gc.h: No such file or directory In file included from /usr/local/include/libguile.h:93, from ../../examples/box/box.c:22: - which is because it's picking up a load of installed headers, instead of those in the _inst tree - which is because there is no output from the preceding guile-config invocation: PATH=/home/neil/SW/Guile/ovnight/guile-master-20090924/_inst/bin:$PATH PKG_CONFIG_PATH=/home/neil/SW/Guile/ovnight/guile-master-20090924/_inst/lib/pkgconfig /home/neil/SW/Guile/ovnight/guile-master-20090924/_inst/bin/guile-config compile - which is because .../_inst/bin/guile-config is empty - which is because the rule in meta/Makefile.am that generates guile-config is missing $(srcdir), and so doesn't find guile-config.in. * meta/Makefile.am (guile-config): Look for guile-config.in in $(srcdir). Neil Jerram2009-09-251-2/+2
* Have `guile-config' close over `pkg-config' and $(pkgconfigdir)....* meta/Makefile.am (guile-config): New target. (EXTRA_DIST): Add `guile-config.in'. * meta/guile-config.in: New, formerly `guile-config'. Use the right installed `guile', with the right $PKG_CONFIG_PATH. Disable auto-compilation. (%pkg-config-program): New variable. (pkg-config): Use it. Ludovic Courtès2009-09-241-1/+11
* actually install guile-tools...* meta/Makefile.am (bin_SCRIPTS): Re-add guile-tools here (removed in 54b38caf19deb0e5a6e8146c65b3e176e7fffa60). Otherwise guile-tools doesn't get installed. I think that 1.9.2 had this bug. Andy Wingo2009-08-261-1/+1
* Add proper `--help' and `--version' for `guile-tools compile'....* configure.ac: Produce `meta/guile-tools'. * meta/Makefile.am (EXTRA_DIST): Add `guile-tools.in'. (bin_SCRIPTS): Remove `guile-tools'. * meta/uninstalled-env.in (PATH): Add "${top_builddir}/meta". * module/scripts/compile.scm (%options): Add `--version'. (parse-args): Show the offending option name upon error. (show-version): New. (compile): Use `%guile-bug-report-address'. Ludovic Courtès2009-08-151-4/+5
* Switch from `guile-1.8.pc' to `guile-2.0.pc'....* configure.ac: Produce guile-2.0*.pc. * meta/Makefile.am (EXTRA_DIST): Rename guile-1.8*.pc.in to guile-2.0*.pc.in. (pkgconfig_DATA): Update accordingly. * meta/guile-config (guile-module): Likewise. Ludovic Courtès2009-08-151-3/+3
* Change Guile license to LGPLv3+...(Not quite finished, the following will be done tomorrow. module/srfi/*.scm module/rnrs/*.scm module/scripts/*.scm testsuite/*.scm guile-readline/* ) Neil Jerram2009-06-171-8/+8
* distcheck fixen...* examples/Makefile.am: Fix the installed guile-config invocation to set PKG_CONFIG_PATH. * meta/Makefile.am (EXTRA_DIST): Dist the bin_SCRIPTS. * meta/guile-config (pkg-config): Better error messages if pkg-config invocation fails. * meta/uninstalled-env.in (PATH): Now that guile-config and guile-tools are not generated, make it the srcdir/meta instead of the builddir. (Guile itself will be picked up from libguile.) Andy Wingo2009-04-211-1/+2
* guile-tools is a scheme script that loads scheme modules...* meta/guile-tools: Changed to be a scheme script. Instead of looking for executables in a "scripts dir", we just look for modules in (scripts), and load the modules directly. * module/Makefile.am: * module/scripts/: Move the scripts into module/ so they can be compiled. Rename scripts from `foo' to `foo.scm'. * libguile/Makefile.am: Invoke the snarf->texi code via guile-tools. * configure.in: * .gitignore: Update for changes. Andy Wingo2009-04-171-1/+1
* guile-config rebased on top of pkg-config...* configure.in: * meta/Makefile.am (EXTRA_DIST): Remove guile-config.in bits. * meta/guile-config: Reimplement to work on top of pkg-config. This lets guile-config not be substed by configure. * meta/uninstalled-env.in: Remove the path to guile-config, belatedly. Set the pkg-config path correctly. Andy Wingo2009-04-061-1/+1
* allow building against uninstalled guile; move some things to meta/...* README: Add more info about building against an uninstalled Guile. * meta/: New directory. The proximate cause of its creation is that I want to be able to build external packages against uninstalled Guile, and to do that I need guile-tools in the PATH, but I don't want $top_builddir/libtool in the path. But it seems like a good reorganization, for things that are /about/ Guile: pkg-config files, m4 files, guile-config... then we also include uninstalled info: the environment, the pre-inst-guile script, etc. * meta/guile-1.8-uninstalled.pc.in: New pkg-config template. pkg-config prefers -uninstalled pkg-config files, if they are in its path. * meta/Makefile.am: * meta/ChangeLog-2008: * meta/gdb-uninstalled-guile.in: * meta/guile-1.8.pc.in: * meta/guile-config.in: * meta/guile.m4: * meta/guile-tools.in: Moved to meta/. * meta/guile.in: This is the new name of pre-inst-guile.in. * meta/uninstalled-env.in: And this, pre-inst-guile-env.in. * Makefile.am: * am/guilec: * am/pre-inst-guile: * check-guile.in: * configure.in: * doc/ref/Makefile.am: * gc-benchmarks/run-benchmark.scm: * test-suite/standalone/Makefile.am: * test-suite/standalone/README: * testsuite/Makefile.am: Adapt to meta/ change. Andy Wingo2009-03-271-0/+33