From 650d61845b3f61e9596a8a2dc97458998ba26013 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Wed, 8 Jul 2015 14:40:15 +0200 Subject: Implement automatic amalgamation discovery --- tests/amalgam/config/build/bootstrap.build | 1 + tests/amalgam/config/buildfile | 2 +- tests/amalgam/simple/build/bootstrap.build | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) (limited to 'tests') diff --git a/tests/amalgam/config/build/bootstrap.build b/tests/amalgam/config/build/bootstrap.build index 5951f06..5a01046 100644 --- a/tests/amalgam/config/build/bootstrap.build +++ b/tests/amalgam/config/build/bootstrap.build @@ -1,3 +1,4 @@ project = amalgam-config +amalgamation = # Shall not be amalgamated. subprojects = 1/ 2/ using config diff --git a/tests/amalgam/config/buildfile b/tests/amalgam/config/buildfile index e9fc7f4..7132877 100644 --- a/tests/amalgam/config/buildfile +++ b/tests/amalgam/config/buildfile @@ -1,3 +1,3 @@ -d = 1/ 2/ +d = #1/ 2/ .: $d include $d diff --git a/tests/amalgam/simple/build/bootstrap.build b/tests/amalgam/simple/build/bootstrap.build index 8da7272..698a248 100644 --- a/tests/amalgam/simple/build/bootstrap.build +++ b/tests/amalgam/simple/build/bootstrap.build @@ -1,3 +1,2 @@ project = amalgam-simple -amalgamation = ../ using config -- cgit v1.1