swc

commit bc9e6fe7a30432ff78c61450710633befc547e21
parent 335822a1d88e5ea16049bcdddd07e01602204036
Author: Michael Forney <mforney@mforney.org>
Date:   Sat, 23 Nov 2013 22:53:14 -0800

Fix dependencies on generated files

Diffstat:
M
libswc/Makefile.local
 | 
3
++-
M
protocol/Makefile.local
 | 
7
+++----

2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/libswc/Makefile.local b/libswc/Makefile.local
@@ -65,7 +65,8 @@ SWC_STATIC_OBJECTS = $(SWC_SOURCES:%.c=%.o)
 SWC_SHARED_OBJECTS = $(SWC_SOURCES:%.c=%.lo)
 
 # Explicitly state dependencies on generated files
-$(dir)/drm.c $(dir)/drm_buffer.c: protocol/wayland-drm-server-protocol.h
+objects = $(foreach obj,$(1),$(dir)/$(obj).o $(dir)/$(obj.lo))
+$(call objects,drm drm_buffer): protocol/wayland-drm-server-protocol.h
 
 $(dir)/libswc.a: $(SWC_STATIC_OBJECTS)
 	$(call quiet,AR) cru $@ $^
diff --git a/protocol/Makefile.local b/protocol/Makefile.local
@@ -5,15 +5,14 @@ dir := protocol
 PROTOCOL_EXTENSIONS =   \
     $(dir)/wayland-drm.xml
 
+$(dir)_TARGETS := $(PROTOCOL_EXTENSIONS:%.xml=%-protocol.c) \
+                  $(PROTOCOL_EXTENSIONS:%.xml=%-server-protocol.h)
+
 $(dir)/%-protocol.c: $(dir)/%.xml
 	$(call quiet,GEN,$(WAYLAND_SCANNER)) code < $< > $@
 
 $(dir)/%-server-protocol.h: $(dir)/%.xml
 	$(call quiet,GEN,$(WAYLAND_SCANNER)) server-header < $< > $@
 
-CLEAN_FILES +=                                          \
-    $(PROTOCOL_EXTENSIONS:%.xml=%-protocol.c)           \
-    $(PROTOCOL_EXTENSIONS:%.xml=%-server-protocol.h)
-
 include Makefile.common