change log for rtems (2011-03-06)
rtems-vc at rtems.org
rtems-vc at rtems.org
Mon Mar 7 04:11:17 UTC 2011
*ralf*:
2011-03-07 Ralf Corsépius <ralf.corsepius at rtems.org>
PR 1753/misc:
* host.cfg.in: Remove RTEMS_HOST.
M 1.75 c/src/make/ChangeLog
M 1.17 c/src/make/host.cfg.in
diff -u rtems/c/src/make/ChangeLog:1.74 rtems/c/src/make/ChangeLog:1.75
--- rtems/c/src/make/ChangeLog:1.74 Sat Mar 5 12:48:35 2011
+++ rtems/c/src/make/ChangeLog Sun Mar 6 21:49:54 2011
@@ -1,3 +1,8 @@
+2011-03-07 Ralf Corsépius <ralf.corsepius at rtems.org>
+
+ PR 1753/misc:
+ * host.cfg.in: Remove RTEMS_HOST.
+
2011-03-05 Ralf Corsépius <ralf.corsepius at rtems.org>
PR 1754/misc:
diff -u rtems/c/src/make/host.cfg.in:1.16 rtems/c/src/make/host.cfg.in:1.17
--- rtems/c/src/make/host.cfg.in:1.16 Sat Mar 5 12:48:35 2011
+++ rtems/c/src/make/host.cfg.in Sun Mar 6 21:49:54 2011
@@ -6,8 +6,6 @@
# Derived from rtems/c/make/os/*.cfg in previous RTEMS version.
#
-RTEMS_HOST = @RTEMS_HOST@
-
#
# Stuff to clean and clobber for the OS
#
*ralf*:
2011-03-07 Ralf Corsépius <ralf.corsepius at rtems.org>
* configure.ac: Remove dead code.
M 1.546 c/src/ChangeLog
M 1.104 c/src/configure.ac
diff -u rtems/c/src/ChangeLog:1.545 rtems/c/src/ChangeLog:1.546
--- rtems/c/src/ChangeLog:1.545 Fri Mar 4 10:17:27 2011
+++ rtems/c/src/ChangeLog Sun Mar 6 21:52:47 2011
@@ -1,3 +1,7 @@
+2011-03-07 Ralf Corsépius <ralf.corsepius at rtems.org>
+
+ * configure.ac: Remove dead code.
+
2011-03-04 Ralf Corsépius <ralf.corsepius at rtems.org>
* aclocal/rtems-top.m4, aclocal/version.m4:
diff -u rtems/c/src/configure.ac:1.103 rtems/c/src/configure.ac:1.104
--- rtems/c/src/configure.ac:1.103 Tue Feb 22 10:16:43 2011
+++ rtems/c/src/configure.ac Sun Mar 6 21:52:47 2011
@@ -59,9 +59,6 @@
-e 's%default\.cfg%%'`;
else break; fi;
done
-#${MAKE-make} -f ${DEPDIR}/cfg.P \
-# srcdir="${srcdir}" MKDIR_P="${MKDIR_P}" \
-# make/custom/default.cfg $CUSTOM_CFG_FILES
AC_MSG_NOTICE([creating make/${RTEMS_BSP}.cache])
${MAKE-make} -f ${srcdir}/make/bsp.mak \
*ralf*:
2011-03-07 Ralf Corsépius <ralf.corsepius at rtems.org>
* aclocal/rtems-top.m4: Add pkgdatadir.
M 1.547 c/src/ChangeLog
M 1.16 c/src/aclocal/rtems-top.m4
diff -u rtems/c/src/ChangeLog:1.546 rtems/c/src/ChangeLog:1.547
--- rtems/c/src/ChangeLog:1.546 Sun Mar 6 21:52:47 2011
+++ rtems/c/src/ChangeLog Sun Mar 6 21:54:49 2011
@@ -1,5 +1,6 @@
2011-03-07 Ralf Corsépius <ralf.corsepius at rtems.org>
+ * aclocal/rtems-top.m4: Add pkgdatadir.
* configure.ac: Remove dead code.
2011-03-04 Ralf Corsépius <ralf.corsepius at rtems.org>
diff -u rtems/c/src/aclocal/rtems-top.m4:1.15 rtems/c/src/aclocal/rtems-top.m4:1.16
--- rtems/c/src/aclocal/rtems-top.m4:1.15 Fri Mar 4 10:17:27 2011
+++ rtems/c/src/aclocal/rtems-top.m4 Sun Mar 6 21:54:49 2011
@@ -32,4 +32,5 @@
AC_SUBST([PROJECT_ROOT],[${with_project_root}${rtems_updir}'$(top_builddir)'])
AC_SUBST([dirstamp],[\${am__leading_dot}dirstamp])
+AC_SUBST([pkgdatadir],["\${datadir}"/rtems]_RTEMS_API)
])dnl
*ralf*:
2011-03-07 Ralf Corsépius <ralf.corsepius at rtems.org>
* Makefile.am: Install *.cfgs into $(pkgdatadir)/make.
M 1.76 c/src/make/ChangeLog
M 1.22 c/src/make/Makefile.am
diff -u rtems/c/src/make/ChangeLog:1.75 rtems/c/src/make/ChangeLog:1.76
--- rtems/c/src/make/ChangeLog:1.75 Sun Mar 6 21:49:54 2011
+++ rtems/c/src/make/ChangeLog Sun Mar 6 22:01:03 2011
@@ -1,5 +1,9 @@
2011-03-07 Ralf Corsépius <ralf.corsepius at rtems.org>
+ * Makefile.am: Install *.cfgs into $(pkgdatadir)/make.
+
+2011-03-07 Ralf Corsépius <ralf.corsepius at rtems.org>
+
PR 1753/misc:
* host.cfg.in: Remove RTEMS_HOST.
diff -u rtems/c/src/make/Makefile.am:1.21 rtems/c/src/make/Makefile.am:1.22
--- rtems/c/src/make/Makefile.am:1.21 Mon Aug 18 07:02:20 2003
+++ rtems/c/src/make/Makefile.am Sun Mar 6 22:01:03 2011
@@ -4,7 +4,7 @@
ACLOCAL_AMFLAGS = -I aclocal -I ../aclocal
-rtems_makedir = $(prefix)/make
+rtems_makedir = $(pkgdatadir)/make
GENERIC_FILES = host.cfg
*ralf*:
2011-03-07 Ralf Corsépius <ralf.corsepius at rtems.org>
* Makefile.inc.in: Set PROJECT_ROOT = @pkgdatadir at .
M 1.77 c/src/make/ChangeLog
M 1.13 c/src/make/Makefile.inc.in
diff -u rtems/c/src/make/ChangeLog:1.76 rtems/c/src/make/ChangeLog:1.77
--- rtems/c/src/make/ChangeLog:1.76 Sun Mar 6 22:01:03 2011
+++ rtems/c/src/make/ChangeLog Sun Mar 6 22:03:26 2011
@@ -1,5 +1,9 @@
2011-03-07 Ralf Corsépius <ralf.corsepius at rtems.org>
+ * Makefile.inc.in: Set PROJECT_ROOT = @pkgdatadir at .
+
+2011-03-07 Ralf Corsépius <ralf.corsepius at rtems.org>
+
* Makefile.am: Install *.cfgs into $(pkgdatadir)/make.
2011-03-07 Ralf Corsépius <ralf.corsepius at rtems.org>
diff -u rtems/c/src/make/Makefile.inc.in:1.12 rtems/c/src/make/Makefile.inc.in:1.13
--- rtems/c/src/make/Makefile.inc.in:1.12 Thu Jun 17 11:30:05 2010
+++ rtems/c/src/make/Makefile.inc.in Sun Mar 6 22:03:26 2011
@@ -35,7 +35,7 @@
export OBJCOPY
RTEMS_CUSTOM = $(prefix)/make/custom/$(RTEMS_BSP).cfg
-PROJECT_ROOT = $(prefix)
+PROJECT_ROOT = @pkgdatadir@
RTEMS_USE_OWN_PDIR = no
RTEMS_HAS_POSIX_API = @RTEMS_HAS_POSIX_API@
RTEMS_HAS_ITRON_API = no
*ralf*:
2011-03-07 Ralf Corsépius <ralf.corsepius at rtems.org>
* Makefile.am, configure.ac: Move file generation into Makefile.
M 1.78 c/src/make/ChangeLog
M 1.23 c/src/make/Makefile.am
M 1.33 c/src/make/configure.ac
diff -u rtems/c/src/make/ChangeLog:1.77 rtems/c/src/make/ChangeLog:1.78
--- rtems/c/src/make/ChangeLog:1.77 Sun Mar 6 22:03:26 2011
+++ rtems/c/src/make/ChangeLog Sun Mar 6 22:05:18 2011
@@ -1,5 +1,9 @@
2011-03-07 Ralf Corsépius <ralf.corsepius at rtems.org>
+ * Makefile.am, configure.ac: Move file generation into Makefile.
+
+2011-03-07 Ralf Corsépius <ralf.corsepius at rtems.org>
+
* Makefile.inc.in: Set PROJECT_ROOT = @pkgdatadir at .
2011-03-07 Ralf Corsépius <ralf.corsepius at rtems.org>
diff -u rtems/c/src/make/Makefile.am:1.22 rtems/c/src/make/Makefile.am:1.23
--- rtems/c/src/make/Makefile.am:1.22 Sun Mar 6 22:01:03 2011
+++ rtems/c/src/make/Makefile.am Sun Mar 6 22:05:18 2011
@@ -4,6 +4,8 @@
ACLOCAL_AMFLAGS = -I aclocal -I ../aclocal
+CLEANFILES =
+
rtems_makedir = $(pkgdatadir)/make
GENERIC_FILES = host.cfg
@@ -27,6 +29,67 @@
cp $< $@
endif
+bsp.cfg: bsp.cfg.in Makefile
+ sed \
+ -e "s,[@]HAS_MP[@],$(HAS_MP)," \
+ -e "s,[@]HAS_POSIX_API[@],$(HAS_POSIX_API)," \
+ -e "s,[@]HAS_CPLUSPLUS[@],$(HAS_CPLUSPLUS)," \
+ -e "s,[@]HAS_NETWORKING[@],$(HAS_NETWORKING)," \
+ < $(srcdir)/bsp.cfg.in > bsp.cfg
+CLEANFILES += bsp.cfg
+
+target.cfg: target.cfg.in Makefile
+ sed \
+ -e "s,[@]CPPFLAGS[@],$(CPPFLAGS)," \
+ -e "s,[@]CFLAGS[@],$(CFLAGS)," \
+ -e "s,[@]LIBS[@],$(LIBS)," \
+ -e "s,[@]CC[@],$(CC)," \
+ -e "s,[@]CXX[@],$(CXX)," \
+ -e "s,[@]AS[@],$(AS)," \
+ -e "s,[@]AR[@],$(AR)," \
+ -e "s,[@]NM[@],$(NM)," \
+ -e "s,[@]LD[@],$(LD)," \
+ -e "s,[@]SIZE[@],$(SIZE)," \
+ -e "s,[@]STRIP[@],$(STRIP)," \
+ -e "s,[@]RANLIB[@],$(RANLIB)," \
+ -e "s,[@]OBJCOPY[@],$(OBJCOPY)," \
+ -e "s,[@]RTEMS_CPU[@],$(RTEMS_CPU)," \
+ -e "s,[@]RTEMS_HAS_MULTIPROCESSING[@],$(HAS_MP)," \
+ -e "s,[@]RTEMS_HAS_POSIX_API[@],$(HAS_POSIX_API)," \
+ -e "s,[@]RTEMS_HAS_CPLUSPLUS[@],$(HAS_CPLUSPLUS)," \
+ -e "s,[@]RTEMS_HAS_NETWORKING[@],$(HAS_NETWORKING)," \
+ < $(srcdir)/target.cfg.in > target.cfg
+CLEANFILES += target.cfg
+
+host.cfg: host.cfg.in Makefile
+ sed \
+ -e "s,[@]CP[@],$(CP)," \
+ -e "s,[@]MV[@],$(MV)," \
+ -e "s,[@]LN[@],$(LN)," \
+ -e "s,[@]SHELL[@],$(SHELL)," \
+ -e "s,[@]KSH[@],$(KSH)," \
+ < $(srcdir)/host.cfg.in > host.cfg
+CLEANFILES += host.cfg
+
+Makefile.inc: Makefile.inc.in Makefile
+ sed \
+ -e "s,[@]prefix[@],$(prefix)," \
+ -e "s,[@]exec_prefix[@],$(exec_prefix)," \
+ -e "s,[@]pkgdatadir[@],$(pkgdatadir)," \
+ -e "s,[@]RTEMS_BSP[@],$(RTEMS_BSP)," \
+ -e "s,[@]CC[@],$(CC)," \
+ -e "s,[@]CXX[@],$(CXX)," \
+ -e "s,[@]AS[@],$(AS)," \
+ -e "s,[@]AR[@],$(AR)," \
+ -e "s,[@]NM[@],$(NM)," \
+ -e "s,[@]LD[@],$(LD)," \
+ -e "s,[@]SIZE[@],$(SIZE)," \
+ -e "s,[@]OBJCOPY[@],$(OBJCOPY)," \
+ -e "s,[@]RTEMS_HAS_POSIX_API[@],$(HAS_POSIX_API)," \
+ -e "s,[@]RTEMS_HAS_CPLUSPLUS[@],$(HAS_CPLUSPLUS)," \
+ < $(srcdir)/Makefile.inc.in > Makefile.inc
+CLEANFILES += Makefile.inc
+
## At the moment all actively supported configurations
## use gcc-target-default.cfg only.
rtems_make_compilersdir = $(rtems_makedir)/compilers
diff -u rtems/c/src/make/configure.ac:1.32 rtems/c/src/make/configure.ac:1.33
--- rtems/c/src/make/configure.ac:1.32 Wed Feb 2 09:01:06 2011
+++ rtems/c/src/make/configure.ac Sun Mar 6 22:05:18 2011
@@ -78,9 +78,5 @@
# Explicitly list all Makefiles here
AC_CONFIG_FILES([Makefile
-Makefile.inc
-host.cfg
-bsp.cfg
])
-AC_CONFIG_FILES([target.cfg])
AC_OUTPUT
--
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/20110306/01844432/attachment-0001.html>
More information about the vc
mailing list