summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2003-12-11 16:32:00 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2003-12-11 16:32:00 +0000
commit88c3c5eec5a263a268eb749d929f800246b64b12 (patch)
tree75fab707062209a8e3fb010abffe1396730fc6cb
parent2003-12-11 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff)
downloadrtems-88c3c5eec5a263a268eb749d929f800246b64b12.tar.bz2
2003-12-11 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* configure.ac: Remove make/custom/Makefile. * Makefile.am: Cosmetics. * automake/compile.am: Remove compilation rules. Remove $(ARCH) directory generation.
-rw-r--r--ChangeLog7
-rw-r--r--Makefile.am5
-rw-r--r--automake/compile.am12
-rw-r--r--configure.ac1
4 files changed, 9 insertions, 16 deletions
diff --git a/ChangeLog b/ChangeLog
index 45d1a482b3..619699c19f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-12-11 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * configure.ac: Remove make/custom/Makefile.
+ * Makefile.am: Cosmetics.
+ * automake/compile.am: Remove compilation rules.
+ Remove $(ARCH) directory generation.
+
2003-11-26 Joel Sherrill <joel@OARcorp.com>
* MAINTAINERS: New file.
diff --git a/Makefile.am b/Makefile.am
index b9af5c720d..28027b5693 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,7 +11,7 @@ ACLOCAL_AMFLAGS = -I aclocal
SUBDIRS = make $(build_SUBDIRS) $(host_SUBDIRS) $(target_SUBDIRS)
AUTOMAKE_FILES =
-AUTOMAKE_FILES += automake/compile.am
+AUTOMAKE_FILES += automake/compile.am
AUTOMAKE_FILES += automake/host.am
AUTOMAKE_FILES += automake/local.am
AUTOMAKE_FILES += automake/subdirs.am
@@ -43,8 +43,7 @@ ACLOCAL_FILES += aclocal/version.m4
noinst_SCRIPTS = bootstrap
-EXTRA_DIST = README.configure SUPPORT \
- VERSION LICENSE $(noinst_SCRIPTS)
+EXTRA_DIST = README.configure SUPPORT VERSION LICENSE $(noinst_SCRIPTS)
EXTRA_DIST += $(AUTOMAKE_FILES)
EXTRA_DIST += $(ACLOCAL_FILES)
diff --git a/automake/compile.am b/automake/compile.am
index 98b8d96fbe..8262162aec 100644
--- a/automake/compile.am
+++ b/automake/compile.am
@@ -90,15 +90,6 @@ CCASCOMPILE = $(CCAS) $(AM_CCASFLAGS) $(CCASFLAGS)
AS = $(CC)
ASCOMPILE = $(AS) $(AM_ASFLAGS) $(ASFLAGS)
-${ARCH}/%.o: %.c
- ${COMPILE} -o $@ -c $<
-
-${ARCH}/%.o: %.cc
- ${CXXCOMPILE} -o $@ -c $<
-
-${ARCH}/%.o: %.S
- ${CCASCOMPILE} -DASM -o $@ -c $<
-
# Dependency files for use by gmake
# NOTE: we don't put them into $(ARCH)
# so that 'make clean' doesn't blow it away
@@ -217,9 +208,6 @@ AM_CFLAGS =
AM_CXXFLAGS =
AM_CCASFLAGS = $(CPU_CFLAGS) $(RTEMS_CPPFLAGS) $(RTEMS_CCASFLAGS)
-${ARCH}:
- mkdir ${ARCH}
-
clean-local:
$(RM) -r o-optimize o-debug $(CLEANDIRS)
$(RM) Depends-o-optimize.tmp Depends-o-debug.tmp
diff --git a/configure.ac b/configure.ac
index 030972f2c2..d563a4163e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -59,7 +59,6 @@ RTEMS_TARGET_CONFIG_SUBDIRS([c])
AC_CONFIG_FILES([Makefile
make/Makefile
-make/custom/Makefile
])
AC_OUTPUT