2011-04-01 Joel Sherrill <joel.sherrill@oarcorp.com>

* Makefile.am, Makefile.inc.in, configure.ac, target.cfg.in: Update to
	account for movement of .cfg files.

c/src/make/ChangeLog

@@ -1,3 +1,8 @@
+2011-04-01	Joel Sherrill <joel.sherrill@oarcorp.com>
+
+	* Makefile.am, Makefile.inc.in, configure.ac, target.cfg.in: Update to
+	account for movement of .cfg files.
+
 2011-03-29	Ralf Corsépius <ralf.corsepius@rtems.org>
 
 	* Makefile.am: Use '|' as sed-delimiter.

c/src/make/Makefile.am

@@ -40,6 +40,7 @@ CLEANFILES += bsp.cfg
 
 target.cfg: target.cfg.in Makefile
 	sed \
+	-e "s|[@]RTEMS_API[@]|$(RTEMS_API)|" \
 	-e "s|[@]CPPFLAGS[@]|$(CPPFLAGS)|" \
 	-e "s|[@]CFLAGS[@]|$(CFLAGS)|" \
 	-e "s|[@]LIBS[@]|$(LIBS)|" \

c/src/make/Makefile.inc.in

@@ -16,6 +16,8 @@ LD_FOR_TARGET = @LD@
 SIZE_FOR_TARGET = @SIZE@
 OBJCOPY_FOR_TARGET = @OBJCOPY@
 
+RTEMS_API = @RTEMS_API@
+
 CC= $(CC_FOR_TARGET)
 CXX= $(CXX_FOR_TARGET)
 AS= $(AS_FOR_TARGET)
@@ -37,6 +39,7 @@ export OBJCOPY
 RTEMS_ROOT = $(prefix)
 PROJECT_ROOT = $(RTEMS_ROOT)
 RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+RTEMS_SHARE = $(RTEMS_ROOT)/share/rtems$(RTEMS_API)
 
 RTEMS_USE_OWN_PDIR = no
 RTEMS_HAS_POSIX_API = @RTEMS_HAS_POSIX_API@

c/src/make/configure.ac

@@ -17,6 +17,7 @@ RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define foreign 1.11.1])
 AM_MAINTAINER_MODE
 
+RTEMS_VERSIONING
 RTEMS_ENABLE_MULTIPROCESSING
 RTEMS_ENABLE_POSIX
 RTEMS_ENABLE_NETWORKING
@@ -69,6 +70,7 @@ AC_SUBST(RTEMS_HAS_CPLUSPLUS)
 AC_SUBST(program_prefix)
 AC_SUBST(CC_CFLAGS_DEFAULT)
 AC_SUBST(CC_CFLAGS_DEBUG_V)
+AC_SUBST(RTEMS_API,[_RTEMS_API])
 
 cfg_dir="${RTEMS_TOPdir}/make"
 AC_SUBST(cfg_dir)

c/src/make/target.cfg.in

@@ -9,6 +9,7 @@ CPPFLAGS = @CPPFLAGS@
 LDFLAGS =
 LIBS = @LIBS@
 
+RTEMS_API = @RTEMS_API@
 CC = @CC@
 AS = @AS@
 AR = @AR@