From 2eb6c21822c7b5cc96ab4817d30be6ca2a0f8d5a Mon Sep 17 00:00:00 2001
From: Andre Noll <maan@tuebingen.mpg.de>
Date: Wed, 17 Jun 2020 19:49:32 +0200
Subject: [PATCH] build: Combine make(1) targets osl_errors.h and osl.h.

There is no reason for the two-step appoach. After the patch
we generate one file less.
---
 Makefile | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/Makefile b/Makefile
index d0427c6..4ba28b1 100644
--- a/Makefile
+++ b/Makefile
@@ -103,25 +103,22 @@ $(libname).ga: $(objects)
 lib$(libname).a: $(libname).ga $(libname).sym
 	$(OBJCOPY) --keep-global-symbols $(libname).sym $(libname).ga $@
 
-osl_errors.h: errlist
-	echo '/** public error codes of the osl library. */' > $@
-	sed -e 's/\([A-Z_]*\)	.*/	E_OSL_\1/' \
-		-e '1s/^/enum osl_errors {/1' \
-		-e '1s/$$/=1/1' \
-		-e '$$!s/$$/,/g' \
-		-e '$$s/$$/};/1' $< >> $@
-
 errtab.h: errlist
 	sed -e 's/^\([A-Z_]*\)\s*\(.*\)/OSL_ERROR(E_OSL_\1, \2)/g' $< > $@
 
-osl.h: osl.h.in osl_errors.h Makefile
+osl.h: osl.h.in errlist Makefile
 	echo '#ifndef _OSL_H' > $@
 	echo '#define _OSL_H' >> $@
-	cat osl.h.in osl_errors.h >> $@
+	cat osl.h.in >> $@
+	echo '/** public error codes of the osl library. */' >> $@
+	sed -e 's/\([A-Z_]*\)	.*/	E_OSL_\1/' \
+		-e '1s/^/enum osl_errors {/1' \
+		-e '1s/$$/=1/1' \
+		-e '$$!s/$$/,/g' \
+		-e '$$s/$$/};/1' errlist >> $@
 	echo '#endif /* _OSL_H */' >> $@
 clean:
-	rm -f *.o $(realname) osl.h osl_errors.h errtab.h \
-		oslfsck *.a *.ga *.sym *.lsg.* *.d
+	rm -f *.o $(realname) osl.h errtab.h oslfsck *.a *.ga *.sym *.lsg.* *.d
 
 distclean: clean
 	rm -f web/index.html web/oslfsck.1.html web/osl.png
-- 
2.39.2