Imagelibrary/rtems
1
0
Fork 1
mirror of https://gitlab.rtems.org/rtems/rtos/rtems.git synced 2025-12-25 05:47:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

2003-02-18 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

Browse Source 
* aclocal/rtems-top.m4: Set PROJECT_ROOT unconditionally.
	* automake/local.am: Remove $(ARCH), clean-local.
	* automake/compile.am: Add $(ARCH), clean-local.
	Set CXXFLAGS = @RTEMS_CFLAGS@ $(XCXXFLAGS).
This commit is contained in:
Ralf Corsepius
2003-02-18 13:20:59 +00:00
parent 385b2e235d
commit f7276a9bdf
4 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@@ -1,3 +1,10 @@
2003-02-18 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* aclocal/rtems-top.m4: Set PROJECT_ROOT unconditionally.
* automake/local.am: Remove $(ARCH), clean-local.
* automake/compile.am: Add $(ARCH), clean-local.
Set CXXFLAGS = @RTEMS_CFLAGS@ $(XCXXFLAGS).
2003-02-15 Ralf Corsepius <corsepiu@faw.uni-ulm.de> 2003-02-15 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Remove references to obsoleted files * Makefile.am: Remove references to obsoleted files

6
aclocal/rtems-top.m4
View File

@@ -35,13 +35,7 @@ PROJECT_TOPdir=${dots}${RTEMS_TOPdir}/'$(top_builddir)'
fi fi
AC_SUBST(PROJECT_TOPdir) AC_SUBST(PROJECT_TOPdir)
if test "$with_target_subdir" = "." ; then
# Native
PROJECT_ROOT="${RTEMS_TOPdir}/\$(top_builddir)" PROJECT_ROOT="${RTEMS_TOPdir}/\$(top_builddir)"
else
# Cross
PROJECT_ROOT="${RTEMS_TOPdir}/\$(top_builddir)"
fi
AC_SUBST(PROJECT_ROOT) AC_SUBST(PROJECT_ROOT)
AC_MSG_CHECKING([for RTEMS Version]) AC_MSG_CHECKING([for RTEMS Version])

12
automake/compile.am
View File

@@ -55,7 +55,10 @@ DEFS = @DEFS@
CPPFLAGS = @CPPFLAGS@ $(CPU_DEFINES) $(DEFINES) $(XCPPFLAGS) CPPFLAGS = @CPPFLAGS@ $(CPU_DEFINES) $(DEFINES) $(XCPPFLAGS)
CFLAGS = @RTEMS_CFLAGS@ $(XCFLAGS) CFLAGS = @RTEMS_CFLAGS@ $(XCFLAGS)
CXXFLAGS = @RTEMS_CXXFLAGS@ $(XCXXFLAGS) ## FIXME: This should be correct, but is not supported, yet
# CXXFLAGS = @RTEMS_CXXFLAGS@ $(XCXXFLAGS)
## Fall back to using RTEMS_CFLAGS for C++
CXXFLAGS = @RTEMS_CFLAGS@ $(XCXXFLAGS)
ASFLAGS = $(CPU_ASFLAGS) $(CPU_CFLAGS) $(XASFLAGS) ASFLAGS = $(CPU_ASFLAGS) $(CPU_CFLAGS) $(XASFLAGS)
LINK_LIBS = $(LD_LIBS) LINK_LIBS = $(LD_LIBS)
@@ -219,3 +222,10 @@ AM_CPPFLAGS = $(RTEMS_CPPFLAGS)
AM_CFLAGS = AM_CFLAGS =
AM_CXXFLAGS = AM_CXXFLAGS =
AM_CCASFLAGS = $(CPU_CFLAGS) $(RTEMS_CPPFLAGS) $(RTEMS_CCASFLAGS) AM_CCASFLAGS = $(CPU_CFLAGS) $(RTEMS_CPPFLAGS) $(RTEMS_CCASFLAGS)
${ARCH}:
mkdir ${ARCH}
clean-local:
$(RM) -r o-optimize o-debug o-profile $(CLEANDIRS)
$(RM) Depends-o-optimize.tmp Depends-o-debug.tmp Depends-o-profile.tmp

7
automake/local.am
View File

@@ -24,12 +24,5 @@ depend-am:
depend: depend-am depend: depend-am
.PHONY: depend depend-am .PHONY: depend depend-am
${ARCH}:
mkdir ${ARCH}
clean-local:
$(RM) -r o-optimize o-debug o-profile $(CLEANDIRS)
$(RM) Depends-o-optimize.tmp Depends-o-debug.tmp Depends-o-profile.tmp
PROJECT_TOOLS = $(PROJECT_RELEASE)/build-tools PROJECT_TOOLS = $(PROJECT_RELEASE)/build-tools