Cleanup and style fixes. Enforced 80 char line length.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@19958 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold 2007-01-25 17:24:08 +00:00
parent 4945683e6f
commit ede02ff526

View File

@ -2,27 +2,16 @@ SubDir HAIKU_TOP src add-ons media media-add-ons usb_webcam ;
SetSubDirSupportedPlatformsBeOSCompatible ; SetSubDirSupportedPlatformsBeOSCompatible ;
# note: when adding new addons, sensors
# or colorspace transforms, one should regenerate
# the *Internal*.h headers with the makefile.
# for USBKit.h # for USBKit.h
UseLibraryHeaders usb ; UseLibraryHeaders usb ;
# Zeta has a libusb.so, we have a USBKit.a # Zeta has a libusb.so, we have a USBKit.a
if $(TARGET_PLATFORM) = haiku { if $(TARGET_PLATFORM) = haiku {
usbKitLibraryName = USBKit.a ; usbKitLibraryName = USBKit.a ;
} else { } else {
usbKitLibraryName = usb ; usbKitLibraryName = usb ;
} }
# HOW the F*** do I do that with Jam ?
#SRCS := $(wildcard *.cpp) \
#$(wildcard addons/*/*.cpp) \
#$(wildcard sensors/*/*.cpp) \
#$(wildcard cstransforms/*.cpp)
# source directories # source directories
local sourceDirs = local sourceDirs =
addons/quickcam addons/quickcam
@ -33,7 +22,8 @@ local sourceDirs =
local sourceDir ; local sourceDir ;
for sourceDir in $(sourceDirs) { for sourceDir in $(sourceDirs) {
SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons media media-add-ons usb_webcam $(sourceDir) ] ; SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons media media-add-ons
usb_webcam $(sourceDir) ] ;
} }
## addon sources ## addon sources
@ -67,9 +57,12 @@ actions USBWebcamHeaderGen1
grep -h $(GREP_DEFINE) $(2) > $(1) ; grep -h $(GREP_DEFINE) $(2) > $(1) ;
} }
USBWebcamHeaderGen [ FGristFiles CamInternalAddons.h ] : B_WEBCAM_MKINTFUNC : $(addonSources) ; USBWebcamHeaderGen [ FGristFiles CamInternalAddons.h ]
USBWebcamHeaderGen [ FGristFiles CamInternalSensors.h ] : B_WEBCAM_DECLARE_SENSOR : $(sensorsSources) ; : B_WEBCAM_MKINTFUNC : $(addonSources) ;
USBWebcamHeaderGen [ FGristFiles CamInternalColorSpaceTransforms.h ] : B_WEBCAM_DECLARE_CSTRANSFORM : $(csTransformsSources) ; USBWebcamHeaderGen [ FGristFiles CamInternalSensors.h ]
: B_WEBCAM_DECLARE_SENSOR : $(sensorsSources) ;
USBWebcamHeaderGen [ FGristFiles CamInternalColorSpaceTransforms.h ]
: B_WEBCAM_DECLARE_CSTRANSFORM : $(csTransformsSources) ;
Addon usb_webcam.media_addon : media : Addon usb_webcam.media_addon : media :
$(addonSources) $(addonSources)
@ -93,5 +86,5 @@ LinkAgainst usb_webcam.media_addon : be media $(usbKitLibraryName) ;
# force dependancies # force dependancies
Includes [ FGristFiles CamRoster.cpp ] : [ FGristFiles CamInternalAddons.h ] ; Includes [ FGristFiles CamRoster.cpp ] : [ FGristFiles CamInternalAddons.h ] ;
Includes [ FGristFiles CamDevice.cpp ] : [ FGristFiles CamInternalSensors.h ] ; Includes [ FGristFiles CamDevice.cpp ] : [ FGristFiles CamInternalSensors.h ] ;
Includes [ FGristFiles CamColorSpaceTransform.cpp ] : [ FGristFiles CamInternalColorSpaceTransforms.h ] ; Includes [ FGristFiles CamColorSpaceTransform.cpp ]
: [ FGristFiles CamInternalColorSpaceTransforms.h ] ;