diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-12-16 10:43:54 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-12-16 10:43:54 +0000 |
| commit | 6d2aa69f335f8b5756cfbad1494d8eca40a8874b (patch) | |
| tree | abfa0440e301d332217b50e6ad1754d65886a188 /c/src/lib/libcpu | |
| parent | 2003-12-16 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
| download | rtems-6d2aa69f335f8b5756cfbad1494d8eca40a8874b.tar.bz2 | |
2003-12-16 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Eliminate VPATH.
Diffstat (limited to 'c/src/lib/libcpu')
| -rw-r--r-- | c/src/lib/libcpu/i386/ChangeLog | 4 | ||||
| -rw-r--r-- | c/src/lib/libcpu/i386/Makefile.am | 24 |
2 files changed, 16 insertions, 12 deletions
diff --git a/c/src/lib/libcpu/i386/ChangeLog b/c/src/lib/libcpu/i386/ChangeLog index a371bb3b12..43770a7ec9 100644 --- a/c/src/lib/libcpu/i386/ChangeLog +++ b/c/src/lib/libcpu/i386/ChangeLog @@ -1,3 +1,7 @@ +2003-12-16 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * Makefile.am: Eliminate VPATH. + 2003-12-12 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * Makefile.am: Use mkdir_p. Remove dirs from PRE/TMPINSTALL_FILES. diff --git a/c/src/lib/libcpu/i386/Makefile.am b/c/src/lib/libcpu/i386/Makefile.am index af3f3ed5f3..f4b6a28322 100644 --- a/c/src/lib/libcpu/i386/Makefile.am +++ b/c/src/lib/libcpu/i386/Makefile.am @@ -4,32 +4,32 @@ ACLOCAL_AMFLAGS = -I ../../../aclocal -VPATH = @srcdir@:@srcdir@/../shared/src +include $(top_srcdir)/../../../automake/compile.am +include $(top_srcdir)/../../../automake/lib.am -C_FILES = cache.c cache_aligned_malloc.c cache_manager.c displayCpu.c \ - page.c +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 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)) -include $(top_srcdir)/../../../automake/compile.am -include $(top_srcdir)/../../../automake/lib.am +$(ARCH)/%.$(OBJEXT): ../shared/src/%.c $(ARCH)/$(dirstamp) + ${COMPILE} -o $@ -c $< AM_CPPFLAGS += -I$(srcdir) -cache.h: $(top_srcdir)/../shared/include/cache.h - cp $< $@ - all-local: $(PREINSTALL_FILES) $(OBJS) -CLEANFILES = cache.h - EXTRA_DIST = cache.c cache_.h cpu.h cpuModel.S cpuModel.h displayCpu.c idt.c \ idtr.S page.c registers.h @@ -47,7 +47,7 @@ $(PROJECT_INCLUDE)/libcpu/cpuModel.h: cpuModel.h $(PROJECT_INCLUDE)/libcpu/$(dir $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/cpuModel.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/cpuModel.h -$(PROJECT_INCLUDE)/libcpu/cache.h: cache.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) +$(PROJECT_INCLUDE)/libcpu/cache.h: ../shared/include/cache.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/cache.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/cache.h |