make: ignore warnings until we fix it (new buildtools released by fujitsu)

make: copy *.py instead *.pcy
make: fromdos fix for ubuntu 10.04 LTS

diff --git a/Makefile b/Makefile
index df38e59b04f7d364a9428bc6e78d5fd2bc45c3c6..1d5095b4f3fd08124299b086664c6d895e9722c1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -6,17 +6,17 @@ all:
 #install: all #this just work when $FUJDEV is set for root too, eh?
 install:
        sed -e 's/%PREFIX%/\$(PREFIX)/g' frprog.py | sed -e 's/%VERSION%/$(shell git describe --abbrev=6)/g'> $(PREFIX)/bin/frprog
-       cp SerialPort_linux.pyc $(PREFIX)/bin/SerialPort_linux.pyc
+       cp SerialPort_linux.py $(PREFIX)/bin/SerialPort_linux.py
        mkdir -p $(PREFIX)/share/frprog/
        cp pkernel/pkernel.mhx $(PREFIX)/share/frprog/pkernel.mhx
        chmod a+rx $(PREFIX)/bin/frprog
-       chmod a+r $(PREFIX)/bin/SerialPort_linux.pyc
+       chmod a+r $(PREFIX)/bin/SerialPort_linux.py
        chmod a+r $(PREFIX)/share/frprog/pkernel.mhx
 
 uninstall:
        rm -R $(PREFIX)/share/frprog
        rm $(PREFIX)/bin/frprog
-       rm $(PREFIX)/bin/SerialPort_linux.pyc
+       rm $(PREFIX)/bin/SerialPort_linux.py
 
 pylint: frprog.py
        pylint --indent-string="\t" $<

diff --git a/pkernel/Makefile b/pkernel/Makefile
index ff044d80e7eb703548ef8c2ecbbce798aee3ddf2..66e4598ce5e3f02123a9a0cc6b92c57872cbbdbc 100644 (file)
--- a/pkernel/Makefile
+++ b/pkernel/Makefile
@@ -19,7 +19,7 @@ CPUT = -cpu MB91F465X
 CFLAGS = -w 1 -O 4 -B -K SPEED -K LONGADDRESS
 CFLAGS += -K SCHEDULE -K A1 -K SARG -Xdof
 CFLAGS += -K EOPT -K LIB -K UNROLL -Xalign
-CFLAGS += -c -cwno $(CPUT)
+CFLAGS += -c -Xcwno $(CPUT)
 
 ASFLAGS = -w 2 -O 0 -linf ON -lsrc ON -lsec ON
 ASFLAGS += -lcros OFF -linc ON -lexp OBJ -pl 60
@@ -55,6 +55,12 @@ LD = $(PREFIX)flnk911s
 LIBR = $(PREFIX)flibs
 CONV = $(PREFIX)f2ms
 
+ifneq ($(shell which dos2unix),)
+D2U = dos2unix
+else
+D2U = fromdos
+endif
+
 all: $(TARGET_MHX)
 
 upload: $(TARGET_MHX)
@@ -72,7 +78,7 @@ $(TARGET): $(OBJS)
        @echo "  COMPILE   $<"
        @mkdir -p $(DEPDIR)
        @echo -n "$@: " > $(DEPDIR)/$<.d
-       @$(CC) -H $(CPUT) $< | dos2unix | paste -s -d " " >> $(DEPDIR)/$<.d
+       @$(CC) -H $(CPUT) $< | $(D2U) | paste -s -d " " >> $(DEPDIR)/$<.d
        @$(CC) $(CFLAGS) $(DEFINES) $< -o $@
 
 %.obj: %.asm