From fa797124813d7d4f7b877e7ff50c767219a8aea9 Mon Sep 17 00:00:00 2001
From: Florian Margaine <florian@platform.sh>
Date: Thu, 31 Dec 2020 23:20:46 +0100
Subject: [PATCH] Makefile.in: fix copy of header files.

The makefile is apparently quite oudated, having some reference to
some currently non-existing c/ecl/external.h file, which is now just
h/external.h.

Copying all the header files was accidentally working thanks to the
`cp -rf $(srcdir)/h/*.h` that existed, but it means that editing any
header file (except the internal.h one) would not recompile
appropriately.

This commit introduces an explicit way to declare the header files,
and make can thus do its jobs correctly.
---
 src/Makefile.in | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/src/Makefile.in b/src/Makefile.in
index 18f0af21f..51d827d78 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -83,19 +83,14 @@ endif
 %Makefile: $(srcdir)/%Makefile.in config.status
 	./config.status
 
-#
-# When compiling the library itself, we have to remove the dllimport
-# declarations, because the variables that they mark are in the
-# in the library and can be referenced without indirection.
-#
-c/ecl/external.h: $(top_srcdir)/h/external.h
-	test -d c/ecl || mkdir c/ecl
-	sed 's,__declspec(dllimport),,g' $(top_srcdir)/h/external.h > $@
+ecl/%.h: $(top_srcdir)/h/%.h
+	cp $< $@
 
-ecl/external.h: c/ecl/external.h c/ecl/external.h
-	cp -rf $(srcdir)/h/*.h $(srcdir)/h/impl ecl/
+ecl/impl/%.h: $(top_srcdir)/h/impl/%.h
+	mkdir -p ecl/impl
+	cp $< $@
 
-bin/$(ECL): $(ECL_MIN) compile.lsp ecl/external.h build-stamp $(top_srcdir)/lsp/*.lsp $(top_srcdir)/clos/*.lsp $(top_srcdir)/*cmp/*.lsp
+bin/$(ECL): $(ECL_MIN) compile.lsp ecl/*.h ecl/impl/*.h build-stamp $(top_srcdir)/lsp/*.lsp $(top_srcdir)/clos/*.lsp $(top_srcdir)/*cmp/*.lsp
 	if [ -f CROSS-COMPILER ]; then \
 		./CROSS-COMPILER compile; \
 	else \
-- 
GitLab