From 506761d823b41a426f3df7bacf8d0238ebad24dc Mon Sep 17 00:00:00 2001
From: NIIBE Yutaka <gniibe@fsij.org>
Date: Fri, 29 Jun 2012 13:45:37 +0900
Subject: [PATCH] regnual cleanup

---
 .gitignore       | 3 ---
 ChangeLog        | 4 ++++
 regnual/Makefile | 8 +++-----
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index e912801..aac6cef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,9 +11,6 @@ src/gnuk.elf
 src/gnuk.hex
 src/gnuk.map
 src/*.inc
-regnual/sys.h
 regnual/regnual.bin
 regnual/regnual.hex
 regnual/regnual.elf
-regnual/usb_lld.c
-regnual/usb_lld.h
diff --git a/ChangeLog b/ChangeLog
index efa2412..44b4d81 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-06-29  Niibe Yutaka  <gniibe@fsij.org>
+
+	* regnual/Makefile: Don't copy usb_lld.c.
+
 2012-06-28  Niibe Yutaka  <gniibe@fsij.org>
 
 	* test/features/204_decryption.feature: New.
diff --git a/regnual/Makefile b/regnual/Makefile
index 5e0036e..154877b 100644
--- a/regnual/Makefile
+++ b/regnual/Makefile
@@ -2,7 +2,6 @@
 
 PROJECT = regnual
 
-SRCS = regnual.c usb_lld.c sys.c
 OBJS = regnual.o usb_lld.o sys.o
 LDSCRIPT= regnual.ld
 
@@ -23,7 +22,7 @@ MCFLAGS= -mcpu=$(MCU) -mfix-cortex-m3-ldrd
 DEFS = -DFREE_STANDING
 
 CFLAGS = -O2 -g
-CFLAGS += $(CWARN) -I ../src -fno-common $(MCFLAGS) $(TOPT) $(DEFS)
+CFLAGS += $(CWARN) -I . -I ../src -fno-common $(MCFLAGS) $(TOPT) $(DEFS)
 
 LDFLAGS = -T$(LDSCRIPT) -nostartfiles $(MCFLAGS) $(TOPT)
 
@@ -38,8 +37,8 @@ regnual.hex: regnual.elf
 	$(OBJCOPY) -Obinary regnual.elf regnual.bin
 	$(OBJCOPY) -Oihex regnual.elf regnual.hex
 
-usb_lld.c: ../src/usb_lld.c
-	cp -p ../src/usb_lld.c .
+usb_lld.o: ../src/usb_lld.c
+	$(CC) $(CFLAGS) -c -o usb_lld.o ../src/usb_lld.c
 
 regnual.elf: $(OBJS) $(LDSCRIPT)
 	$(CC) $(LDFLAGS) -o regnual.elf $(OBJS)
@@ -48,4 +47,3 @@ clean:
 	-rm -f $(OBJS) regnual.elf regnual.hex regnual.bin
 
 distclean: clean
-	-rm -f usb_lld.c