Merge branch 'master' into ecc_p256
authorNIIBE Yutaka <gniibe@fsij.org>
Wed, 13 Feb 2013 11:13:29 +0000 (20:13 +0900)
committerNIIBE Yutaka <gniibe@fsij.org>
Wed, 13 Feb 2013 11:13:29 +0000 (20:13 +0900)
1  2 
src/Makefile.in

diff --cc src/Makefile.in
@@@ -84,14 -79,11 +79,12 @@@ CSRC = $(PORTSRC) 
         $(BOARD_DIR)/board.c \
         $(CHIBIOS)/os/various/evtimer.c \
         $(CHIBIOS)/os/various/syscalls.c \
-        $(STMUSBSRC) \
-        $(VCOMSRC) \
         $(CRYPTSRC) \
         main.c usb_lld.c \
-       usb_desc.c usb_prop.c \
-       usb-icc.c openpgp.c ac.c openpgp-do.c flash.c hardclock.c \
-       random.c neug.c bn.c modp256.c jpc.c mod.c ec_p256.c
+       usb_desc.c usb_ctrl.c \
+       usb-icc.c openpgp.c ac.c openpgp-do.c flash.c \
++      bn.c modp256.c jpc.c mod.c ec_p256.c \
+       random.c neug.c sys.c
  
  ifneq ($(ENABLE_DEBUG),)
  CSRC += debug.c