diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-12-16 10:44:57 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-12-16 10:44:57 +0000 |
| commit | 6702346fedf0c65494c91253e6a896c4696bc96c (patch) | |
| tree | b65ea39e7097ac6b9164de66d095f190218e7df0 /c/src/lib/libcpu | |
| parent | 2003-12-16 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
| download | rtems-6702346fedf0c65494c91253e6a896c4696bc96c.tar.bz2 | |
2003-12-16 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* cache/Makefile.am: Eliminate VPATH.
Diffstat (limited to 'c/src/lib/libcpu')
| -rw-r--r-- | c/src/lib/libcpu/sparc/ChangeLog | 4 | ||||
| -rw-r--r-- | c/src/lib/libcpu/sparc/cache/Makefile.am | 24 |
2 files changed, 16 insertions, 12 deletions
diff --git a/c/src/lib/libcpu/sparc/ChangeLog b/c/src/lib/libcpu/sparc/ChangeLog index 1e4cfc13c0..7701f045f2 100644 --- a/c/src/lib/libcpu/sparc/ChangeLog +++ b/c/src/lib/libcpu/sparc/ChangeLog @@ -1,3 +1,7 @@ +2003-12-16 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * cache/Makefile.am: Eliminate VPATH. + 2003-12-12 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * cache/Makefile.am: Use mkdir_p. Remove dirs from PRE/TMPINSTALL_FILES. diff --git a/c/src/lib/libcpu/sparc/cache/Makefile.am b/c/src/lib/libcpu/sparc/cache/Makefile.am index 56d3f32020..89a9f45943 100644 --- a/c/src/lib/libcpu/sparc/cache/Makefile.am +++ b/c/src/lib/libcpu/sparc/cache/Makefile.am @@ -2,32 +2,32 @@ ## $Id$ ## -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 -OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) +src_C_FILES = cache.c +common_C_FILES = ../../shared/src/cache_aligned_malloc.c +common_C_FILES += ../../shared/src/cache_manager.c + +OBJS = $(src_C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) +OBJS += $(common_C_FILES:../../shared/src/%.c=$(ARCH)/%.$(OBJEXT)) include_libcpudir = $(includedir)/libcpu -include_libcpu_HEADERS = cache.h +include_libcpu_HEADERS = ../../shared/include/cache.h noinst_HEADERS = cache_.h -include $(top_srcdir)/../../../automake/compile.am -include $(top_srcdir)/../../../automake/lib.am - if has_instruction_cache CACHE_DEFINE = -DHAS_INSTRUCTION_CACHE endif AM_CPPFLAGS += -I$(srcdir) $(CACHE_DEFINE) -cache.h: $(top_srcdir)/../shared/include/cache.h - cp $< $@ +$(ARCH)/%.$(OBJEXT): ../../shared/src/%.c $(ARCH)/$(dirstamp) + ${COMPILE} -o $@ -c $< all-local: $(PREINSTALL_FILES) $(OBJS) -CLEANFILES = cache.h - EXTRA_DIST = cache.c cache_.h PREINSTALL_FILES = @@ -36,7 +36,7 @@ $(PROJECT_INCLUDE)/libcpu/$(dirstamp): @$(mkdir_p) $(PROJECT_INCLUDE)/libcpu @: > $(PROJECT_INCLUDE)/libcpu/$(dirstamp) -$(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 |