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.

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.

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",

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

automake/lib.am

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