summaryrefslogtreecommitdiffstats
path: root/c/make
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2000-10-31 21:16:24 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2000-10-31 21:16:24 +0000
commite3b7e5815f1f8ace1a00237b766fbf5160151a2f (patch)
tree36fc9d4e300e60bd02e48d08bcb3a55ff0100414 /c/make
parentc5fbdea296e473123160c4a0f4e82eb290649953 (diff)
downloadrtems-e3b7e5815f1f8ace1a00237b766fbf5160151a2f.tar.bz2
2000-10-30 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* target.cfg.in: Comment out RTEMS_HOST, RTEMS_CROSS_TARGET. * Makefile.am: Switch to GNU canonicalization.
Diffstat (limited to 'c/make')
-rw-r--r--c/make/ChangeLog5
-rw-r--r--c/make/Makefile.am2
-rw-r--r--c/make/target.cfg.in26
3 files changed, 19 insertions, 14 deletions
diff --git a/c/make/ChangeLog b/c/make/ChangeLog
index 52569d8c88..2c6767d048 100644
--- a/c/make/ChangeLog
+++ b/c/make/ChangeLog
@@ -1,3 +1,8 @@
+2000-10-30 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * target.cfg.in: Comment out RTEMS_HOST, RTEMS_CROSS_TARGET.
+ * Makefile.am: Switch to GNU canonicalization.
+
2000-09-11 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* target.cfg.in: Comment out DEFS.
diff --git a/c/make/Makefile.am b/c/make/Makefile.am
index f23ebb804c..a835117241 100644
--- a/c/make/Makefile.am
+++ b/c/make/Makefile.am
@@ -3,7 +3,7 @@
##
AUTOMAKE_OPTIONS = foreign 1.4
-ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
+ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/macros
rtems_makedir = $(prefix)/make
diff --git a/c/make/target.cfg.in b/c/make/target.cfg.in
index df0a3c92fd..da7143ecba 100644
--- a/c/make/target.cfg.in
+++ b/c/make/target.cfg.in
@@ -12,17 +12,17 @@ CPPFLAGS = @CPPFLAGS@
LDFLAGS =
LIBS = @LIBS@
-CC = @CC_FOR_TARGET@
-AS = @AS_FOR_TARGET@
-AR = @AR_FOR_TARGET@
-NM = @NM_FOR_TARGET@
-LD = @LD_FOR_TARGET@
-SIZE = @SIZE_FOR_TARGET@
-STRIP = @STRIP_FOR_TARGET@
-OBJCOPY = @OBJCOPY_FOR_TARGET@
-RANLIB = @RANLIB_FOR_TARGET@
+CC = @CC@
+AS = @AS@
+AR = @AR@
+NM = @NM@
+LD = @LD@
+SIZE = @SIZE@
+STRIP = @STRIP@
+OBJCOPY = @OBJCOPY@
+RANLIB = @RANLIB@
-CXX = @CXX_FOR_TARGET@
+CXX = @CXX@
export CC
export AS
@@ -34,9 +34,9 @@ export OBJCOPY
export CXX
-RTEMS_CROSS_TARGET=@rtems_cv_prog_cc_cross@
-
-RTEMS_HOST = @RTEMS_HOST@
+# OBSOLETE: The macros below are installation dependent
+# RTEMS_CROSS_TARGET=@rtems_cv_prog_cc_cross@
+# RTEMS_HOST = @RTEMS_HOST@
RTEMS_HAS_MULTIPROCESSING = @RTEMS_HAS_MULTIPROCESSING@
RTEMS_HAS_POSIX_API = @RTEMS_HAS_POSIX_API@
RTEMS_HAS_ITRON_API = @RTEMS_HAS_ITRON_API@