* 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 2505279077f9f0fcb3e74e0e30c29fd33b45c43d..dc2d8322a0d09c5c8b5ac31dbeb060f5375823b8 100644 (file)
--- 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 fbd635b6344db8cbf4efcb56467ddf8df8253b4c..78d95d408f596db5a9e1ff149c9c61834d7f5c0d 100644 (file)
--- 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 1df65adfe745bf50e9444633bf2e35f3282138ed..e2be970ccba9e1271a59d9688d7ec500d35df227 100644 (file)
--- 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 af72030743ea0d9fbf0465570d3f227e9db7a7f2..9a8345b32645abb5cc6a746eba56a5cf698f7032 100644 (file)
--- 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