From 6b894ff56e6dffb681e588c3e62f635250783fad Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Wed, 21 Jan 2004 14:10:44 +0000 Subject: 2004-01-21 Ralf Corsepius * Makefile.am: Split the blob of *.o into cache.rel, page.rel and score.rel. Add PREINSTALL_DIRS. Use automake compilation rules. * page.c, cpuModel.S: Remove stray blanks. * configure.ac: Require automake >= 1.8.2. Add AM_PROG_CC_C_O. Add subdir-objects to AUTOMAKE_OPTIONS. --- c/src/lib/libcpu/i386/Makefile.am | 66 ++++++++++++++++++++++++++++----------- 1 file changed, 48 insertions(+), 18 deletions(-) (limited to 'c/src/lib/libcpu/i386/Makefile.am') diff --git a/c/src/lib/libcpu/i386/Makefile.am b/c/src/lib/libcpu/i386/Makefile.am index 2c20bdeb60..e9b23f4e25 100644 --- a/c/src/lib/libcpu/i386/Makefile.am +++ b/c/src/lib/libcpu/i386/Makefile.am @@ -4,41 +4,70 @@ ACLOCAL_AMFLAGS = -I ../../../aclocal +EXTRA_PROGRAMS = +CLEANFILES = +noinst_DATA = + include $(top_srcdir)/../../../automake/compile.am include $(top_srcdir)/../../../automake/lib.am -C_FILES = cache.c displayCpu.c page.c - -common_C_FILES = ../shared/src/cache_aligned_malloc.c -common_C_FILES += ../shared/src/cache_manager.c -OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) -OBJS += $(common_C_FILES:../shared/src/%.c=$(ARCH)/%.$(OBJEXT)) - include_libcpudir = $(includedir)/libcpu -noinst_HEADERS = cache_.h include_libcpu_HEADERS = cpu.h cpuModel.h include_libcpu_HEADERS += ../shared/include/cache.h -S_FILES = cpuModel.S idtr.S -OBJS += $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT)) +EXTRA_PROGRAMS += cache.rel +CLEANFILES += 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 +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 -$(ARCH)/%.$(OBJEXT): ../shared/src/%.c $(ARCH)/$(dirstamp) - ${COMPILE} -o $@ -c $< +EXTRA_PROGRAMS += page.rel +CLEANFILES += page.rel +page_rel_SOURCES = page.c cpu.h +page_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) +page_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -AM_CPPFLAGS += -I$(srcdir) +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) -all-local: $(PREINSTALL_FILES) $(OBJS) +noinst_DATA += page$(LIB_VARIANT).rel -EXTRA_DIST = cache.c cache_.h cpu.h cpuModel.S cpuModel.h displayCpu.c idt.c \ - idtr.S page.c registers.h +all-local: $(PREINSTALL_FILES) +PREINSTALL_DIRS = PREINSTALL_FILES = $(PROJECT_INCLUDE)/libcpu/$(dirstamp): @$(mkdir_p) $(PROJECT_INCLUDE)/libcpu @: > $(PROJECT_INCLUDE)/libcpu/$(dirstamp) -PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/$(dirstamp) +PREINSTALL_DIRS += $(PROJECT_INCLUDE)/libcpu/$(dirstamp) $(PROJECT_INCLUDE)/libcpu/cpu.h: cpu.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/cpu.h @@ -52,6 +81,7 @@ $(PROJECT_INCLUDE)/libcpu/cache.h: ../shared/include/cache.h $(PROJECT_INCLUDE)/ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/cache.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/cache.h -CLEANFILES = $(PREINSTALL_FILES) +CLEANFILES += $(PREINSTALL_FILES) +DISTCLEANFILES = $(PREINSTALL_DIRS) include $(top_srcdir)/../../../automake/local.am -- cgit v1.2.3