From 2cce1ab0d000b61c5a382b76a115753b3b54e7b0 Mon Sep 17 00:00:00 2001 From: Florian Pose <fp@igh-essen.com> Date: Fri, 18 Nov 2005 09:35:04 +0000 Subject: [PATCH] =?UTF-8?q?=C3=84nderungen=20in=20den=20Makefiles.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Makefile | 37 ++++++++++++++++++++++++++++--------- drivers/Makefile | 12 +++++++----- mini/Makefile | 8 ++++---- rs232dbg/Makefile | 8 ++++---- rt/Makefile | 8 ++++---- 5 files changed, 47 insertions(+), 26 deletions(-) diff --git a/Makefile b/Makefile index d7037266..c0248076 100644 --- a/Makefile +++ b/Makefile @@ -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 @@ doc docs: .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 --git a/drivers/Makefile b/drivers/Makefile index e763d914..1d99d00c 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -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 --git a/mini/Makefile b/mini/Makefile index 39d4561b..bab508d6 100644 --- a/mini/Makefile +++ b/mini/Makefile @@ -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 --git a/rs232dbg/Makefile b/rs232dbg/Makefile index f7a7e16b..af82a892 100644 --- a/rs232dbg/Makefile +++ b/rs232dbg/Makefile @@ -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 --git a/rt/Makefile b/rt/Makefile index 610b2163..dad5b39d 100644 --- a/rt/Makefile +++ b/rt/Makefile @@ -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 -- GitLab