diff options
| author |   Petteri Räty <petsku@petteriraty.eu> | 2011-05-24 17:47:04 +0300 |
|---|---|---|
| committer | Petteri Räty <petsku@petteriraty.eu> | 2011-05-24 17:47:04 +0300 |
| commit | dd5cbd758e004e0ae07914a6e03484b3414322b4 (patch) | |
| tree | 1ece66fda1cc39475cd9ddc864c11c6fc116ccbb /Makefile.am | |
| parent | Test: /bin/bash instead of /bin/sh (diff) | |
| parent | Builtin: support the declare built-in syntax (diff) | |
| download | libbash-dd5cbd758e004e0ae07914a6e03484b3414322b4.tar.gz libbash-dd5cbd758e004e0ae07914a6e03484b3414322b4.tar.bz2 libbash-dd5cbd758e004e0ae07914a6e03484b3414322b4.zip | |
Merge remote-tracking branch 'mu/declare_builtin' into review
Conflicts:
scripts/command_execution.bash
scripts/command_execution.bash.result
scripts/function_def.bash
scripts/function_def.bash.result
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index bd0bf7b..c4605cd 100644 --- a/Makefile.am +++ b/Makefile.am @@ -99,6 +99,7 @@ cppunittests_SOURCES = test/run_tests.cpp \ src/core/tests/bash_ast_test.cpp \ src/core/tests/bash_condition_test.cpp \ src/builtins/tests/echo_tests.cpp \ + src/builtins/tests/declare_tests.cpp \ src/builtins/tests/boolean_tests.cpp \ src/builtins/tests/source_tests.cpp \ src/builtins/tests/return_tests.cpp \ @@ -174,6 +175,8 @@ libcppbash_la_SOURCES = src/common.h \ src/cppbash_builtin.h \ src/builtins/echo_builtin.cpp \ src/builtins/echo_builtin.h \ + src/builtins/declare_builtin.cpp \ + src/builtins/declare_builtin.h \ src/builtins/boolean_builtins.h \ src/builtins/source_builtin.h \ src/builtins/source_builtin.cpp \ |