diff options
| author | H Hartley Sweeten | 2012-12-20 01:49:24 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2013-01-07 23:51:11 +0100 |
| commit | fd958f7eb4d0959f65377aaab4a63ba33cc53f06 (patch) | |
| tree | 518cb50c95181a6450117cfd1baee5e38305d459 /drivers/staging/comedi/Makefile | |
| parent | Staging: comedi: addi_common.c: checkpatch.pl fixes (diff) | |
| download | kernel-qcow2-linux-fd958f7eb4d0959f65377aaab4a63ba33cc53f06.tar.gz kernel-qcow2-linux-fd958f7eb4d0959f65377aaab4a63ba33cc53f06.tar.xz kernel-qcow2-linux-fd958f7eb4d0959f65377aaab4a63ba33cc53f06.zip | |
staging: comedi: Makefile: conditionally compile multi-file core module
Instead of using the #ifdef'ery in the comedi_compat32.c and proc.c
files to include/exclude them from the comedi core, modify the Makefile
to include those files automatically when enabled in the .config.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/comedi/Makefile')
| -rw-r--r-- | drivers/staging/comedi/Makefile | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/drivers/staging/comedi/Makefile b/drivers/staging/comedi/Makefile index 8dbd306fef88..f895c0ccc3c8 100644 --- a/drivers/staging/comedi/Makefile +++ b/drivers/staging/comedi/Makefile @@ -1,11 +1,8 @@ -obj-$(CONFIG_COMEDI) += comedi.o +comedi-y := comedi_fops.o range.o drivers.o +comedi-$(CONFIG_PROC_FS) += proc.o +comedi-$(CONFIG_COMPAT) += comedi_compat32.o -obj-$(CONFIG_COMEDI) += kcomedilib/ -obj-$(CONFIG_COMEDI) += drivers/ +obj-$(CONFIG_COMEDI) += comedi.o -comedi-y := \ - comedi_fops.o \ - proc.o \ - range.o \ - drivers.o \ - comedi_compat32.o \ +obj-$(CONFIG_COMEDI) += kcomedilib/ +obj-$(CONFIG_COMEDI) += drivers/ |