Mercurial Mercurial > canfestival / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | bz2 | zip | gz | help
Updated configure and fixes in Makefiles.in for cygwin compiling. Root_BRANCH_3_0_RC2
authoretisserant
Fri, 23 Jun 2006 16:32:42 +0200
changeset 40 ddeeb217ed71
parent 39 3e94ee906bc6
child 41 e70439f50539
Updated configure and fixes in Makefiles.in for cygwin compiling.
configure file | annotate | diff | comparison | revisions
drivers/can_lincan/Makefile.in file | annotate | diff | comparison | revisions
drivers/can_peak/Makefile.in file | annotate | diff | comparison | revisions
drivers/can_virtual/Makefile.in file | annotate | diff | comparison | revisions
drivers/ecos_lpc2138_sja1000/Makefile.in file | annotate | diff | comparison | revisions
drivers/generic/Makefile.in file | annotate | diff | comparison | revisions
drivers/hcs12/Makefile.in file | annotate | diff | comparison | revisions
drivers/led_stdout/Makefile.in file | annotate | diff | comparison | revisions
drivers/timers_unix/Makefile.in file | annotate | diff | comparison | revisions
drivers/timers_xeno/Makefile.in file | annotate | diff | comparison | revisions
drivers/unix/Makefile.in file | annotate | diff | comparison | revisions
examples/AppliMaster_HCS12/Makefile.in file | annotate | diff | comparison | revisions
examples/AppliSlave_HCS12/Makefile.in file | annotate | diff | comparison | revisions
examples/TestMasterSlave/Makefile.in file | annotate | diff | comparison | revisions
examples/TestMasterSlave/TestMasterSlave.c file | annotate | diff | comparison | revisions
examples/gene_SYNC_HCS12/Makefile.in file | annotate | diff | comparison | revisions 
--- 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
--- 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
--- 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
--- 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
--- 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 
 
--- 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
 
--- 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
 
--- 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
 
--- 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
 
--- 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
--- 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
 
--- 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
 
--- 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
 
--- 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 $<
--- 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;
 	
--- 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
canfestival