From 5023986b4129ab96f50fc48ba5f08b1f2a081d11 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Thu, 20 May 2010 19:01:18 +0000 Subject: [PATCH] USBWebcamHeaderGen rule: Add grist to both header and sources. Simplifies the invocation and fixes the dependency problem (missing grist on the sources) that caused the headers not to be regenerated when the sources changed. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@36878 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../media/media-add-ons/usb_webcam/Jamfile | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/add-ons/media/media-add-ons/usb_webcam/Jamfile b/src/add-ons/media/media-add-ons/usb_webcam/Jamfile index a46e7fd516..5bd15cd637 100644 --- a/src/add-ons/media/media-add-ons/usb_webcam/Jamfile +++ b/src/add-ons/media/media-add-ons/usb_webcam/Jamfile @@ -53,11 +53,13 @@ sensorsSources = tas5130d1b.cpp ; -## how to build header files from sources to include the list of built-in addons. -# but it doesn't seem to work for some reason... +## how to build header files from sources to include the list of built-in addons rule USBWebcamHeaderGen header : macro : sources { + header = [ FGristFiles $(header) ] ; + sources = [ FGristFiles $(sources) ] ; + SEARCH on $(sources) = $(SEARCH_SOURCE) ; Depends $(header) : $(sources) ; @@ -72,11 +74,10 @@ actions USBWebcamHeaderGen1 grep -h $(GREP_DEFINE) $(2) > $(1) ; } -USBWebcamHeaderGen [ FGristFiles CamInternalAddons.h ] - : B_WEBCAM_MKINTFUNC : $(addonSources) ; -USBWebcamHeaderGen [ FGristFiles CamInternalSensors.h ] - : B_WEBCAM_DECLARE_SENSOR : $(sensorsSources) ; -USBWebcamHeaderGen [ FGristFiles CamInternalColorSpaceTransforms.h ] +USBWebcamHeaderGen CamInternalAddons.h : B_WEBCAM_MKINTFUNC : $(addonSources) ; +USBWebcamHeaderGen CamInternalSensors.h : B_WEBCAM_DECLARE_SENSOR + : $(sensorsSources) ; +USBWebcamHeaderGen CamInternalColorSpaceTransforms.h : B_WEBCAM_DECLARE_CSTRANSFORM : $(csTransformsSources) ; Addon usb_webcam.media_addon :