Updated configure and fixes in Makefiles.in for cygwin compiling.

diff --git a/configure b/configure
index bd10242dfb4a01d936eef0435b579ef2d5ad48e5..667896f2f49714ade296a65a9ac2473fd9c52e66 100755 (executable)
--- a/configure
+++ b/configure
@@ -445,7 +445,7 @@ if [ "$SUB_CAN_DRIVER" = "peak_win32" ]; then
        if [ "PCAN_HEADER" = "" -o "PCAN_LIB" = "" ]; then
                echo "!!! ERROR !!! Please set PCAN_LIB PCAN_HEADER [PCAN_INCLUDE] to appropriate paths ! "
        fi
-       SUB_EXE_CFLAGS=$SUB_EXE_CFLAGS\ \'$PCAN_LIB\'
+       SUB_EXE_CFLAGS=$SUB_EXE_CFLAGS\ -liberty\ \'$PCAN_LIB\'
        if [ "$PCAN_INCLUDE" != "" ]; then
                SUB_PROG_CFLAGS=$SUB_PROG_CFLAGS\ -I$PCAN_INCLUDE
        fi

diff --git a/drivers/can_lincan/Makefile.in b/drivers/can_lincan/Makefile.in
index e4e68ff60f819491a17697c590030ab310828fec..bf1b894e60ef3fabaa1499e0b21c6e9cbe44138a 100644 (file)
--- a/drivers/can_lincan/Makefile.in
+++ b/drivers/can_lincan/Makefile.in
@@ -53,6 +53,6 @@ uninstall:
        rm -f $(TARGET_HFILES)
 
 clean:
-       -\rm $(OBJS)
+       rm -f $(OBJS)
 
 mrproper: clean

diff --git a/drivers/can_peak/Makefile.in b/drivers/can_peak/Makefile.in
index e4e68ff60f819491a17697c590030ab310828fec..bf1b894e60ef3fabaa1499e0b21c6e9cbe44138a 100644 (file)
--- a/drivers/can_peak/Makefile.in
+++ b/drivers/can_peak/Makefile.in
@@ -53,6 +53,6 @@ uninstall:
        rm -f $(TARGET_HFILES)
 
 clean:
-       -\rm $(OBJS)
+       rm -f $(OBJS)
 
 mrproper: clean

diff --git a/drivers/can_virtual/Makefile.in b/drivers/can_virtual/Makefile.in
index 89c7c4521f76e2e5039b55e963d04916a68ac6c7..12cfc5ff27b0337ae041a235a5af3e6b10d2729c 100644 (file)
--- a/drivers/can_virtual/Makefile.in
+++ b/drivers/can_virtual/Makefile.in
@@ -58,6 +58,6 @@ uninstall:
        rm -f $(TARGET_HFILES)
 
 clean:
-       -\rm $(OBJS)
+       rm $(OBJS)
 
 mrproper: clean

diff --git a/drivers/ecos_lpc2138_sja1000/Makefile.in b/drivers/ecos_lpc2138_sja1000/Makefile.in
index 75fce19dc0488c00e8dfb6f72890caed90803306..8f0adb8351962ee0eec487d35c0b24cb83d4b6d9 100644 (file)
--- a/drivers/ecos_lpc2138_sja1000/Makefile.in
+++ b/drivers/ecos_lpc2138_sja1000/Makefile.in
@@ -90,8 +90,8 @@ uninstall:
        rm -f ../../examples/ecos_lpc2138_sja1000/lib/driver
 
 clean:
-       -\rm -f $(OBJS) build_baudrate baudrate_table.h 
+       rm -f $(OBJS) build_baudrate baudrate_table.h 
 
 mrproper: clean
-       -\rm ../../lib/ecos_lpc2138_sja1000/libcandriver.a 
+       rm -f ../../lib/ecos_lpc2138_sja1000/libcandriver.a 
 

