From 1896a650fc382d343844b56f4b79efe31562755e Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Fri, 30 Jul 1999 17:52:50 +0000 Subject: Patch from Ralf Corsepius : The main topic is replacing the hard-coded values for HAS_MP and HAS_RDBG in custom/*.cfg with per-bsp configuration-time autoconf checks (This is the patch I had mentioned before earlier this week). CHANGES * HAS_MP removed from custom/*.cfg, replaced with configuration time autoconf check * HAS_RDBG removed from custom/*.cfg, replaced with configuration-time autoconf check * NEW: c/src/make/bsp.cfg.in, takes configuration-time checked per-bsp values (i.e. HAS_MP, HAS_RDBG), gets installed as $(prefix)//make/bsp.cfg * NEW: default.cfg includes bsp.cfg - this change is backward compatible. * IMPORT_SRC: apply VPATH instead for ts_386ex/i386ex subdirectory Makefile.ins * HACK: a bug in acpolish mis-handles addtions to makefile variables which are enclosed in gmake conditionals: c/src/lib/libbsp/m68k/ods68302/start302/Makefile.in * Apply inline_dir, HAS_MP and HAS_RDBG for avoiding configuration of unneeded subdirectories in various configure.in files. * Several minor changes in Makefile.ins and configure.ins, wrt. to the order of including *.cfg and defining Makefile variables APPLYING THE PATCH: patch -p1 < rtems-rc-19990709-4.diff ./autogen --- c/src/make/custom/Makefile.am | 4 +++- c/src/make/custom/Makefile.in | 6 +++++- c/src/make/custom/default.cfg.in | 15 +-------------- 3 files changed, 9 insertions(+), 16 deletions(-) (limited to 'c/src/make/custom') diff --git a/c/src/make/custom/Makefile.am b/c/src/make/custom/Makefile.am index 3313913c03..5cd10d1d8b 100644 --- a/c/src/make/custom/Makefile.am +++ b/c/src/make/custom/Makefile.am @@ -13,7 +13,9 @@ default.cfg if MAINTAINER_MODE $(srcdir)/default.cfg.in: $(top_srcdir)/@RTEMS_TOPdir@/make/custom/default.cfg - sed -e 's%\$$(RTEMS_BSP)%\@RTEMS_BSP\@%g' < $< >$@ + sed -e 's%\$$(RTEMS_BSP)%\@RTEMS_BSP\@%g' \ + -e 's%\$$(RTEMS_ROOT)/\@RTEMS_BSP\@%$$(RTEMS_ROOT)%g' \ + < $< >$@ endif include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/make/custom/Makefile.in b/c/src/make/custom/Makefile.in index b005b3bd51..973bb58484 100644 --- a/c/src/make/custom/Makefile.in +++ b/c/src/make/custom/Makefile.in @@ -86,6 +86,8 @@ CXX = @CXX@ CXXCPP = @CXXCPP@ CXX_FOR_TARGET = @CXX_FOR_TARGET@ GCCSED = @GCCSED@ +HAS_MP = @HAS_MP@ +HAS_RDBG = @HAS_RDBG@ INSTALL_CHANGE = @INSTALL_CHANGE@ KSH = @KSH@ LN = @LN@ @@ -256,7 +258,9 @@ maintainer-clean-generic clean mostlyclean distclean maintainer-clean @MAINTAINER_MODE_TRUE@$(srcdir)/default.cfg.in: $(top_srcdir)/@RTEMS_TOPdir@/make/custom/default.cfg -@MAINTAINER_MODE_TRUE@ sed -e 's%\$$(RTEMS_BSP)%\@RTEMS_BSP\@%g' < $< >$@ +@MAINTAINER_MODE_TRUE@ sed -e 's%\$$(RTEMS_BSP)%\@RTEMS_BSP\@%g' \ +@MAINTAINER_MODE_TRUE@ -e 's%\$$(RTEMS_ROOT)/\@RTEMS_BSP\@%$$(RTEMS_ROOT)%g' \ +@MAINTAINER_MODE_TRUE@ < $< >$@ debug-am: debug: debug-am diff --git a/c/src/make/custom/default.cfg.in b/c/src/make/custom/default.cfg.in index fa35d61bd9..872af0d183 100644 --- a/c/src/make/custom/default.cfg.in +++ b/c/src/make/custom/default.cfg.in @@ -18,6 +18,7 @@ TARGET_ARCH=o-@RTEMS_BSP@ endif include $(RTEMS_ROOT)/make/main.cfg +include $(RTEMS_ROOT)/make/bsp.cfg # use the inline functions instead of the macros # ref: src/exec/generic/Makefile @@ -53,13 +54,6 @@ else HAS_CPLUSPLUS=no endif -# Define this to yes if this target supports multiprocessor environments. -ifeq ($(RTEMS_HAS_MULTIPROCESSING),yes) -HAS_MP=yes -else -HAS_MP=no -endif - # Define this to yes if this target wants the TCP/IP stack ifeq ($(RTEMS_HAS_NETWORKING),yes) HAS_NETWORKING=yes @@ -67,13 +61,6 @@ else HAS_NETWORKING=no endif -# Define this to yes if this target wants the remote debugger -ifeq ($(RTEMS_HAS_RDBG),yes) -HAS_RDBG=yes -else -HAS_RDBG=no -endif - # Define this to yes if this target wants the posix api ifeq ($(RTEMS_HAS_POSIX_API),yes) HAS_POSIX_API=yes -- cgit v1.2.3