From 4945683e6ff5aa80904c77b500e4aaa232da3b83 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Thu, 25 Jan 2007 17:21:52 +0000 Subject: [PATCH] Fixed generation of header files. Removed generated header files from repository. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@19957 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../media-add-ons/usb_webcam/CamInternalAddons.h | 2 -- .../usb_webcam/CamInternalColorSpaceTransforms.h | 1 - .../media-add-ons/usb_webcam/CamInternalSensors.h | 3 --- .../media/media-add-ons/usb_webcam/Jamfile | 15 ++++++++------- 4 files changed, 8 insertions(+), 13 deletions(-) delete mode 100644 src/add-ons/media/media-add-ons/usb_webcam/CamInternalAddons.h delete mode 100644 src/add-ons/media/media-add-ons/usb_webcam/CamInternalColorSpaceTransforms.h delete mode 100644 src/add-ons/media/media-add-ons/usb_webcam/CamInternalSensors.h diff --git a/src/add-ons/media/media-add-ons/usb_webcam/CamInternalAddons.h b/src/add-ons/media/media-add-ons/usb_webcam/CamInternalAddons.h deleted file mode 100644 index 34c61730cf..0000000000 --- a/src/add-ons/media/media-add-ons/usb_webcam/CamInternalAddons.h +++ /dev/null @@ -1,2 +0,0 @@ -B_WEBCAM_MKINTFUNC(quickcam) -B_WEBCAM_MKINTFUNC(sonix) diff --git a/src/add-ons/media/media-add-ons/usb_webcam/CamInternalColorSpaceTransforms.h b/src/add-ons/media/media-add-ons/usb_webcam/CamInternalColorSpaceTransforms.h deleted file mode 100644 index 20323138dd..0000000000 --- a/src/add-ons/media/media-add-ons/usb_webcam/CamInternalColorSpaceTransforms.h +++ /dev/null @@ -1 +0,0 @@ -B_WEBCAM_DECLARE_CSTRANSFORM(BayerTransform, bayer) diff --git a/src/add-ons/media/media-add-ons/usb_webcam/CamInternalSensors.h b/src/add-ons/media/media-add-ons/usb_webcam/CamInternalSensors.h deleted file mode 100644 index 22d326b9f8..0000000000 --- a/src/add-ons/media/media-add-ons/usb_webcam/CamInternalSensors.h +++ /dev/null @@ -1,3 +0,0 @@ -B_WEBCAM_DECLARE_SENSOR(HDCS1000Sensor, hdcs1000) -B_WEBCAM_DECLARE_SENSOR(HV7131E1Sensor, hv7131e1) -B_WEBCAM_DECLARE_SENSOR(TAS5110C1BSensor, tas5110c1b) 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 eafa450056..2b5d3e9b5e 100644 --- a/src/add-ons/media/media-add-ons/usb_webcam/Jamfile +++ b/src/add-ons/media/media-add-ons/usb_webcam/Jamfile @@ -51,19 +51,20 @@ sensorsSources = hdcs1000.cpp hv7131e1.cpp tas5110c1b.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... -rule USBWebcamHeaderGen +rule USBWebcamHeaderGen header : macro : sources { - SEARCH on $(3) = $(SEARCH_SOURCE) ; + SEARCH on $(sources) = $(SEARCH_SOURCE) ; - Depends $(1) : $(3) ; - MakeLocateArch $(<) ; - USBWebcamHeaderGen1 $(2) : $(3) : $(1) ; - LocalClean clean : $(<) ; + Depends $(header) : $(sources) ; + MakeLocateArch $(header) ; + GREP_DEFINE on $(header) = $(macro) ; + USBWebcamHeaderGen1 $(header) : $(sources) ; + LocalClean clean : $(header) ; } actions USBWebcamHeaderGen1 { - alert 'grep -h $(1) $(2) > $(3) ' ; + grep -h $(GREP_DEFINE) $(2) > $(1) ; } USBWebcamHeaderGen [ FGristFiles CamInternalAddons.h ] : B_WEBCAM_MKINTFUNC : $(addonSources) ;