From 30b498c1c0ad42e457610f9856916e9767d74984 Mon Sep 17 00:00:00 2001
From: Stas Sergeev <stsp2@yandex.ru>
Date: Tue, 7 Nov 2023 21:48:43 +0500
Subject: [PATCH] configure: rename build dir for thunk_gen [#146]

---
 configure      |  6 +++---
 fdpp/configure |  6 +++---
 fdpp/makefile  | 16 ++++++++--------
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/configure b/configure
index 636f5c60..41dd8fb6 100755
--- a/configure
+++ b/configure
@@ -6,8 +6,8 @@ if [ ! -f configure ]; then
     mkdir fdpp 2>/dev/null
     cd fdpp
     echo "srcdir = $SCRIPTPATH/fdpp" >config.mak
-    mkdir parsers 2>/dev/null
-    cd parsers
-    echo "srcdir = $SCRIPTPATH/fdpp/parsers" >config.mak
+    mkdir thunk_gen 2>/dev/null
+    cd thunk_gen
+    echo "srcdir = $SCRIPTPATH/fdpp/thunk_gen" >config.mak
     ln -sf "$SCRIPTPATH"/fdpp/thunk_gen/makefile makefile
 fi
diff --git a/fdpp/configure b/fdpp/configure
index 6ef0ab8d..27d8779e 100755
--- a/fdpp/configure
+++ b/fdpp/configure
@@ -3,8 +3,8 @@ TOPDIR=`realpath "$SCRIPTPATH/.."`
 if [ ! -f configure ]; then
     ln -sf "$SCRIPTPATH"/makefile makefile
     echo "srcdir = $SCRIPTPATH" >config.mak
-    mkdir parsers 2>/dev/null
-    cd parsers
-    echo "srcdir = $SCRIPTPATH/parsers" >config.mak
+    mkdir thunk_gen 2>/dev/null
+    cd thunk_gen
+    echo "srcdir = $SCRIPTPATH/thunk_gen" >config.mak
     ln -sf "$SCRIPTPATH"/thunk_gen/makefile makefile
 fi
diff --git a/fdpp/makefile b/fdpp/makefile
index 22e222d5..4c7e98ff 100644
--- a/fdpp/makefile
+++ b/fdpp/makefile
@@ -88,7 +88,7 @@ endif
 	chmod -x $@
 
 clean:
-	+cd parsers && $(MAKE) srcdir=$(abspath $(srcdir))/parsers clean
+	+cd thunk_gen && $(MAKE) srcdir=$(abspath $(srcdir))/thunk_gen clean
 	-$(RM) .tstamp *.map $(TARGET).elf *.inc \
 		*.o $(GEN_CC) $(FDPPDEVL) $(FDPPLIB) *.tmp $(GEN_HEADERS) \
 		$(GEN_HEADERS_FD) $(GEN_ASMS) \
@@ -227,13 +227,13 @@ plt.inc: thunk_calls.tmp
 plt_asmc.h plt_asmp.h: thunk_asms.tmp
 	$(pars)
 
-thunk_calls.h: thunk_calls.tmp parsers/thunk_gen
-	parsers/thunk_gen $(TFLAGS) <$< >$@ || ($(RM) $@ ; false)
+thunk_calls.h: thunk_calls.tmp thunk_gen/thunk_gen
+	thunk_gen/thunk_gen $(TFLAGS) <$< >$@ || ($(RM) $@ ; false)
 
-thunk_asms.h: thunk_asms.tmp parsers/thunk_gen $(srcdir)/parsers/thunks.m4
-	parsers/thunk_gen $(TFLAGS) 1 <$< | sort | uniq | autom4te -l m4sugar $(srcdir)/parsers/thunks.m4 - >$@_ \
+thunk_asms.h: thunk_asms.tmp thunk_gen/thunk_gen $(srcdir)/parsers/thunks.m4
+	thunk_gen/thunk_gen $(TFLAGS) 1 <$< | sort | uniq | autom4te -l m4sugar $(srcdir)/parsers/thunks.m4 - >$@_ \
 		|| ($(RM) $@_ ; false)
-	parsers/thunk_gen $(TFLAGS) 2 <$< >$@__ \
+	thunk_gen/thunk_gen $(TFLAGS) 2 <$< >$@__ \
 		|| ($(RM) $@__ ; false)
 	cat $@_ $@__ >$@
 	rm -f $@_ $@__
@@ -241,8 +241,8 @@ thunk_asms.h: thunk_asms.tmp parsers/thunk_gen $(srcdir)/parsers/thunks.m4
 glob_asmdefs.h: $(SRC)/glob_asm.h
 	$(srcdir)/parsers/mkasmdefs.sh $< >$@
 
-parsers/thunk_gen: $(srcdir)/thunk_gen/thunk_gen.y $(srcdir)/thunk_gen/thunk_gen.l
-	+cd parsers && $(MAKE) srcdir=$(abspath $(srcdir))/thunk_gen
+thunk_gen/thunk_gen: $(srcdir)/thunk_gen/thunk_gen.y $(srcdir)/thunk_gen/thunk_gen.l
+	+cd thunk_gen && $(MAKE) srcdir=$(abspath $(srcdir))/thunk_gen
 
 INSTALL ?= install
 install: $(ALL)