On Wed, Aug 20, 2008 at 02:41:26PM +0200, Stefan Roese wrote:
This "||" doesn't seem to work. So I created 2 lines, one for each config option. Not sure if this really can be combined into one line in the Makefile but this approach seems clearer to me. And it works.
Won't you get duplicate symbols if both 1307 and 1338 are enabled?
diff --git a/drivers/rtc/Makefile b/drivers/rtc/Makefile index 2af3ee5..0c048c5 100644 --- a/drivers/rtc/Makefile +++ b/drivers/rtc/Makefile @@ -32,8 +32,9 @@ COBJS-y += date.o COBJS-$(CONFIG_RTC_DS12887) += ds12887.o COBJS-$(CONFIG_RTC_DS1302) += ds1302.o COBJS-$(CONFIG_RTC_DS1306) += ds1306.o -COBJS-$(CONFIG_RTC_DS1307 || CONFIG_RTC_DS1338) += ds1307.o +COBJS-$(CONFIG_RTC_DS1307) += ds1307.o COBJS-$(CONFIG_RTC_DS1337) += ds1337.o +COBJS-$(CONFIG_RTC_DS1338) += ds1307.o
You could do this: COBJS-$(CONFIG_RTC_DS1307)$(CONFIG_RTC_DS1338) += ds1307.o COBJS-y += $(COBJS-yy)
-Scott