diff options
Diffstat (limited to 'c/src/lib/libcpu/i386/Makefile.am')
| -rw-r--r-- | c/src/lib/libcpu/i386/Makefile.am | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/c/src/lib/libcpu/i386/Makefile.am b/c/src/lib/libcpu/i386/Makefile.am index 90e2d0bc8b..361711a181 100644 --- a/c/src/lib/libcpu/i386/Makefile.am +++ b/c/src/lib/libcpu/i386/Makefile.am @@ -5,15 +5,15 @@ AUTOMAKE_OPTIONS = foreign 1.4 ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal -LIBNAME = libcpu -LIB = $(ARCH)/$(LIBNAME).a +VPATH = @srcdir@:@srcdir@/../shared/src -C_FILES = cpu.c displayCpu.c page.c +C_FILES = cache.c cache_aligned_malloc.c cache_manager.c displayCpu.c idt.c page.c C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) -H_FILES = cpu.h registers.h cpuModel.h +H_FILES = cache_.h +INSTALLED_H_FILES = cpu.h registers.h cpuModel.h -S_FILES = cpu_asm.S cpuModel.S +S_FILES = cpuModel.S idtr.S S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o) OBJS = $(C_O_FILES) $(S_O_FILES) @@ -21,8 +21,7 @@ OBJS = $(C_O_FILES) $(S_O_FILES) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../../../../../automake/lib.am -$(LIB): $(OBJS) - $(make-library) +AM_CPPFLAGS += -I$(srcdir) $(PROJECT_INCLUDE)/libcpu: $(mkinstalldirs) $@ @@ -30,19 +29,16 @@ $(PROJECT_INCLUDE)/libcpu: $(PROJECT_INCLUDE)/libcpu/%.h: %.h $(INSTALL_DATA) $< $@ -$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a: $(LIB) +$(PROJECT_INCLUDE)/libcpu/cache.h: $(top_srcdir)/../shared/include/cache.h $(INSTALL_DATA) $< $@ PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu \ - $(H_FILES:%=$(PROJECT_INCLUDE)/libcpu/%) + $(PROJECT_INCLUDE)/libcpu/cache.h \ + $(INSTALLED_H_FILES:%=$(PROJECT_INCLUDE)/libcpu/%) -TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a +all-local: $(ARCH) $(PREINSTALL_FILES) $(OBJS) -all-local: $(ARCH) $(PREINSTALL_FILES) $(OBJS) $(LIB) $(TMPINSTALL_FILES) - -.PRECIOUS: $(LIB) - -EXTRA_DIST = cpu.c cpu.h cpuModel.S cpuModel.h cpu_asm.S displayCpu.c page.c \ - registers.h +EXTRA_DIST = cache.c cache_.h cpu.h cpuModel.S cpuModel.h \ + displayCpu.c idt.c idtr.S page.c registers.h include $(top_srcdir)/../../../../../automake/local.am |