# HG changeset patch # User etisserant # Date 1151073162 -7200 # Node ID ddeeb217ed71df89f91f3c21e9afe0481e7c86d8 # Parent 3e94ee906bc6b27b080cf4e5433478296b88f90b Updated configure and fixes in Makefiles.in for cygwin compiling. diff -r 3e94ee906bc6 -r ddeeb217ed71 configure --- a/configure Wed Jun 21 08:31:34 2006 +0200 +++ b/configure Fri Jun 23 16:32:42 2006 +0200 @@ -445,7 +445,7 @@ 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 -r 3e94ee906bc6 -r ddeeb217ed71 drivers/can_lincan/Makefile.in --- a/drivers/can_lincan/Makefile.in Wed Jun 21 08:31:34 2006 +0200 +++ b/drivers/can_lincan/Makefile.in Fri Jun 23 16:32:42 2006 +0200 @@ -53,6 +53,6 @@ rm -f $(TARGET_HFILES) clean: - -\rm $(OBJS) + rm -f $(OBJS) mrproper: clean diff -r 3e94ee906bc6 -r ddeeb217ed71 drivers/can_peak/Makefile.in --- a/drivers/can_peak/Makefile.in Wed Jun 21 08:31:34 2006 +0200 +++ b/drivers/can_peak/Makefile.in Fri Jun 23 16:32:42 2006 +0200 @@ -53,6 +53,6 @@ rm -f $(TARGET_HFILES) clean: - -\rm $(OBJS) + rm -f $(OBJS) mrproper: clean diff -r 3e94ee906bc6 -r ddeeb217ed71 drivers/can_virtual/Makefile.in --- a/drivers/can_virtual/Makefile.in Wed Jun 21 08:31:34 2006 +0200 +++ b/drivers/can_virtual/Makefile.in Fri Jun 23 16:32:42 2006 +0200 @@ -58,6 +58,6 @@ rm -f $(TARGET_HFILES) clean: - -\rm $(OBJS) + rm $(OBJS) mrproper: clean diff -r 3e94ee906bc6 -r ddeeb217ed71 drivers/ecos_lpc2138_sja1000/Makefile.in --- a/drivers/ecos_lpc2138_sja1000/Makefile.in Wed Jun 21 08:31:34 2006 +0200 +++ b/drivers/ecos_lpc2138_sja1000/Makefile.in Fri Jun 23 16:32:42 2006 +0200 @@ -90,8 +90,8 @@ 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 -r 3e94ee906bc6 -r ddeeb217ed71 drivers/generic/Makefile.in --- a/drivers/generic/Makefile.in Wed Jun 21 08:31:34 2006 +0200 +++ b/drivers/generic/Makefile.in Fri Jun 23 16:32:42 2006 +0200 @@ -90,7 +90,7 @@ rm -f $(TARGET_HFILES) clean: - -\rm libcanfestival_$(TARGET).a + rm -f libcanfestival_$(TARGET).a mrproper: clean diff -r 3e94ee906bc6 -r ddeeb217ed71 drivers/hcs12/Makefile.in --- a/drivers/hcs12/Makefile.in Wed Jun 21 08:31:34 2006 +0200 +++ b/drivers/hcs12/Makefile.in Fri Jun 23 16:32:42 2006 +0200 @@ -72,8 +72,8 @@ 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 -r 3e94ee906bc6 -r ddeeb217ed71 drivers/led_stdout/Makefile.in --- a/drivers/led_stdout/Makefile.in Wed Jun 21 08:31:34 2006 +0200 +++ b/drivers/led_stdout/Makefile.in Fri Jun 23 16:32:42 2006 +0200 @@ -52,7 +52,7 @@ uninstall: clean: - -\rm $(OBJS) + rm -f $(OBJS) mrproper: clean diff -r 3e94ee906bc6 -r ddeeb217ed71 drivers/timers_unix/Makefile.in --- a/drivers/timers_unix/Makefile.in Wed Jun 21 08:31:34 2006 +0200 +++ b/drivers/timers_unix/Makefile.in Fri Jun 23 16:32:42 2006 +0200 @@ -57,7 +57,7 @@ rm -f $(TARGET_HFILES) clean: - -\rm $(OBJS) + rm -f $(OBJS) mrproper: clean diff -r 3e94ee906bc6 -r ddeeb217ed71 drivers/timers_xeno/Makefile.in --- a/drivers/timers_xeno/Makefile.in Wed Jun 21 08:31:34 2006 +0200 +++ b/drivers/timers_xeno/Makefile.in Fri Jun 23 16:32:42 2006 +0200 @@ -57,6 +57,6 @@ rm -f $(TARGET_HFILES) clean: - -\rm $(OBJS) + rm -f $(OBJS) mrproper: clean diff -r 3e94ee906bc6 -r ddeeb217ed71 drivers/unix/Makefile.in --- a/drivers/unix/Makefile.in Wed Jun 21 08:31:34 2006 +0200 +++ b/drivers/unix/Makefile.in Fri Jun 23 16:32:42 2006 +0200 @@ -90,7 +90,7 @@ rm -f $(TARGET_HFILES) clean: - -\rm libcanfestival_$(TARGET).a + rm -f libcanfestival_$(TARGET).a mrproper: clean diff -r 3e94ee906bc6 -r ddeeb217ed71 examples/AppliMaster_HCS12/Makefile.in --- a/examples/AppliMaster_HCS12/Makefile.in Wed Jun 21 08:31:34 2006 +0200 +++ b/examples/AppliMaster_HCS12/Makefile.in Fri Jun 23 16:32:42 2006 +0200 @@ -77,8 +77,8 @@ $(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 -r 3e94ee906bc6 -r ddeeb217ed71 examples/AppliSlave_HCS12/Makefile.in --- a/examples/AppliSlave_HCS12/Makefile.in Wed Jun 21 08:31:34 2006 +0200 +++ b/examples/AppliSlave_HCS12/Makefile.in Fri Jun 23 16:32:42 2006 +0200 @@ -77,8 +77,8 @@ $(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 -r 3e94ee906bc6 -r ddeeb217ed71 examples/TestMasterSlave/Makefile.in --- a/examples/TestMasterSlave/Makefile.in Wed Jun 21 08:31:34 2006 +0200 +++ b/examples/TestMasterSlave/Makefile.in Fri Jun 23 16:32:42 2006 +0200 @@ -51,7 +51,7 @@ 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 -r 3e94ee906bc6 -r ddeeb217ed71 examples/TestMasterSlave/TestMasterSlave.c --- a/examples/TestMasterSlave/TestMasterSlave.c Wed Jun 21 08:31:34 2006 +0200 +++ b/examples/TestMasterSlave/TestMasterSlave.c Fri Jun 23 16:32:42 2006 +0200 @@ -231,7 +231,7 @@ // 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 -r 3e94ee906bc6 -r ddeeb217ed71 examples/gene_SYNC_HCS12/Makefile.in --- a/examples/gene_SYNC_HCS12/Makefile.in Wed Jun 21 08:31:34 2006 +0200 +++ b/examples/gene_SYNC_HCS12/Makefile.in Fri Jun 23 16:32:42 2006 +0200 @@ -113,8 +113,8 @@ $(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