# HG changeset patch
# User Florian Pose <fp@igh-essen.com>
# Date 1132306504 0
# Node ID f04e93b8af0f49ad6663ee5988222552cdbfc5a5
# Parent  72d95aa70c1d09ad4ae3daa99417f020e3f88f38
?nderungen in den Makefiles.

diff -r 72d95aa70c1d -r f04e93b8af0f Makefile
--- a/Makefile	Fri Nov 11 13:52:12 2005 +0000
+++ b/Makefile	Fri Nov 18 09:35:04 2005 +0000
@@ -8,7 +8,11 @@
 #
 #----------------------------------------------------------------
 
-KERNEL_DIRS_FILE = kerneldirs.mk
+CONFIG_FILE = ethercat.conf
+
+ifeq ($(CONFIG_FILE),$(wildcard $(CONFIG_FILE)))
+include $(CONFIG_FILE)
+endif
 
 #----------------------------------------------------------------
 
@@ -20,23 +24,38 @@
 .drivers:
 	$(MAKE) -C drivers
 
+ifeq ($(MAKE_RT),yes)
 .rt:
 	$(MAKE) -C rt
+else
+.rt:
+	@echo "Skipping Real-Time."
+endif
 
+ifeq ($(MAKE_RS232),yes)
 .rs232dbg:
 	$(MAKE) -C rs232dbg
+else
+.rs232dbg:
+	@echo "Skipping rs232dbg."
+endif
 
 .mini:
 	$(MAKE) -C mini
 
-kerneldirs:
-	@echo "# EtherCAT Standard-Kernel-Verzeichnisse" > $(KERNEL_DIRS_FILE)
-	@echo >> $(KERNEL_DIRS_FILE)
-	@echo "KERNELDIR = /vol/projekte/msr_messen_steuern_regeln/linux/kernel/2.4.20/include/linux-2.4.20.CX1100-rthal5" >> $(KERNEL_DIRS_FILE)
-	@echo "RTAIDIR   = /vol/projekte/msr_messen_steuern_regeln/linux/kernel/2.4.20/include/rtai-24.1.13" >> $(KERNEL_DIRS_FILE)
-	@echo "RTLIBDIR = rt_lib" >> $(KERNEL_DIRS_FILE)
-	@echo >> $(KERNEL_DIRS_FILE)
-	@echo "$(KERNEL_DIRS_FILE) erstellt."
+config $(CONFIG_FILE):
+	@echo "# EtherCAT Konfigurationsdatei" > $(CONFIG_FILE)
+	@echo >> $(CONFIG_FILE)
+	@echo "KERNELDIR = /vol/projekte/msr_messen_steuern_regeln/linux/kernel/2.4.20/include/linux-2.4.20.CX1100-rthal5" >> $(CONFIG_FILE)
+	@echo "RTAIDIR   = /vol/projekte/msr_messen_steuern_regeln/linux/kernel/2.4.20/include/rtai-24.1.13" >> $(CONFIG_FILE)
+	@echo "RTLIBDIR  = rt_lib" >> $(CONFIG_FILE)
+	@echo >> $(CONFIG_FILE)
+	@echo "GCC_SYSTEMDIR = /usr/lib/gcc-lib/i486-suse-linux/3.3/include" >> $(CONFIG_FILE)
+	@echo >> $(CONFIG_FILE)
+	@echo "MAKE_RT    = yes" >> $(CONFIG_FILE)
+	@echo "MAKE_RS232 = yes" >> $(CONFIG_FILE)
+	@echo >> $(CONFIG_FILE)
+	@echo "$(CONFIG_FILE) erstellt."
 
 clean:
 	$(MAKE) -C rt clean
diff -r 72d95aa70c1d -r f04e93b8af0f drivers/Makefile
--- a/drivers/Makefile	Fri Nov 11 13:52:12 2005 +0000
+++ b/drivers/Makefile	Fri Nov 18 09:35:04 2005 +0000
@@ -8,18 +8,20 @@
 #
 #----------------------------------------------------------------
 
