diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-12-19 18:14:30 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-12-19 18:14:30 +0000 |
| commit | 103cd75373a6ffc954ab77e494536c7c7b83e094 (patch) | |
| tree | 9d118fe346880ae731622c0d2e4c4a0b5b625d57 /c | |
| parent | 2003-12-19 Joel Sherrill <joel@OARcorp.com> (diff) | |
| download | rtems-103cd75373a6ffc954ab77e494536c7c7b83e094.tar.bz2 | |
2003-12-19 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* ppc403/Makefile.am: Fix typo in vectors' compilation rule.
* shared/Makefile.am: Use $(top_srcdir)/../shared instead of
relative subdirs.
Diffstat (limited to 'c')
| -rw-r--r-- | c/src/lib/libcpu/powerpc/ChangeLog | 6 | ||||
| -rw-r--r-- | c/src/lib/libcpu/powerpc/ppc403/Makefile.am | 4 | ||||
| -rw-r--r-- | c/src/lib/libcpu/powerpc/shared/Makefile.am | 12 |
3 files changed, 14 insertions, 8 deletions
diff --git a/c/src/lib/libcpu/powerpc/ChangeLog b/c/src/lib/libcpu/powerpc/ChangeLog index bb93703321..0bf47e32d8 100644 --- a/c/src/lib/libcpu/powerpc/ChangeLog +++ b/c/src/lib/libcpu/powerpc/ChangeLog @@ -1,3 +1,9 @@ +2003-12-19 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * ppc403/Makefile.am: Fix typo in vectors' compilation rule. + * shared/Makefile.am: Use $(top_srcdir)/../shared instead of + relative subdirs. + 2003-12-16 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * mpc6xx/wrapup/.cvsignore: Remove. diff --git a/c/src/lib/libcpu/powerpc/ppc403/Makefile.am b/c/src/lib/libcpu/powerpc/ppc403/Makefile.am index 9d552e0062..c46cd4c974 100644 --- a/c/src/lib/libcpu/powerpc/ppc403/Makefile.am +++ b/c/src/lib/libcpu/powerpc/ppc403/Makefile.am @@ -108,8 +108,8 @@ vectors_rel_OBJECTS = \ vectors/$(ARCH)/$(dirstamp): @$(mkdir_p) vectors/$(ARCH) @: > vectors/$(ARCH)/$(dirstamp) -vectors/$(ARCH)/%.$(OBJEXT): vectors/%.c vectors/$(ARCH)/$(dirstamp) - ${COMPILE} -o $@ -c $< +vectors/$(ARCH)/%.$(OBJEXT): vectors/%.S vectors/$(ARCH)/$(dirstamp) + ${CCASCOMPILE} -o $@ -c $< vectors/$(ARCH)/vectors.rel: $(vectors_rel_OBJECTS) $(make-rel) CLEANDIRS += vectors/o-optimize vectors/o-debug diff --git a/c/src/lib/libcpu/powerpc/shared/Makefile.am b/c/src/lib/libcpu/powerpc/shared/Makefile.am index d787211282..42104bac82 100644 --- a/c/src/lib/libcpu/powerpc/shared/Makefile.am +++ b/c/src/lib/libcpu/powerpc/shared/Makefile.am @@ -31,17 +31,17 @@ EXTRA_DIST = libcpuspec_C_FILES src_C_FILES = src/cache.c src/stack.c -common_C_FILES = ../../shared/src/cache_aligned_malloc.c -common_C_FILES += ../../shared/src/cache_manager.c +common_C_FILES = $(top_srcdir)/../shared/src/cache_aligned_malloc.c +common_C_FILES += $(top_srcdir)/../shared/src/cache_manager.c src_O_FILES = $(src_C_FILES:src/%.c=src/$(ARCH)/%.$(OBJEXT)) common_O_FILES = \ - $(common_C_FILES:../../shared/src/%.c=src/$(ARCH)/%.$(OBJEXT)) + $(common_C_FILES:$(top_srcdir)/../shared/src/%.c=src/$(ARCH)/%.$(OBJEXT)) src/$(ARCH)/$(dirstamp): @$(mkdir_p) src/$(ARCH) @: > src/$(ARCH)/$(dirstamp) -src/$(ARCH)/%.$(OBJEXT): ../../shared/src/%.c src/$(ARCH)/$(dirstamp) +src/$(ARCH)/%.$(OBJEXT): $(top_srcdir)/../shared/src/%.c src/$(ARCH)/$(dirstamp) ${COMPILE} -I$(srcdir)/src -o $@ -c $< src/$(ARCH)/%.$(OBJEXT): src/%.c src/$(ARCH)/$(dirstamp) ${COMPILE} -I$(srcdir)/src -o $@ -c $< @@ -49,7 +49,7 @@ CLEANDIRS += src/o-optimize src/o-debug noinst_HEADERS = src/cache_.h include_libcpu_HEADERS += src/stackTrace.h -include_libcpu_HEADERS += ../../shared/include/cache.h +include_libcpu_HEADERS += $(top_srcdir)/../shared/include/cache.h all-local: $(PREINSTALL_FILES) include/$(ARCH)/libcpuspec.a $(src_O_FILES) $(common_O_FILES) @@ -91,7 +91,7 @@ $(PROJECT_INCLUDE)/libcpu/stackTrace.h: src/stackTrace.h $(PROJECT_INCLUDE)/libc $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/stackTrace.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/stackTrace.h -$(PROJECT_INCLUDE)/libcpu/cache.h: ../../shared/include/cache.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) +$(PROJECT_INCLUDE)/libcpu/cache.h: $(top_srcdir)/../shared/include/cache.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/cache.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/cache.h |