From: borutr <borutr@4a8a32a2-be11-0410-ad9d-d568d2c75423>
Date: Mon, 2 Feb 2009 16:01:02 +0000 (+0000)
Subject: * device/lib/gbz80/Makefile.in, device/lib/hc08/Makefile.in,
X-Git-Url: https://git.gag.com/?p=fw%2Fsdcc;a=commitdiff_plain;h=43a9f56ae641cae90edd199d25b234df463b2ff5

* device/lib/gbz80/Makefile.in, device/lib/hc08/Makefile.in,
  device/lib/z80/Makefile.in:
  chose source files in the PORT directory if they are available

git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@5353 4a8a32a2-be11-0410-ad9d-d568d2c75423
---

diff --git a/ChangeLog b/ChangeLog
index 25052790..dc2d8322 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-02-02 Borut Razem <borut.razem AT siol.net>
+
+	* device/lib/gbz80/Makefile.in, device/lib/hc08/Makefile.in,
+	  device/lib/z80/Makefile.in:
+	  chose source files in the PORT directory if they are available
+
 2008-02-01 Raphael Neider <rneider AT web.de>
 
 	* device/lib/pic16/libdev/pic18f1220.c,
diff --git a/device/lib/gbz80/Makefile.in b/device/lib/gbz80/Makefile.in
index fbd635b6..78d95d40 100644
--- a/device/lib/gbz80/Makefile.in
+++ b/device/lib/gbz80/Makefile.in
@@ -57,10 +57,10 @@ else
 	cp $(OBJ) $(Z8OBJECTS) $(PORTDIR)
 endif
 
-%.o: ../%.c
+%.o: %.c
 	$(CC) $(CFLAGS) -c $<
 
-%.o: %.c
+%.o: ../%.c
 	$(CC) $(CFLAGS) -c $<
 
 clean:
diff --git a/device/lib/hc08/Makefile.in b/device/lib/hc08/Makefile.in
index 1df65adf..e2be970c 100644
--- a/device/lib/hc08/Makefile.in
+++ b/device/lib/hc08/Makefile.in
@@ -64,14 +64,11 @@ else
 	cp $(OBJ) $(HC08OBJECTS) $(PORTDIR)
 endif
 
-%.rel: ../%.c
-	$(CC) $(CFLAGS) -c $<
-
 %.rel: %.c
 	$(CC) $(CFLAGS) -c $<
 
-%.rel: %.asm
-	$(AS) $(ASFLAGS) $@ $<
+%.rel: ../%.c
+	$(CC) $(CFLAGS) -c $<
 
 clean:
 	rm -f *.rel *.sym *.lst *~ $(CLEANSPEC) *.dump* *.asm *.lib
diff --git a/device/lib/z80/Makefile.in b/device/lib/z80/Makefile.in
index af720307..9a8345b3 100644
--- a/device/lib/z80/Makefile.in
+++ b/device/lib/z80/Makefile.in
@@ -62,15 +62,15 @@ else
 	cp $(OBJ) $(Z8OBJECTS) $(PORTDIR)
 endif
 
-%.o: ../%.c
-	$(CC) $(CFLAGS) -c $<
-
 %.o: %.c
 	$(CC) $(CFLAGS) -c $<
 
 %.o: %.s
 	$(AS) $(ASFLAGS) $@ $<
 
+%.o: ../%.c
+	$(CC) $(CFLAGS) -c $<
+
 clean:
 	rm -f *.o *.sym *.lst *~ $(CLEANSPEC) *.dump* *.asm *.lib