# HG changeset patch # User Christian Taedcke # Date 1296222678 -3600 # Node ID 7758d60e92606d5ee4871fbe72421ffaab5bdc04 # Parent c0e68a63f600f6883abe90f7b6aaadd46b9022de FIXED: - changed make targets from "%o: %c" to "%.o: %.c" (Patch from irc ) find . -name 'Make*' | xargs perl -w -i.bak -p -e "s/\%o: \%c/%.o: %.c/g" diff -r c0e68a63f600 -r 7758d60e9260 drivers/can_anagate_linux/Makefile --- a/drivers/can_anagate_linux/Makefile Fri Jan 28 14:51:18 2011 +0100 +++ b/drivers/can_anagate_linux/Makefile Fri Jan 28 14:51:18 2011 +0100 @@ -49,7 +49,7 @@ driver: $(DRIVER) -%o: %c +%.o: %.c $(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $< libcanfestival_$(CAN_DRIVER).so: $(OBJS) diff -r c0e68a63f600 -r 7758d60e9260 drivers/can_anagate_linux/Makefile.in --- a/drivers/can_anagate_linux/Makefile.in Fri Jan 28 14:51:18 2011 +0100 +++ b/drivers/can_anagate_linux/Makefile.in Fri Jan 28 14:51:18 2011 +0100 @@ -49,7 +49,7 @@ driver: $(DRIVER) -%o: %c +%.o: %.c $(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $< libcanfestival_$(CAN_DRIVER).so: $(OBJS) diff -r c0e68a63f600 -r 7758d60e9260 drivers/can_anagate_win32/Makefile.in --- a/drivers/can_anagate_win32/Makefile.in Fri Jan 28 14:51:18 2011 +0100 +++ b/drivers/can_anagate_win32/Makefile.in Fri Jan 28 14:51:18 2011 +0100 @@ -53,10 +53,10 @@ driver: $(DRIVER) -%o: %c +%.o: %.c $(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $< -%o: %cpp +%.o: %.cpp $(CXX) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $< $(DRIVER): $(OBJS) diff -r c0e68a63f600 -r 7758d60e9260 drivers/can_can4linux/Makefile.in --- a/drivers/can_can4linux/Makefile.in Fri Jan 28 14:51:18 2011 +0100 +++ b/drivers/can_can4linux/Makefile.in Fri Jan 28 14:51:18 2011 +0100 @@ -48,7 +48,7 @@ driver: $(DRIVER) -%o: %c +%.o: %.c $(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $< libcanfestival_$(CAN_DRIVER).so: $(OBJS) diff -r c0e68a63f600 -r 7758d60e9260 drivers/can_copcican_linux/Makefile.in --- a/drivers/can_copcican_linux/Makefile.in Fri Jan 28 14:51:18 2011 +0100 +++ b/drivers/can_copcican_linux/Makefile.in Fri Jan 28 14:51:18 2011 +0100 @@ -51,7 +51,7 @@ driver: $(DRIVER) -%o: %c +%.o: %.c $(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $< libcanfestival_$(CAN_DRIVER).so: $(OBJS) diff -r c0e68a63f600 -r 7758d60e9260 drivers/can_kvaser/Makefile.in --- a/drivers/can_kvaser/Makefile.in Fri Jan 28 14:51:18 2011 +0100 +++ b/drivers/can_kvaser/Makefile.in Fri Jan 28 14:51:18 2011 +0100 @@ -58,7 +58,7 @@ driver: $(DRIVER) -%o: %c +%.o: %.c $(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $< $(DRIVER): $(OBJS) diff -r c0e68a63f600 -r 7758d60e9260 drivers/can_lincan/Makefile.in --- a/drivers/can_lincan/Makefile.in Fri Jan 28 14:51:18 2011 +0100 +++ b/drivers/can_lincan/Makefile.in Fri Jan 28 14:51:18 2011 +0100 @@ -48,7 +48,7 @@ driver: $(DRIVER) -%o: %c +%.o: %.c $(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $< libcanfestival_$(CAN_DRIVER).so: $(OBJS) diff -r c0e68a63f600 -r 7758d60e9260 drivers/can_peak_linux/Makefile.in --- a/drivers/can_peak_linux/Makefile.in Fri Jan 28 14:51:18 2011 +0100 +++ b/drivers/can_peak_linux/Makefile.in Fri Jan 28 14:51:18 2011 +0100 @@ -49,7 +49,7 @@ driver: $(DRIVER) -%o: %c +%.o: %.c $(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $< libcanfestival_$(CAN_DRIVER).so: $(OBJS) diff -r c0e68a63f600 -r 7758d60e9260 drivers/can_peak_win32/Makefile.in --- a/drivers/can_peak_win32/Makefile.in Fri Jan 28 14:51:18 2011 +0100 +++ b/drivers/can_peak_win32/Makefile.in Fri Jan 28 14:51:18 2011 +0100 @@ -51,7 +51,7 @@ driver: $(DRIVER) -%o: %c cancfg.h +%.o: %.c cancfg.h $(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $< cyg$(CAN_DRIVER).dll: $(OBJS) diff -r c0e68a63f600 -r 7758d60e9260 drivers/can_serial/Makefile.in --- a/drivers/can_serial/Makefile.in Fri Jan 28 14:51:18 2011 +0100 +++ b/drivers/can_serial/Makefile.in Fri Jan 28 14:51:18 2011 +0100 @@ -56,7 +56,7 @@ driver: $(DRIVER) $(HUB) -%o: %c +%.o: %.c $(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $< libcanfestival_$(CAN_DRIVER).so: $(OBJS) diff -r c0e68a63f600 -r 7758d60e9260 drivers/can_socket/Makefile.in --- a/drivers/can_socket/Makefile.in Fri Jan 28 14:51:18 2011 +0100 +++ b/drivers/can_socket/Makefile.in Fri Jan 28 14:51:18 2011 +0100 @@ -49,7 +49,7 @@ driver: $(DRIVER) -%o: %c +%.o: %.c $(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $< libcanfestival_$(CAN_DRIVER).so: $(OBJS) diff -r c0e68a63f600 -r 7758d60e9260 drivers/can_tcp_win32/Makefile.in --- a/drivers/can_tcp_win32/Makefile.in Fri Jan 28 14:51:18 2011 +0100 +++ b/drivers/can_tcp_win32/Makefile.in Fri Jan 28 14:51:18 2011 +0100 @@ -59,10 +59,10 @@ Socket.o: Socket.cpp Socket.h $(CXX) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -c $< -o $@ -%o: %c +%.o: %.c $(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $< -%o: %cpp +%.o: %.cpp $(CXX) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $< $(DRIVER): $(OBJS) diff -r c0e68a63f600 -r 7758d60e9260 drivers/can_virtual/Makefile.in --- a/drivers/can_virtual/Makefile.in Fri Jan 28 14:51:18 2011 +0100 +++ b/drivers/can_virtual/Makefile.in Fri Jan 28 14:51:18 2011 +0100 @@ -49,7 +49,7 @@ driver: $(DRIVER) -%o: %c +%.o: %.c $(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $< libcanfestival_$(CAN_DRIVER).so: $(OBJS) diff -r c0e68a63f600 -r 7758d60e9260 drivers/can_vscom/Makefile.in --- a/drivers/can_vscom/Makefile.in Fri Jan 28 14:51:18 2011 +0100 +++ b/drivers/can_vscom/Makefile.in Fri Jan 28 14:51:18 2011 +0100 @@ -77,7 +77,7 @@ driver: vs_can_api.h $(DRIVER) -%o: %c +%.o: %.c $(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $< libcanfestival_$(CAN_DRIVER).$(DLL_TYPE): $(OBJS) diff -r c0e68a63f600 -r 7758d60e9260 drivers/hcs12/Makefile.in --- a/drivers/hcs12/Makefile.in Fri Jan 28 14:51:18 2011 +0100 +++ b/drivers/hcs12/Makefile.in Fri Jan 28 14:51:18 2011 +0100 @@ -48,7 +48,7 @@ ar rc $@ $(OBJS) ranlib $@ -%o: %c +%.o: %.c @echo " " @echo "*********************************************" @echo "**Compiling $< -> $@" diff -r c0e68a63f600 -r 7758d60e9260 drivers/timers_rtai/Makefile.in --- a/drivers/timers_rtai/Makefile.in Fri Jan 28 14:51:18 2011 +0100 +++ b/drivers/timers_rtai/Makefile.in Fri Jan 28 14:51:18 2011 +0100 @@ -44,7 +44,7 @@ driver: $(OBJS) -%o: %c +%.o: %.c $(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $< install: diff -r c0e68a63f600 -r 7758d60e9260 drivers/timers_unix/Makefile.in --- a/drivers/timers_unix/Makefile.in Fri Jan 28 14:51:18 2011 +0100 +++ b/drivers/timers_unix/Makefile.in Fri Jan 28 14:51:18 2011 +0100 @@ -44,7 +44,7 @@ driver: $(OBJS) -%o: %c +%.o: %.c $(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $< install: diff -r c0e68a63f600 -r 7758d60e9260 drivers/timers_win32/Makefile.in --- a/drivers/timers_win32/Makefile.in Fri Jan 28 14:51:18 2011 +0100 +++ b/drivers/timers_win32/Makefile.in Fri Jan 28 14:51:18 2011 +0100 @@ -46,7 +46,7 @@ driver: $(OBJS) -%o: %c +%.o: %.c $(CXX) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $< install: diff -r c0e68a63f600 -r 7758d60e9260 drivers/timers_xeno/Makefile.in --- a/drivers/timers_xeno/Makefile.in Fri Jan 28 14:51:18 2011 +0100 +++ b/drivers/timers_xeno/Makefile.in Fri Jan 28 14:51:18 2011 +0100 @@ -44,7 +44,7 @@ driver: $(OBJS) -%o: %c +%.o: %.c $(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $< install: diff -r c0e68a63f600 -r 7758d60e9260 drivers/unix/Makefile.in --- a/drivers/unix/Makefile.in Fri Jan 28 14:51:18 2011 +0100 +++ b/drivers/unix/Makefile.in Fri Jan 28 14:51:18 2011 +0100 @@ -89,7 +89,7 @@ driver: $(OBJS) -%o: %c +%.o: %.c $(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $< #../$(TIMERS_DRIVER)/$(TIMERS_DRIVER).o: diff -r c0e68a63f600 -r 7758d60e9260 drivers/win32/Makefile.in --- a/drivers/win32/Makefile.in Fri Jan 28 14:51:18 2011 +0100 +++ b/drivers/win32/Makefile.in Fri Jan 28 14:51:18 2011 +0100 @@ -54,7 +54,7 @@ driver: $(OBJS) -%o: %c +%.o: %.c $(CXX) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $< #../$(TIMERS_DRIVER)/$(TIMERS_DRIVER).o: diff -r c0e68a63f600 -r 7758d60e9260 examples/CANOpenShell/Makefile.in --- a/examples/CANOpenShell/Makefile.in Fri Jan 28 14:51:18 2011 +0100 +++ b/examples/CANOpenShell/Makefile.in Fri Jan 28 14:51:18 2011 +0100 @@ -75,7 +75,7 @@ $(MAKE) -C ../../objdictgen gnosis python ../../objdictgen/objdictgen.py CANOpenShellSlaveOD.od CANOpenShellSlaveOD.c -%o: %c +%.o: %.c $(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $< clean: diff -r c0e68a63f600 -r 7758d60e9260 examples/DS401_Master/Makefile.in --- a/examples/DS401_Master/Makefile.in Fri Jan 28 14:51:18 2011 +0100 +++ b/examples/DS401_Master/Makefile.in Fri Jan 28 14:51:18 2011 +0100 @@ -55,7 +55,7 @@ $(MAKE) -C ../../objdictgen gnosis python ../../objdictgen/objdictgen.py TestMaster.od TestMaster.c -%o: %c +%.o: %.c $(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $< clean: diff -r c0e68a63f600 -r 7758d60e9260 examples/DS401_Slave_Gui/Makefile.in --- a/examples/DS401_Slave_Gui/Makefile.in Fri Jan 28 14:51:18 2011 +0100 +++ b/examples/DS401_Slave_Gui/Makefile.in Fri Jan 28 14:51:18 2011 +0100 @@ -54,7 +54,7 @@ DS401_Slave_Gui: ObjDict.c $(OBJS) $(CPP_OBJS) $(LD) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) $(OBJS) $(CPP_OBJS) $(EXE_CFLAGS) `wx-config --libs` -o $@ -%o: %c +%.o: %.c $(CC) -c $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) $< -o $@ ObjDict.c: ObjDict.od diff -r c0e68a63f600 -r 7758d60e9260 examples/SillySlave/Makefile.in --- a/examples/SillySlave/Makefile.in Fri Jan 28 14:51:18 2011 +0100 +++ b/examples/SillySlave/Makefile.in Fri Jan 28 14:51:18 2011 +0100 @@ -55,7 +55,7 @@ $(MAKE) -C ../../objdictgen gnosis python ../../objdictgen/objdictgen.py SillySlave.od SillySlave.c -%o: %c +%.o: %.c $(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $< clean: diff -r c0e68a63f600 -r 7758d60e9260 examples/TestMasterMicroMod/Makefile.in --- a/examples/TestMasterMicroMod/Makefile.in Fri Jan 28 14:51:18 2011 +0100 +++ b/examples/TestMasterMicroMod/Makefile.in Fri Jan 28 14:51:18 2011 +0100 @@ -63,7 +63,7 @@ $(MAKE) -C ../../objdictgen gnosis python ../../objdictgen/objdictgen.py TestMaster.od TestMaster.c -%o: %c +%.o: %.c $(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $< clean: diff -r c0e68a63f600 -r 7758d60e9260 examples/TestMasterSlave/Makefile.in --- a/examples/TestMasterSlave/Makefile.in Fri Jan 28 14:51:18 2011 +0100 +++ b/examples/TestMasterSlave/Makefile.in Fri Jan 28 14:51:18 2011 +0100 @@ -75,7 +75,7 @@ $(MAKE) -C ../../objdictgen gnosis python ../../objdictgen/objdictgen.py TestMaster.od TestMaster.c -%o: %c +%.o: %.c $(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $< clean: diff -r c0e68a63f600 -r 7758d60e9260 examples/TestMasterSlaveLSS/Makefile.in --- a/examples/TestMasterSlaveLSS/Makefile.in Fri Jan 28 14:51:18 2011 +0100 +++ b/examples/TestMasterSlaveLSS/Makefile.in Fri Jan 28 14:51:18 2011 +0100 @@ -74,7 +74,7 @@ $(MAKE) -C ../../objdictgen gnosis python ../../objdictgen/objdictgen.py TestMaster.od TestMaster.c -%o: %c +%.o: %.c $(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $< clean: diff -r c0e68a63f600 -r 7758d60e9260 examples/gene_SYNC_HCS12/Makefile.in --- a/examples/gene_SYNC_HCS12/Makefile.in Fri Jan 28 14:51:18 2011 +0100 +++ b/examples/gene_SYNC_HCS12/Makefile.in Fri Jan 28 14:51:18 2011 +0100 @@ -61,7 +61,7 @@ all: $(PGR).elf $(PGR).s19 $(PGR).b $(PGR).s MSG -%o: %c +%.o: %.c @echo " " @echo "*********************************************" @echo "**Compiling $< -> $@" diff -r c0e68a63f600 -r 7758d60e9260 examples/test_copcican_linux/Makefile.in --- a/examples/test_copcican_linux/Makefile.in Fri Jan 28 14:51:18 2011 +0100 +++ b/examples/test_copcican_linux/Makefile.in Fri Jan 28 14:51:18 2011 +0100 @@ -56,7 +56,7 @@ test_copcican_linux: test_copcican_linux.c $(OBJS) $(LD) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ $(OBJS) $(EXE_CFLAGS) -%o: %c +%.o: %.c $(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $< clean: diff -r c0e68a63f600 -r 7758d60e9260 src/Makefile.in --- a/src/Makefile.in Fri Jan 28 14:51:18 2011 +0100 +++ b/src/Makefile.in Fri Jan 28 14:51:18 2011 +0100 @@ -124,7 +124,7 @@ @echo "*********************************************" $(BINUTILS_PREFIX)ld -r $(OBJS) -o $@ -$(TARGET)_%o: %c +$(TARGET)_%.o: %.c @echo " " @echo "*********************************************" @echo "**Compiling $< -> $@"