From 6591e7636d5591e467f86bb4edf9744d880d33ff Mon Sep 17 00:00:00 2001
From: Calvin Rose <calsrose@gmail.com>
Date: Fri, 8 Nov 2019 20:33:26 -0600
Subject: [PATCH] Copy janetconf to build for amalg target.

This makes testing the amalg easier.
---
 Makefile    | 5 ++++-
 meson.build | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 3ea52cb2..3ba1d0f5 100644
--- a/Makefile
+++ b/Makefile
@@ -213,7 +213,7 @@ build/boot.gen.c: src/boot/boot.janet build/xxd
 ##### Amalgamation #####
 ########################
 
-amalg: build/shell.c build/janet.c build/janet.h build/core_image.c
+amalg: build/shell.c build/janet.c build/janet.h build/core_image.c build/janetconf.h
 
 AMALG_SOURCE=$(JANET_LOCAL_HEADERS) $(JANET_CORE_SOURCES) build/core_image.c
 build/janet.c: $(AMALG_SOURCE) tools/amalg.janet $(JANET_TARGET)
@@ -226,6 +226,9 @@ build/shell.c: $(JANET_TARGET) tools/amalg.janet $(AMALG_SHELL_SOURCE)
 build/janet.h: src/include/janet.h
 	cp $< $@
 
+build/janetconf.h: src/conf/janetconf.h
+	cp $< $@
+
 ###################
 ##### Testing #####
 ###################
diff --git a/meson.build b/meson.build
index 16386e96..e41e3687 100644
--- a/meson.build
+++ b/meson.build
@@ -221,7 +221,7 @@ amalg_shell = custom_target('amalg-shell',
   command : [janet_nativeclient, '@INPUT@'])
 
 # Amalgamated client
-janet_amalgclient = executable('janet-amalg', amalg, mainclient_src,
+janet_amalgclient = executable('janet-amalg', amalg, amalg_shell,
   include_directories : incdir,
   dependencies : [m_dep, dl_dep],
   build_by_default : false)