change log for rtems (2011-04-01)

rtems-vc at rtems.org rtems-vc at rtems.org
Fri Apr 1 19:10:17 UTC 2011


 *joel*:
2011-04-01	Joel Sherrill <joel.sherrill at oarcorp.com>

	* custom/default.cfg: Update to account for movement of .cfg files.

M  1.348  make/ChangeLog
M   1.21  make/custom/default.cfg

diff -u rtems/make/ChangeLog:1.347 rtems/make/ChangeLog:1.348
--- rtems/make/ChangeLog:1.347	Fri Mar  4 12:29:19 2011
+++ rtems/make/ChangeLog	Fri Apr  1 13:12:01 2011
@@ -1,3 +1,7 @@
+2011-04-01	Joel Sherrill <joel.sherrill at oarcorp.com>
+
+	* custom/default.cfg: Update to account for movement of .cfg files.
+
 2011-03-04	Ralf Corsépius <ralf.corsepius at rtems.org>
 
 	* Makefile.am: Remove (merged into ../Makefile.am).

diff -u rtems/make/custom/default.cfg:1.20 rtems/make/custom/default.cfg:1.21
--- rtems/make/custom/default.cfg:1.20	Thu Sep 18 12:33:55 2008
+++ rtems/make/custom/default.cfg	Fri Apr  1 13:12:01 2011
@@ -9,10 +9,10 @@
 #
 
 include $(exec_prefix)/$(RTEMS_BSP)/make/target.cfg
-include $(RTEMS_ROOT)/make/host.cfg
+include $(RTEMS_SHARE)/make/host.cfg
 
 include $(RTEMS_ROOT)/make/main.cfg
 include $(exec_prefix)/$(RTEMS_BSP)/make/bsp.cfg
 
 ## Target compiler config file, if any
-CONFIG.CC = $(RTEMS_ROOT)/make/compilers/gcc-target-default.cfg
+CONFIG.CC = $(RTEMS_SHARE)/make/compilers/gcc-target-default.cfg


 *joel*:
2011-04-01	Joel Sherrill <joel.sherrill at oarcorp.com>

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

M   1.82  c/src/make/ChangeLog
M   1.25  c/src/make/Makefile.am
M   1.15  c/src/make/Makefile.inc.in
M   1.34  c/src/make/configure.ac
M    1.9  c/src/make/target.cfg.in

diff -u rtems/c/src/make/ChangeLog:1.81 rtems/c/src/make/ChangeLog:1.82
--- rtems/c/src/make/ChangeLog:1.81	Mon Mar 28 22:43:00 2011
+++ rtems/c/src/make/ChangeLog	Fri Apr  1 13:12:07 2011
@@ -1,3 +1,8 @@
+2011-04-01	Joel Sherrill <joel.sherrill at 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 at rtems.org>
 
 	* Makefile.am: Use '|' as sed-delimiter.

diff -u rtems/c/src/make/Makefile.am:1.24 rtems/c/src/make/Makefile.am:1.25
--- rtems/c/src/make/Makefile.am:1.24	Mon Mar 28 22:43:00 2011
+++ rtems/c/src/make/Makefile.am	Fri Apr  1 13:12:07 2011
@@ -40,6 +40,7 @@
 
 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)|" \

diff -u rtems/c/src/make/Makefile.inc.in:1.14 rtems/c/src/make/Makefile.inc.in:1.15
--- rtems/c/src/make/Makefile.inc.in:1.14	Tue Mar  8 17:56:52 2011
+++ rtems/c/src/make/Makefile.inc.in	Fri Apr  1 13:12:07 2011
@@ -16,6 +16,8 @@
 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 @@
 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@

diff -u rtems/c/src/make/configure.ac:1.33 rtems/c/src/make/configure.ac:1.34
--- rtems/c/src/make/configure.ac:1.33	Sun Mar  6 22:05:18 2011
+++ rtems/c/src/make/configure.ac	Fri Apr  1 13:12:07 2011
@@ -17,6 +17,7 @@
 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(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)

diff -u rtems/c/src/make/target.cfg.in:1.8 rtems/c/src/make/target.cfg.in:1.9
--- rtems/c/src/make/target.cfg.in:1.8	Thu Jun 17 11:30:05 2010
+++ rtems/c/src/make/target.cfg.in	Fri Apr  1 13:12:07 2011
@@ -9,6 +9,7 @@
 LDFLAGS =
 LIBS = @LIBS@
 
+RTEMS_API = @RTEMS_API@
 CC = @CC@
 AS = @AS@
 AR = @AR@



--

Generated by Deluxe Loginfo [http://www.codewiz.org/projects/index.html#loginfo] 2.122 by Bernardo Innocenti <bernie at develer.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.rtems.org/pipermail/vc/attachments/20110401/be52c621/attachment.html>


More information about the vc mailing list