X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/ad1d46af5c8562e90a3f8564cf511213ff1f1745..2ddc142b196858f6025508f31dd0ce693d0f5c02:/embedded/app/usbcan/Makefile.omk

diff --git a/embedded/app/usbcan/Makefile.omk b/embedded/app/usbcan/Makefile.omk
index 588f007..0beeb96 100644
--- a/embedded/app/usbcan/Makefile.omk
+++ b/embedded/app/usbcan/Makefile.omk
@@ -11,6 +11,9 @@ ifeq ($(CONFIG_APP_USBCAN),y)
 default_CONFIG += MACH=$(MACH)
 #default_CONFIG += ULAN_ID=$(ULAN_ID)
 default_CONFIG += CONFIG_MISC_VECT=x
+default_CONFIG += CONFIG_OC_LINCAN_CARD_ul_usb1=x
+default_CONFIG += CONFIG_OC_LINCAN_CARD_can_lmc1=x
+
 
 LOCAL_CONFIG_H = local_config.h
 
@@ -19,16 +22,24 @@ INCLUDES += -I.
 #include_HEADERS  = ul_idstr.h
 
 bin_PROGRAMS = usbcan
-usbcan_SOURCES = main.c can_queue.c sja1000p.c  devcommon.c setup.c finish.c usb_vend.c can_quesysless.c lpc17xx_can.c
-#usbcan_SOURCES += can_lpcbusemu.c ul_usb1.c
+usbcan_SOURCES = main.c can_queue.c sja1000p.c  devcommon.c setup.c finish.c
+usbcan_SOURCES += usb_vend.c can_quesysless.c sysdep_sysless.c
+ifeq ($(CONFIG_OC_LINCAN_CARD_can_lmc1),y)
+usbcan_SOURCES += lpc17xx_can.c
+endif
+ifeq ($(CONFIG_OC_LINCAN_CARD_ul_usb1),y)
+usbcan_SOURCES += can_lpcbusemu.c ul_usb1.c
+endif
 
 #usbtest_SOURCES +=  ul_idstr.c
 #lib_LOADLIBES =  bspbase ul_drv lpciap keyval lpciap_kvpb mach_hal uldy
 lib_LOADLIBES =  bspbase usbbase usbmore lpcusb mach_hal
 usbcan_MOREOBJS = $(USER_LIB_DIR)/system_stub.o
-# $(USER_LIB_DIR)/ivt.o
 nobase_include_HEADERS = usb/usb_defs.h
 
+ifeq ($(MACH),lpc21xx)
 link_VARIANTS = app boot
+usbcan_MOREOBJS += $(USER_LIB_DIR)/ivt.o
+endif
 
 endif #CONFIG_ULBOOT