summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2008-12-19 19:07:37 -0800
committerKeith Packard <keithp@keithp.com>2008-12-19 19:07:37 -0800
commitcc8db276bc4f2fd7eb00168a5c0689a8457a5c6f (patch)
tree097a136640ae4168c4dfda1966e24865526e4eaa
parent82e2d7ebed6682062dc400478c736bd6c91195c9 (diff)
Move blink example to subdir
Signed-off-by: Keith Packard <keithp@keithp.com>
-rw-r--r--Makefile6
-rw-r--r--blink/Makefile (renamed from Makefile.blink)9
-rw-r--r--blink/blink.c (renamed from blink.c)0
3 files changed, 7 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index 10cd8888..9603dc22 100644
--- a/Makefile
+++ b/Makefile
@@ -29,9 +29,9 @@ $(PROG): $(OBJS)
clean:
rm -f $(PROG) $(OBJS)
- +make -f Makefile.blink clean
+ +make -C blink clean
$(OBJS): $(INCS)
-blinks: blink.c Makefile.blink
- +make -f Makefile.blink
+blinks:
+ +make -C blink
diff --git a/Makefile.blink b/blink/Makefile
index 9cda7805..1f18f529 100644
--- a/Makefile.blink
+++ b/blink/Makefile
@@ -5,8 +5,7 @@ DEBUG=--debug
CFLAGS=--model-large $(DEBUG) --less-pedantic \
--no-peep --int-long-reent --float-reent \
- --no-pack-iram \
- --data-loc 0x30 \
+ --data-loc 0x30
LDFLAGS=-L/usr/share/sdcc/lib/large --out-fmt-ihx
LDFLAGS_RAM=$(LDFLAGS) --code-loc 0xf000 --xram-loc 0xf400 --xram-size 1024
@@ -34,12 +33,12 @@ PAOM=$(PROGS:.ihx=)
all: $(PROGS)
-blink-ram.ihx: $(REL) Makefile.blink
+blink-ram.ihx: $(REL) Makefile
$(CC) $(LDFLAGS_RAM) $(CFLAGS) -o blink-ram.ihx $(REL)
-
-blink-flash.ihx: $(REL) Makefile.blink
$(CC) $(LDFLAGS_FLASH) $(CFLAGS) -o blink-flash.ihx $(REL)
+blink-flash.ihx: blink-ram.ihx
+
clean:
rm -f $(ADB) $(ASM) $(LNK) $(LST) $(REL) $(RST) $(SYM)
rm -f $(PROGS) $(PCDB) $(PLNK) $(PMAP) $(PMEM) $(PAOM)
diff --git a/blink.c b/blink/blink.c
index 907c82b8..907c82b8 100644
--- a/blink.c
+++ b/blink/blink.c