diff --git a/drivers/generic/Makefile.in b/drivers/generic/Makefile.in
index 2da02544a5060ed9552239935fae858b8a772e64..c16cdb4525e36f4be195fb8d5edf8b6612003e25 100644 (file)
--- a/drivers/generic/Makefile.in
+++ b/drivers/generic/Makefile.in
@@ -90,7 +90,7 @@ uninstall:
        rm -f $(TARGET_HFILES)
 
 clean:
-       -\rm libcanfestival_$(TARGET).a
+       rm -f libcanfestival_$(TARGET).a
 
 mrproper: clean
 

diff --git a/drivers/hcs12/Makefile.in b/drivers/hcs12/Makefile.in
index a1eb607f91199e05600b475f619bb66a8cf68ec6..b35abe19d439e16bf56c76ddc28344b6eda89f60 100644 (file)
--- a/drivers/hcs12/Makefile.in
+++ b/drivers/hcs12/Makefile.in
@@ -72,8 +72,8 @@ uninstall:
        rm -f ../../lib/hc12/libcandriver.a
 
 clean:
-       -\rm $(OBJS)
+       rm -f $(OBJS)
 
 mrproper: clean
-       -\rm ../../lib/hc12/libcandriver.a
+       rm -f ../../lib/hc12/libcandriver.a
 

diff --git a/drivers/led_stdout/Makefile.in b/drivers/led_stdout/Makefile.in
index e75c946118623642c626d2a07787ef33813f436c..da9a72877c82b7f659ddd2aa48b2b07fb8973a2f 100644 (file)
--- a/drivers/led_stdout/Makefile.in
+++ b/drivers/led_stdout/Makefile.in
@@ -52,7 +52,7 @@ install:
 uninstall:
 
 clean:
-       -\rm $(OBJS)
+       rm -f $(OBJS)
 
 mrproper: clean
 

diff --git a/drivers/timers_unix/Makefile.in b/drivers/timers_unix/Makefile.in
index 5b9b015ca50acbdf7e7997351c2cd0f00b0f9b03..36d580b0a050abb955100bbd2da8097e1227c461 100644 (file)
--- a/drivers/timers_unix/Makefile.in
+++ b/drivers/timers_unix/Makefile.in
@@ -57,7 +57,7 @@ uninstall:
        rm -f $(TARGET_HFILES)
 
 clean:
-       -\rm $(OBJS)
+       rm -f $(OBJS)
 
 mrproper: clean
 

diff --git a/drivers/timers_xeno/Makefile.in b/drivers/timers_xeno/Makefile.in
index d30e57edcc24312502f1b0e292d30e14a0c972b1..36b473eb1b238026173282c6c8638890c99f993a 100644 (file)
--- a/drivers/timers_xeno/Makefile.in
+++ b/drivers/timers_xeno/Makefile.in
@@ -57,6 +57,6 @@ uninstall:
        rm -f $(TARGET_HFILES)
 
 clean:
-       -\rm $(OBJS)
+       rm -f $(OBJS)
 
 mrproper: clean

diff --git a/drivers/unix/Makefile.in b/drivers/unix/Makefile.in
index 2da02544a5060ed9552239935fae858b8a772e64..c16cdb4525e36f4be195fb8d5edf8b6612003e25 100644 (file)
--- a/drivers/unix/Makefile.in
+++ b/drivers/unix/Makefile.in
@@ -90,7 +90,7 @@ uninstall:
        rm -f $(TARGET_HFILES)
 
 clean:
-       -\rm libcanfestival_$(TARGET).a
+       rm -f libcanfestival_$(TARGET).a
 
 mrproper: clean
 

diff --git a/examples/AppliMaster_HCS12/Makefile.in b/examples/AppliMaster_HCS12/Makefile.in
index 02b7f78a4a458039985afa66d2aa728d29865443..322e14ebdf11e8d1a6332b550297e121fcbe05c0 100644 (file)
--- a/examples/AppliMaster_HCS12/Makefile.in
+++ b/examples/AppliMaster_HCS12/Makefile.in
@@ -77,8 +77,8 @@ MSG:
        $(BINUTILS_PREFIX)size $(PGR).elf
 
 clean:
