RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

2000-10-24 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

Browse Source 
* macros/enable-hwapi.m4: Removed.
	* aclocal/rtems-top.m4, automake/compile.am, automake/lib.am:
	A small cleanup step towards gnu-canonicalization.
This commit is contained in:
Joel Sherrill
2000-10-24 21:59:16 +00:00
parent 5b53d9700d
commit 509f835141
4 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@@ -1,3 +1,9 @@
2000-10-24 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* macros/enable-hwapi.m4: Removed.
* aclocal/rtems-top.m4, automake/compile.am, automake/lib.am:
A small cleanup step towards gnu-canonicalization.
2000-09-14 Ralf Corsepius <corsepiu@faw.uni-ulm.de> 2000-09-14 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* macros: New directory. * macros: New directory.

3
aclocal/rtems-top.m4
View File

@@ -15,6 +15,9 @@ AC_BEFORE([$0], [AM_INIT_AUTOMAKE])dnl
ENDIF=endif ENDIF=endif
AC_SUBST(ENDIF) AC_SUBST(ENDIF)
## HACK to destinguish between using GNU and RTEMS canonicalization
AM_CONDITIONAL(RTEMS_CANONICALIZATION,test x=x)
AC_ARG_WITH(target-subdir, AC_ARG_WITH(target-subdir,
[ --with-target-subdir=DIR], [ --with-target-subdir=DIR],
TARGET_SUBDIR="$withval", TARGET_SUBDIR="$withval",

5
automake/compile.am
View File

@@ -275,6 +275,7 @@ RTEMS_CFLAGS__V = $(RTEMS_CFLAGS_OPTIMIZE_V)
## FIXME: This will probably vanish, when GNU canonicalization will be ## FIXME: This will probably vanish, when GNU canonicalization will be
## introduced ## introduced
if RTEMS_CANONICALIZATION
CC = $(CC_FOR_TARGET) $(GCCSPECS) CC = $(CC_FOR_TARGET) $(GCCSPECS)
CXX = $(CXX_FOR_TARGET) $(GCCSPECS) CXX = $(CXX_FOR_TARGET) $(GCCSPECS)
@@ -294,6 +295,10 @@ SIZE_FOR_TARGET = @SIZE_FOR_TARGET@
SIZE = $(SIZE_FOR_TARGET) SIZE = $(SIZE_FOR_TARGET)
STRIP_FOR_TARGET = @STRIP_FOR_TARGET@ STRIP_FOR_TARGET = @STRIP_FOR_TARGET@
STRIP = $(STRIP_FOR_TARGET) STRIP = $(STRIP_FOR_TARGET)
else
CC = @CC@ $(GCCSPECS)
CXX = @CXX@ $(GCCSPECS)
endif
## ##
## FIXME: DEFS and INCLUDES should not be passed as AM_CPPFLAGS ## FIXME: DEFS and INCLUDES should not be passed as AM_CPPFLAGS

6
automake/lib.am
View File

@@ -2,6 +2,12 @@
## $Id$ ## $Id$
## ##
if RTEMS_CANONICALIZATION
else
AR = @AR@
RANLIB = @RANLIB@
endif
define make-library define make-library
$(RM) $@ $(RM) $@
$(AR) $(ARFLAGS) $@ $^ $(AR) $(ARFLAGS) $@ $^