-KERNEL_DIRS_FILE = ../kerneldirs.mk
+CONFIG_FILE = ../ethercat.conf
 
-ifeq ($(KERNEL_DIRS_FILE),$(wildcard $(KERNEL_DIRS_FILE)))
-include $(KERNEL_DIRS_FILE)
+ifeq ($(CONFIG_FILE),$(wildcard $(CONFIG_FILE)))
+include $(CONFIG_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
+RTLIBDIR  = rt_lib
+GCC_SYSTEMDIR = /usr/lib/gcc-lib/i486-suse-linux/3.3/include
 endif
 
 CFLAGS = -O2 -Wall -Wuninitialized -D__KERNEL__ \
-	-DMODULE -I$(KERNELDIR)/include
+	-DMODULE -I$(KERNELDIR)/include -nostdinc \
+	-isystem $(GCC_SYSTEMDIR)
 
 ifdef CONFIG_SMP
 	CFLAGS += -D__SMP__ -DSMP
diff -r 72d95aa70c1d -r f04e93b8af0f mini/Makefile
--- a/mini/Makefile	Fri Nov 11 13:52:12 2005 +0000
+++ b/mini/Makefile	Fri Nov 18 09:35:04 2005 +0000
@@ -8,14 +8,14 @@
 #
 #----------------------------------------------------------------
 
-KERNEL_DIRS_FILE = ../kerneldirs.mk
+CONFIG_FILE = ../ethercat.conf
 
-ifeq ($(KERNEL_DIRS_FILE),$(wildcard $(KERNEL_DIRS_FILE)))
-include $(KERNEL_DIRS_FILE)
+ifeq ($(CONFIG_FILE),$(wildcard $(CONFIG_FILE)))
+include $(CONFIG_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
+RTLIBDIR  = rt_lib
 endif
 
 CFLAGS = -O2 -Wall -Wuninitialized -D__KERNEL__ \
diff -r 72d95aa70c1d -r f04e93b8af0f rs232dbg/Makefile
--- a/rs232dbg/Makefile	Fri Nov 11 13:52:12 2005 +0000
+++ b/rs232dbg/Makefile	Fri Nov 18 09:35:04 2005 +0000
@@ -8,14 +8,14 @@
 #
 #----------------------------------------------------------------
 
-KERNEL_DIRS_FILE = ../kerneldirs.mk
+CONFIG_FILE = ../kerneldirs.mk
 
-ifeq ($(KERNEL_DIRS_FILE),$(wildcard $(KERNEL_DIRS_FILE)))
-include $(KERNEL_DIRS_FILE)
+ifeq ($(CONFIG_FILE),$(wildcard $(CONFIG_FILE)))
+include $(CONFIG_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
+RTLIBDIR  = rt_lib
 endif
 
 CFLAGS = -O2 -Wall -Wuninitialized -D__KERNEL__ -DMODULE \
diff -r 72d95aa70c1d -r f04e93b8af0f rt/Makefile
--- a/rt/Makefile	Fri Nov 11 13:52:12 2005 +0000
+++ b/rt/Makefile	Fri Nov 18 09:35:04 2005 +0000
@@ -8,14 +8,14 @@
 #
 #----------------------------------------------------------------
 
-KERNEL_DIRS_FILE = ../kerneldirs.mk
+CONFIG_FILE = ../ethercat.conf
 
-ifeq ($(KERNEL_DIRS_FILE),$(wildcard $(KERNEL_DIRS_FILE)))
-include $(KERNEL_DIRS_FILE)
+ifeq ($(CONFIG_FILE),$(wildcard $(CONFIG_FILE)))
+include $(CONFIG_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
+RTLIBDIR  = rt_lib
 endif
 
 CFLAGS = -O2 -Wall -Wuninitialized -D__KERNEL__ -DMODULE -DSERIALDEBUG -DMSR_NO_PROC -I$(KERNELDIR)/include -D_RTAI -I$(RTAIDIR)/include -I$(RTLIBDIR)/msr-include