diff --git a/drivers/Makefile b/drivers/Makefile index d0860290926d79e14c2fd80e93b3f23968e59f56..6b3493db75b6b362661f47276dfc9115f37ca658 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -1,36 +1,26 @@ -################################################################# +#---------------------------------------------------------------- # # Makefile # # IgH EtherCAT-Treiber # -# $Date$ -# $Author$ +# $Id$ # -################################################################# +#---------------------------------------------------------------- -#KERNELDIR=/usr/src/linux -#KERNELDIR=/home/rich/linux-2.4.20.CX1100-rthal5 -#KERNELDIR=./linux-2.4.20.CX1100-rthal5 +KERNEL_DIRS_FILE = ../kerneldirs.mk -#IgH +ifeq ($(KERNEL_DIRS_FILE),$(wildcard $(KERNEL_DIRS_FILE))) +include $(KERNEL_DIRS_FILE) +else KERNELDIR = /vol/projekte/msr_messen_steuern_regeln/linux/kernel/2.4.20/include/linux-2.4.20.CX1100-rthal5 RTAIDIR = /vol/projekte/msr_messen_steuern_regeln/linux/kernel/2.4.20/include/rtai-24.1.13 RTLIBDIR = rt_lib +endif -#euler-nottuln -#KERNELDIR = /usr/src/linux -#RTAIDIR = /usr/src/rtai - -#patra -#KERNELDIR = /usr/src/linux-2.4.20.CX1100-rthal5 -#RTAIDIR = /usr/src/rtai-24.1.13 - -#include $(KERNELDIR)/.config - -ECAT_8139_OBJ = drv_8139too.o ec_device.o ec_master.o \ - ec_slave.o ec_command.o ec_types.o - +ifeq (.depend,$(wildcard .depend)) +include .depend +endif CFLAGS = -O2 -Wall -Wuninitialized -D__KERNEL__ -DMODULE \ -I$(KERNELDIR)/include -D_RTAI -I$(RTAIDIR)/include \ @@ -40,32 +30,34 @@ ifdef CONFIG_SMP CFLAGS += -D__SMP__ -DSMP endif -################################################################# +MODULE = ecat_8139too.o +OBJ = drv_8139too.o ec_device.o ec_master.o ec_slave.o ec_command.o ec_types.o +SRC = $(OBJ:.o=.c) -all: .depend ecat_8139too.o +#---------------------------------------------------------------- -ecat_8139too.o: $(ECAT_8139_OBJ) - $(LD) -r $(ECAT_8139_OBJ) -o $@ +all: .output_dirs .depend $(MODULE) + +$(MODULE): $(OBJ) + $(LD) -r $(OBJ) -o $@ .c.o: - $(CC) $(CFLAGS) -c -o $@ $< + $(CC) $(CFLAGS) -c $< -o $@ doc docs: $(MAKE) -C .. doc -################################################################# +.output_dirs: + @echo "x-- Directories -------------" + @echo "| Kernel $(KERNELDIR)" + @echo "| RTAI $(RTAIDIR)" + @echo "| RT_lib $(RTLIBDIR)" + @echo "x----------------------------" .depend: - $(CC) $(CFLAGS) -M *.c > .depend - -ifeq (.depend,$(wildcard .depend)) -include .depend -endif - -################################################################# + $(CC) $(CFLAGS) -M $(SRC) > .depend clean: rm -f *.o *~ core .depend -################################################################# - +#---------------------------------------------------------------- diff --git a/mini/Makefile b/mini/Makefile index c8f9fbb9e1454f63c50a2080b08256d483dd7d6a..96b10f122d1906a5c3cb2ebc414041bb12cc9691 100644 --- a/mini/Makefile +++ b/mini/Makefile @@ -8,38 +8,44 @@ # #---------------------------------------------------------------- -EC_DIR = /vol/projekte/msr_messen_steuern_regeln/ethercat +KERNEL_DIRS_FILE = ../kerneldirs.mk + +ifeq ($(KERNEL_DIRS_FILE),$(wildcard $(KERNEL_DIRS_FILE))) +include $(KERNEL_DIRS_FILE) +else +KERNELDIR = /vol/projekte/msr_messen_steuern_regeln/linux/kernel/2.4.20/include/linux-2.4.20.CX1100-rthal5 +RTAIDIR = /vol/projekte/msr_messen_steuern_regeln/linux/kernel/2.4.20/include/rtai-24.1.13 +RTLIBDIR = rt_lib +endif -#KERNELDIR = $(EC_DIR)/linux-2.4.20.CX1100-rthal5-kdb -KERNELDIR = $(EC_DIR)/linux-2.4.20-kdb -#KERNELDIR = /usr/src/linux +ifeq (.depend,$(wildcard .depend)) +include .depend +endif CFLAGS = -O2 -Wall -Wuninitialized -D__KERNEL__ \ -DMODULE -I$(KERNELDIR)/include MODULE = ec_mini_mod.o - SRC = ec_mini.c OBJ = $(SRC:.c=.o) #---------------------------------------------------------------- -all: .depend Makefile $(MODULE) +all: .output_dirs .depend Makefile $(MODULE) $(MODULE): $(OBJ) $(LD) -r $(OBJ) -o $@ -#---------------------------------------------------------------- +.output_dirs: + @echo "x-- Directories -------------" + @echo "| Kernel $(KERNELDIR)" + @echo "| RTAI $(RTAIDIR)" + @echo "| RT_lib $(RTLIBDIR)" + @echo "x----------------------------" depend .depend dep: $(CC) $(CFLAGS) -M $(SRC) > .depend -ifeq (.depend,$(wildcard .depend)) -include .depend -endif - -#---------------------------------------------------------------- - clean: rm -f *.o *~ core .depend diff --git a/rs232dbg/Makefile b/rs232dbg/Makefile index 316e52182032d528ef2b634d03d14c0f103539be..03779ff83cfa2572a6f8e25bc62bfd42a17d55b8 100644 --- a/rs232dbg/Makefile +++ b/rs232dbg/Makefile @@ -1,37 +1,55 @@ +#---------------------------------------------------------------- +# +# Makefile +# +# Kernel-Debugging über die serielle Schnittstelle +# +# $Id$ +# +#---------------------------------------------------------------- + +KERNEL_DIRS_FILE = ../kerneldirs.mk + +ifeq ($(KERNEL_DIRS_FILE),$(wildcard $(KERNEL_DIRS_FILE))) +include $(KERNEL_DIRS_FILE) +else +KERNELDIR = /vol/projekte/msr_messen_steuern_regeln/linux/kernel/2.4.20/include/linux-2.4.20.CX1100-rthal5 +RTAIDIR = /vol/projekte/msr_messen_steuern_regeln/linux/kernel/2.4.20/include/rtai-24.1.13 +RTLIBDIR = rt_lib +endif -MSRDIR = /vol/projekte/msr_messen_steuern_regeln -ECATDIR = $(MSRDIR)/ethercat - -KERNELDIR = $(ECATDIR)/linux-2.4.20.CX1100-rthal5-kdb -RTAIDIR = $(MSRDIR)/linux/kernel/2.4.20/include/rtai-24.1.13 +ifeq (.depend,$(wildcard .depend)) +include .depend +endif CFLAGS = -O2 -Wall -Wuninitialized -D__KERNEL__ -DMODULE \ -I$(KERNELDIR)/include -D_RTAI -I$(RTAIDIR)/include -I$(RTLIBDIR)/msr-include -TARGET = sdbg -MODULE = $(TARGET).o - +MODULE = sdbg.o SRC = rs232dbg.c aip_com.c +OBJ = $(SRC:.c=.o) -ALLSRC = $(SRC) +#---------------------------------------------------------------- -OBJS = $(ALLSRC:.c=.o) +all: .output_dirs .depend $(MODULE) Makefile -all: .depend $(TARGET).o Makefile +$(MODULE): $(OBJ) + $(LD) -r $(OBJ) -o $@ -$(TARGET).o: $(SRC:.c=.o) $(RTSRC:.c=.o) - $(LD) -r $(OBJS) -o $@ $(LDFLAGS) +.c.o: + $(CC) -c $(CFLAGS) $< -o $@ -install: msr_modul.o - lsmod | grep cif-rtai >/dev/null 2>&1 && sudo rmmod msr_modul || true - sudo insmod msr_modul.o +.output_dirs: + @echo "x-- Directories -------------" + @echo "| Kernel $(KERNELDIR)" + @echo "| RTAI $(RTAIDIR)" + @echo "| RT_lib $(RTLIBDIR)" + @echo "x----------------------------" + +depend .depend dep: + $(CC) $(CFLAGS) -M $(SRC) > .depend clean: rm -f *.o *~ core .depend -depend .depend dep: - $(CC) $(CFLAGS) -M *.c > $@ - -ifeq (.depend,$(wildcard .depend)) -include .depend -endif +#---------------------------------------------------------------- diff --git a/rt/Makefile b/rt/Makefile index 1569bc1365cc59df06f5dcbac67b36e01779b18d..17f67eeb57cdfe36ff142e951a87d80de85b5f98 100644 --- a/rt/Makefile +++ b/rt/Makefile @@ -1,83 +1,62 @@ -#IgH +#---------------------------------------------------------------- +# +# Makefile +# +# EtherCAT-RT-Modul +# +# $Id$ +# +#---------------------------------------------------------------- + +KERNEL_DIRS_FILE = ../kerneldirs.mk + +ifeq ($(KERNEL_DIRS_FILE),$(wildcard $(KERNEL_DIRS_FILE))) +include $(KERNEL_DIRS_FILE) +else KERNELDIR = /vol/projekte/msr_messen_steuern_regeln/linux/kernel/2.4.20/include/linux-2.4.20.CX1100-rthal5 RTAIDIR = /vol/projekte/msr_messen_steuern_regeln/linux/kernel/2.4.20/include/rtai-24.1.13 RTLIBDIR = rt_lib +endif -#euler-nottuln -#KERNELDIR = /usr/src/linux -#RTAIDIR = /usr/src/rtai - - -#patra -#KERNELDIR = /usr/src/linux-2.4.20.CX1100-rthal5 -#RTAIDIR = /usr/src/rtai-24.1.13 - -RTLIBDIR=rt_lib - -#include $(KERNELDIR)/.config - -#CFLAGS = -DRTAI -D__KERNEL__ -DMODULE -I$(KERNELDIR)/include -I$(RTAIDIR)/include -I$(RTLIBDIR)/msr-include \ -# -Wall -Wstrict-prototypes -Wno-trigraphs -O2 -fno-strict-aliasing -fno-common -fomit-frame-pointer \ -# -pipe -mpreferred-stack-boundary=2 -march=i686 -nostdinc -iwithprefix include +ifeq (.depend,$(wildcard .depend)) +include .depend +endif CFLAGS = -O2 -Wall -Wuninitialized -D__KERNEL__ -DMODULE -DSERIALDEBUG -DMSR_NO_PROC -I$(KERNELDIR)/include -D_RTAI -I$(RTAIDIR)/include -I$(RTLIBDIR)/msr-include -#CFLAGS += -DSIMULATION -#LDFLAGS = - -#VPATH = $(RTLIBDIR)/ - -TARGET = msr_modul -MODULE = $(TARGET).o - -SRC = msr_io.c - #Suchpfad für die Dateien aus dem RT-Lib-Verzeichnis VPATH = $(RTLIBDIR)/msr-core:$(RTLIBDIR)/msr-control:$(RTLIBDIR)/msr-math:$(RTLIBDIR)/msr-misc:$(RTLIBDIR)/msr-utils -#Datei aus dem RT-Libverzeichnis für dies Projekt -RTSRC = msr_main.c msr_lists.c msr_charbuf.c msr_reg.c msr_interpreter.c msr_utils.c msr_messages.c msr_base64.c msr_proc.c msr_error_reg.c - +MODULE = msr_modul.o +SRC = msr_io.c +RTSRC = msr_main.c msr_lists.c msr_charbuf.c msr_reg.c msr_interpreter.c \ + msr_utils.c msr_messages.c msr_base64.c msr_proc.c msr_error_reg.c ALLSRC = $(SRC) $(RTSRC) +OBJ = $(ALLSRC:.c=.o) -OBJS = $(ALLSRC:.c=.o) +#---------------------------------------------------------------- +all: .output_dirs .depend $(MODULE) Makefile -all: .depend $(TARGET).o Makefile +$(MODULE): $(OBJ) + @echo "Making module" + $(LD) -r $(OBJ) -o $@ -$(TARGET).o: $(SRC:.c=.o) $(RTSRC:.c=.o) - $(LD) -r $(OBJS) -o $@ $(LDFLAGS) +.c.o: + @echo "Making obj $@" + $(CC) -c $(CFLAGS) $< -o $@ -install: msr_modul.o - lsmod | grep cif-rtai >/dev/null 2>&1 && sudo rmmod msr_modul || true - sudo insmod msr_modul.o - -clean: - rm -f *.o *~ core .depend +.output_dirs: + @echo "x-- Directories -------------" + @echo "| Kernel $(KERNELDIR)" + @echo "| RTAI $(RTAIDIR)" + @echo "| RT_lib $(RTLIBDIR)" + @echo "x----------------------------" depend .depend dep: - $(CC) $(CFLAGS) -M *.c > $@ - - - - -ifeq (.depend,$(wildcard .depend)) -include .depend -endif + $(CC) $(CFLAGS) -M $(SRC) > .depend +clean: + rm -f *.o *~ core .depend -#all: msr_module.o -# -#msr_io.o: msr_io.c msr_io.h -# $(CC) $(CFLAGS) -c -o $@ $< -# -#msr_module.o: msr_io.o -# $(LD) -r -o $@ $^ -# - -# $(CC) -c $(CFLAGS) $(CPPFLAGS) -o $@ $< - - -#clean: -# rm -f *.o *~ core - +#---------------------------------------------------------------- diff --git a/user/Makefile b/user/Makefile index 501e5cefe0a688b31013a5d7d15424d353565775..dafb50a1455a3118fece2ac2778289b97c33ac0b 100644 --- a/user/Makefile +++ b/user/Makefile @@ -2,8 +2,7 @@ # # M a k e f i l e # -# $LastChangedDate$ -# $Author$ +# $Id$ # #----------------------------------------------------------------