From f0b8296a0635e74aaa58767e513eed226504ec34 Mon Sep 17 00:00:00 2001
From: Andre Noll <maan@tuebingen.mpg.de>
Date: Mon, 30 May 2022 21:06:32 +0200
Subject: [PATCH 1/1] Revert "Makefile: Fix compilation after header removal."

This reverts commit 3bc858ee0d9b929f4cbca61cf5ed8d3184d0cf78.

It is broken because the recipe for the .d files does not honor
CPPFLAGS since we only modify the CPPFLAGS variable for the .o
targets. Adding the corresponding .d targets would be too ugly,
so revert the commit for now until a better solution has been found.
---
 Makefile.real | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/Makefile.real b/Makefile.real
index e5ecfe42..6e8084d5 100644
--- a/Makefile.real
+++ b/Makefile.real
@@ -255,19 +255,10 @@ $(object_dir)/mm.o \
 
 $(object_dir)/compress_filter.o: CFLAGS += -O3
 
-define CC_CMD
+$(object_dir)/%.o: %.c | $(object_dir) $(dep_dir) $(lsg_h) $(yy_h)
 	$(call SAY, CC $<)
-	$(CC) -c -o $(object_dir)/$(*F).o -MMD -MF \
-		$(dep_dir)/$(*F).d -MT $(object_dir)/$(*F).o \
-		$(CPPFLAGS) $(STRICT_CFLAGS) $(CFLAGS) $<
-endef
-CC_PREREQUISITES := %.c | $(object_dir) $(dep_dir) $(lsg_h) $(yy_h)
-# These two have the same prerequisites and the same recipe. There should be a
-# better way to write this.
-$(object_dir)/%.o: $(CC_PREREQUISITES)
-	$(CC_CMD)
-$(dep_dir)/%.d: $(CC_PREREQUISITES)
-	$(CC_CMD)
+	$(CC) -c -o $@ -MMD -MF $(dep_dir)/$(*F).d -MT $@ $(CPPFLAGS) \
+		$(STRICT_CFLAGS) $(CFLAGS) $<
 
 para_recv para_afh para_play para_server: LDFLAGS += $(id3tag_ldflags)
 para_write para_play para_audiod \
-- 
2.30.2