-       -\rm $(MASTER_OBJS)
+       rm -f $(MASTER_OBJS)
 
 mrproper: clean
-       -\rm $(PGR).elf $(PGR).s19 $(PGR).b $(PGR).s
+       rm -f $(PGR).elf $(PGR).s19 $(PGR).b $(PGR).s
 

diff --git a/examples/AppliSlave_HCS12/Makefile.in b/examples/AppliSlave_HCS12/Makefile.in
index 9baffa2600e5e5d5d5701e642f899af4fe9ed33d..f20fa3eccaa23464ff676d262bbd50ae65a4e9e2 100644 (file)
--- a/examples/AppliSlave_HCS12/Makefile.in
+++ b/examples/AppliSlave_HCS12/Makefile.in
@@ -77,8 +77,8 @@ MSG:
        $(BINUTILS_PREFIX)size $(PGR).elf
 
 clean:
-       -\rm $(SLAVE_OBJS)
+       rm -f $(SLAVE_OBJS)
 
 mrproper: clean
-       -\rm $(PGR).elf $(PGR).s19 $(PGR).b $(PGR).s
+       rm -f $(PGR).elf $(PGR).s19 $(PGR).b $(PGR).s
 

diff --git a/examples/TestMasterSlave/Makefile.in b/examples/TestMasterSlave/Makefile.in
index cc9082d68d65629f4b936be21f005ee8b1af6d3e..345841039b563765de5005a64ede09dcb4e68ad3 100644 (file)
--- a/examples/TestMasterSlave/Makefile.in
+++ b/examples/TestMasterSlave/Makefile.in
@@ -51,7 +51,7 @@ all: TestMasterSlave
 
 
 TestMasterSlave: $(OBJS)
-       $(CC) $(CFLAGS) $(PROG_CFLAGS) $(EXE_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ $(OBJS)
+       $(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ $(OBJS) $(EXE_CFLAGS)
 
 %o: %c
        $(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $<

diff --git a/examples/TestMasterSlave/TestMasterSlave.c b/examples/TestMasterSlave/TestMasterSlave.c
index 0dae896b1e444ec794a9740e101416d73be0512e..79bf8da476dcd492085cbd57d8809a0917bc2914 100644 (file)
--- a/examples/TestMasterSlave/TestMasterSlave.c
+++ b/examples/TestMasterSlave/TestMasterSlave.c
@@ -231,7 +231,7 @@ int main(int argc,char **argv)
        // Open CAN devices
        if(SlaveBoard.baudrate)
                if((SlaveCanHandle = canOpen(&SlaveBoard))==NULL) goto fail_slave;
-               
+
        if(MasterBoard.baudrate)
                if((MasterCanHandle = canOpen(&MasterBoard))==NULL) goto fail_master;
        

diff --git a/examples/gene_SYNC_HCS12/Makefile.in b/examples/gene_SYNC_HCS12/Makefile.in
index e69970c7054ef728e32cfcf1d531261696d042a4..fac95b15da174e3208da6e448e6d0c4405958483 100644 (file)
--- a/examples/gene_SYNC_HCS12/Makefile.in
+++ b/examples/gene_SYNC_HCS12/Makefile.in
@@ -113,8 +113,8 @@ MSG:
        $(BINUTILS_PREFIX)size $(PGR).elf
 
 clean:
-       -\rm $(SYNC_OBJS)
+       rm -f $(SYNC_OBJS)
 
 mrproper: clean
-       -\rm $(PGR).elf $(PGR).s19 $(PGR).b $(PGR).s
+       rm -f $(PGR).elf $(PGR).s19 $(PGR).b $(PGR).s