From bcb240ecad679b736197fa539fcffec77dffda88 Mon Sep 17 00:00:00 2001
From: etisserant <etisserant>
Date: Fri, 23 Jun 2006 14:32:42 +0000
Subject: [PATCH] Updated configure and fixes in Makefiles.in for cygwin
 compiling.

---
 configure                                  | 2 +-
 drivers/can_lincan/Makefile.in             | 2 +-
 drivers/can_peak/Makefile.in               | 2 +-
 drivers/can_virtual/Makefile.in            | 2 +-
 drivers/ecos_lpc2138_sja1000/Makefile.in   | 4 ++--
 drivers/generic/Makefile.in                | 2 +-
 drivers/hcs12/Makefile.in                  | 4 ++--
 drivers/led_stdout/Makefile.in             | 2 +-
 drivers/timers_unix/Makefile.in            | 2 +-
 drivers/timers_xeno/Makefile.in            | 2 +-
 drivers/unix/Makefile.in                   | 2 +-
 examples/AppliMaster_HCS12/Makefile.in     | 4 ++--
 examples/AppliSlave_HCS12/Makefile.in      | 4 ++--
 examples/TestMasterSlave/Makefile.in       | 2 +-
 examples/TestMasterSlave/TestMasterSlave.c | 2 +-
 examples/gene_SYNC_HCS12/Makefile.in       | 4 ++--
 16 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/configure b/configure
index bd10242..667896f 100755
--- 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 e4e68ff..bf1b894 100644
--- 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 e4e68ff..bf1b894 100644
--- 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 89c7c45..12cfc5f 100644
--- 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 75fce19..8f0adb8 100644
--- 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 2da0254..c16cdb4 100644
--- 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 a1eb607..b35abe1 100644
--- 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 e75c946..da9a728 100644
--- 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 5b9b015..36d580b 100644
--- 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 d30e57e..36b473e 100644
--- 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 2da0254..c16cdb4 100644
--- 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 02b7f78..322e14e 100644
--- 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 9baffa2..f20fa3e 100644
--- 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 cc9082d..3458410 100644
--- 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 0dae896..79bf8da 100644
--- 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 e69970c..fac95b1 100644
--- 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
 
-- 
2.39.2