From 1de66e98025b15b99b8a589df91cc84ab51c6398 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Sun, 2 Jan 2005 12:44:13 +0000 Subject: 2005-01-02 Ralf Corsepius * Makefile.am: Remove build-variant support. --- c/src/lib/libcpu/sparc/ChangeLog | 4 ++++ c/src/lib/libcpu/sparc/Makefile.am | 43 ++++++-------------------------------- 2 files changed, 10 insertions(+), 37 deletions(-) (limited to 'c/src') diff --git a/c/src/lib/libcpu/sparc/ChangeLog b/c/src/lib/libcpu/sparc/ChangeLog index 26489d6f98..af65ed517e 100644 --- a/c/src/lib/libcpu/sparc/ChangeLog +++ b/c/src/lib/libcpu/sparc/ChangeLog @@ -1,3 +1,7 @@ +2005-01-02 Ralf Corsepius + + * Makefile.am: Remove build-variant support. + 2004-10-19 Ralf Corsepius * configure.ac: Remove RTEMS_ENABLE_BARE. diff --git a/c/src/lib/libcpu/sparc/Makefile.am b/c/src/lib/libcpu/sparc/Makefile.am index d32bea8cbe..79907ed9ee 100644 --- a/c/src/lib/libcpu/sparc/Makefile.am +++ b/c/src/lib/libcpu/sparc/Makefile.am @@ -6,62 +6,31 @@ ACLOCAL_AMFLAGS = -I ../../../aclocal include $(top_srcdir)/../../../automake/compile.am -DISTCLEANFILES = -CLEANFILES = -EXTRA_PROGRAMS = -noinst_DATA = +noinst_PROGRAMS = include_libcpudir = $(includedir)/libcpu include_libcpu_HEADERS = $(top_srcdir)/../shared/include/cache.h -EXTRA_PROGRAMS += cache.rel -CLEANFILES += cache.rel +noinst_PROGRAMS += cache.rel cache_rel_SOURCES = cache/cache.c cache/cache_.h \ ../shared/src/cache_aligned_malloc.c ../shared/src/cache_manager.c cache_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) -I$(srcdir)/cache 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) -I$(srcdir)/cache -cache_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - if has_instruction_cache cache_rel_CPPFLAGS += -DHAS_INSTRUCTION_CACHE -cache_g_rel_CPPFLAGS += -DHAS_INSTRUCTION_CACHE endif -noinst_DATA += cache$(LIB_VARIANT).rel - -EXTRA_PROGRAMS += syscall.rel -CLEANFILES += syscall.rel +noinst_PROGRAMS += syscall.rel syscall_rel_SOURCES = syscall/syscall.S syscall/syscall.h syscall_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) syscall_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -EXTRA_PROGRAMS += syscall_g.rel -CLEANFILES += syscall_g.rel -syscall_g_rel_SOURCES = $(syscall_rel_SOURCES) -syscall_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) -syscall_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_DATA += syscall$(LIB_VARIANT).rel - -EXTRA_PROGRAMS += reg_win.rel -CLEANFILES += reg_win.rel +noinst_PROGRAMS += reg_win.rel reg_win_rel_SOURCES = reg_win/window.S reg_win_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) reg_win_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -EXTRA_PROGRAMS += reg_win_g.rel -CLEANFILES += reg_win_g.rel -reg_win_g_rel_SOURCES = $(reg_win_rel_SOURCES) -reg_win_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) -reg_win_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_DATA += reg_win$(LIB_VARIANT).rel - all-local: $(PREINSTALL_FILES) PREINSTALL_DIRS = @@ -76,7 +45,7 @@ $(PROJECT_INCLUDE)/libcpu/cache.h: $(top_srcdir)/../shared/include/cache.h $(PRO $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/cache.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/cache.h -CLEANFILES += $(PREINSTALL_FILES) -DISTCLEANFILES += $(PREINSTALL_DIRS) +CLEANFILES = $(PREINSTALL_FILES) +DISTCLEANFILES = $(PREINSTALL_DIRS) include $(top_srcdir)/../../../automake/local.am -- cgit v1.2.3