From: Szabolcs Nagy <nsz@port70.net>
Date: Fri, 1 Jul 2016 21:03:39 +0000 (+0000)
Subject: ugly awk workaround for random newlines inserted by gcc -E
X-Git-Url: http://nsz.repo.hu/git/?p=libc-test;a=commitdiff_plain;h=bbe3b5ea6b0ca41b872a3a32d1b68d022faed0b6

ugly awk workaround for random newlines inserted by gcc -E
---

diff --git a/Makefile b/Makefile
index 0cd8a1f..0942e91 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ LOBJS:=$(SRCS:src/%.c=$(B)/%.lo)
 DIRS:=$(patsubst src/%/,%,$(sort $(dir $(SRCS))))
 BDIRS:=$(DIRS:%=$(B)/%)
 NAMES:=$(SRCS:src/%.c=%)
-CFLAGS:=-Isrc/common -I$(B)/common
+CFLAGS:=-I$(B)/common -Isrc/common
 LDLIBS:=$(B)/common/libtest.a
 AR = $(CROSS_COMPILE)ar
 RANLIB = $(CROSS_COMPILE)ranlib
@@ -102,7 +102,12 @@ $(BDIRS):
 	mkdir -p $@
 
 $(B)/common/options.h: src/common/options.h.in
-	$(CC) -E - <$< | sed -e '1,/optiongroups_unistd_end/d' -e '/^#/d' -e '/^[[:space:]]*$$/d' -e 's/^/#define /' >$@
+	$(CC) -E - <$< | awk ' \
+		/optiongroups_unistd_end/ {s=1; next} \
+		!s || !NF || /^#/ {next} \
+		!a {a=$$1; if(NF==1)next} \
+		{print "#define "a" "$$NF; a=""}' >$@.tmp
+	mv $@.tmp $@
 
 $(B)/common/mtest.o: src/common/mtest.h
 $(math.OBJS): src/common/mtest.h