summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2000-10-24 21:59:16 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2000-10-24 21:59:16 +0000
commit509f835141729ea8a11869b67fc93df259db4885 (patch)
treeed1d61d3d8e3f0275d1248893e446888b05778c3
parent5b53d9700d67534bffa38c1af981b79469d19616 (diff)
downloadrtems-509f835141729ea8a11869b67fc93df259db4885.tar.bz2
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.
-rw-r--r--ChangeLog6
-rw-r--r--aclocal/rtems-top.m43
-rw-r--r--automake/compile.am5
-rw-r--r--automake/lib.am6
4 files changed, 20 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 5272113846..b6c8b98dfd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
* macros: New directory.
diff --git a/aclocal/rtems-top.m4 b/aclocal/rtems-top.m4
index 7622c33c8f..fa990e9105 100644
--- a/aclocal/rtems-top.m4
+++ b/aclocal/rtems-top.m4
@@ -15,6 +15,9 @@ AC_BEFORE([$0], [AM_INIT_AUTOMAKE])dnl
ENDIF=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,
[ --with-target-subdir=DIR],
TARGET_SUBDIR="$withval",
diff --git a/automake/compile.am b/automake/compile.am
index a6c340c28b..0a7a5a7422 100644
--- a/automake/compile.am
+++ b/automake/compile.am
@@ -275,6 +275,7 @@ RTEMS_CFLAGS__V = $(RTEMS_CFLAGS_OPTIMIZE_V)
## FIXME: This will probably vanish, when GNU canonicalization will be
## introduced
+if RTEMS_CANONICALIZATION
CC = $(CC_FOR_TARGET) $(GCCSPECS)
CXX = $(CXX_FOR_TARGET) $(GCCSPECS)
@@ -294,6 +295,10 @@ SIZE_FOR_TARGET = @SIZE_FOR_TARGET@
SIZE = $(SIZE_FOR_TARGET)
STRIP_FOR_TARGET = @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
diff --git a/automake/lib.am b/automake/lib.am
index 15208aee17..8fe1af1e03 100644
--- a/automake/lib.am
+++ b/automake/lib.am
@@ -2,6 +2,12 @@
## $Id$
##
+if RTEMS_CANONICALIZATION
+else
+AR = @AR@
+RANLIB = @RANLIB@
+endif
+
define make-library
$(RM) $@
$(AR) $(ARFLAGS) $@ $^