summaryrefslogtreecommitdiffstats
path: root/c
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2005-01-02 12:25:39 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2005-01-02 12:25:39 +0000
commit8a97d1299561057b4b3bc3643ebb3d84e92193d3 (patch)
tree35502c00a2a3f5e9a6877504fba2fac5e3f3bda9 /c
parent2005-01-02 Ralf Corsepius <ralf.corsepius@rtems.org> (diff)
downloadrtems-8a97d1299561057b4b3bc3643ebb3d84e92193d3.tar.bz2
2005-01-02 Ralf Corsepius <ralf.corsepius@rtems.org>
* Makefile.am: Remove build-variant support.
Diffstat (limited to 'c')
-rw-r--r--c/src/lib/libcpu/i386/ChangeLog4
-rw-r--r--c/src/lib/libcpu/i386/Makefile.am37
2 files changed, 8 insertions, 33 deletions
diff --git a/c/src/lib/libcpu/i386/ChangeLog b/c/src/lib/libcpu/i386/ChangeLog
index 4faaa7d8e4..104e6fbeb2 100644
--- a/c/src/lib/libcpu/i386/ChangeLog
+++ b/c/src/lib/libcpu/i386/ChangeLog
@@ -1,3 +1,7 @@
+2005-01-02 Ralf Corsepius <ralf.corsepius@rtems.org>
+
+ * Makefile.am: Remove build-variant support.
+
2004-10-19 Ralf Corsepius <ralf_corsepius@rtems.org>
* configure.ac: Remove RTEMS_ENABLE_BARE.
diff --git a/c/src/lib/libcpu/i386/Makefile.am b/c/src/lib/libcpu/i386/Makefile.am
index a888f424e8..0de7285bdf 100644
--- a/c/src/lib/libcpu/i386/Makefile.am
+++ b/c/src/lib/libcpu/i386/Makefile.am
@@ -4,9 +4,7 @@
ACLOCAL_AMFLAGS = -I ../../../aclocal
-EXTRA_PROGRAMS =
-CLEANFILES =
-noinst_DATA =
+noinst_PROGRAMS =
include $(top_srcdir)/../../../automake/compile.am
@@ -15,49 +13,22 @@ include_libcpudir = $(includedir)/libcpu
include_libcpu_HEADERS = cpu.h cpuModel.h
include_libcpu_HEADERS += ../shared/include/cache.h
-EXTRA_PROGRAMS += cache.rel
-CLEANFILES += cache.rel
+noinst_PROGRAMS += cache.rel
cache_rel_SOURCES = cache.c cache_.h ../shared/src/cache_aligned_malloc.c \
../shared/src/cache_manager.c ../shared/include/cache.h
cache_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
cache_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-EXTRA_PROGRAMS += cache_g.rel
-CLEANFILES += cache_g.rel
-cache_g_rel_SOURCES = $(cache_rel_SOURCES)
-cache_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
-cache_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-noinst_DATA += cache$(LIB_VARIANT).rel
-
-EXTRA_PROGRAMS += score.rel
-CLEANFILES += score.rel
+noinst_PROGRAMS += score.rel
score_rel_SOURCES = displayCpu.c cpuModel.S cpuModel.h idtr.S cpu.h
score_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
score_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-EXTRA_PROGRAMS += score_g.rel
-CLEANFILES += score_g.rel
-score_g_rel_SOURCES = $(score_rel_SOURCES)
-score_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
-score_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-noinst_DATA += score$(LIB_VARIANT).rel
-
-EXTRA_PROGRAMS += page.rel
-CLEANFILES += page.rel
+noinst_PROGRAMS += page.rel
page_rel_SOURCES = page.c cpu.h
page_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
page_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-EXTRA_PROGRAMS += page_g.rel
-CLEANFILES += page_g.rel
-page_g_rel_SOURCES = $(page_rel_SOURCES)
-page_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
-page_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-noinst_DATA += page$(LIB_VARIANT).rel
-
all-local: $(PREINSTALL_FILES)
PREINSTALL_DIRS =