summaryrefslogtreecommitdiffstats
path: root/c/src/lib/libcpu
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2001-03-01 21:49:29 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2001-03-01 21:49:29 +0000
commit728741287a1dd1a3e21eb7b25de4a787dbd39158 (patch)
tree0f9affbd8af072c639ffa180369c8293670cffec /c/src/lib/libcpu
parent2001-02-27 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff)
downloadrtems-728741287a1dd1a3e21eb7b25de4a787dbd39158.tar.bz2
2001-02-18 Ralf Corsepius <corsepiu@faw.uni-ulm.de:
* include/Makefile.am, syscall/Makefile.am, cache/Makefile.am: Apply include_*HEADERS instead of H_FILES. * cache/.cvsignore: Add cache.h.
Diffstat (limited to 'c/src/lib/libcpu')
-rw-r--r--c/src/lib/libcpu/sparc/ChangeLog6
-rw-r--r--c/src/lib/libcpu/sparc/cache/.cvsignore1
-rw-r--r--c/src/lib/libcpu/sparc/cache/Makefile.am14
-rw-r--r--c/src/lib/libcpu/sparc/include/Makefile.am4
-rw-r--r--c/src/lib/libcpu/sparc/syscall/Makefile.am2
5 files changed, 19 insertions, 8 deletions
diff --git a/c/src/lib/libcpu/sparc/ChangeLog b/c/src/lib/libcpu/sparc/ChangeLog
index 9bd375b114..4bb94c5392 100644
--- a/c/src/lib/libcpu/sparc/ChangeLog
+++ b/c/src/lib/libcpu/sparc/ChangeLog
@@ -1,3 +1,9 @@
+2001-02-18 Ralf Corsepius <corsepiu@faw.uni-ulm.de:
+
+ * include/Makefile.am, syscall/Makefile.am, cache/Makefile.am:
+ Apply include_*HEADERS instead of H_FILES.
+ * cache/.cvsignore: Add cache.h.
+
2000-11-30 Joel Sherrill <joel@OARcorp.com>
* cache/Makefile.am: Removed automake warning by introducing a
diff --git a/c/src/lib/libcpu/sparc/cache/.cvsignore b/c/src/lib/libcpu/sparc/cache/.cvsignore
index 282522db03..945ac6c8e8 100644
--- a/c/src/lib/libcpu/sparc/cache/.cvsignore
+++ b/c/src/lib/libcpu/sparc/cache/.cvsignore
@@ -1,2 +1,3 @@
Makefile
Makefile.in
+cache.h
diff --git a/c/src/lib/libcpu/sparc/cache/Makefile.am b/c/src/lib/libcpu/sparc/cache/Makefile.am
index 85f014e7a5..3fff5139c1 100644
--- a/c/src/lib/libcpu/sparc/cache/Makefile.am
+++ b/c/src/lib/libcpu/sparc/cache/Makefile.am
@@ -9,8 +9,10 @@ VPATH = @srcdir@:@srcdir@/../../shared/src
C_FILES = cache.c cache_aligned_malloc.c cache_manager.c
C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
-H_FILES = cache_.h
-INSTALLED_H_FILES =
+include_libcpudir = $(includedir)/libcpu
+
+include_libcpu_HEADERS = cache.h
+noinst_HEADERS = cache_.h
OBJS = $(C_O_FILES)
@@ -30,14 +32,16 @@ $(PROJECT_INCLUDE)/libcpu:
$(PROJECT_INCLUDE)/libcpu/%.h: %.h
$(INSTALL_DATA) $< $@
-$(PROJECT_INCLUDE)/libcpu/cache.h: $(top_srcdir)/../shared/include/cache.h
- $(INSTALL_DATA) $< $@
+cache.h: $(top_srcdir)/../shared/include/cache.h
+ cp $< $@
PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu \
- $(PROJECT_INCLUDE)/libcpu/cache.h
+ $(include_libcpu_HEADERS:%=$(PROJECT_INCLUDE)/libcpu/%)
all-local: $(ARCH) $(PREINSTALL_FILES) $(OBJS)
+CLEANFILES += cache.h
+
EXTRA_DIST = cache.c cache_.h
include $(top_srcdir)/../../../../../automake/local.am
diff --git a/c/src/lib/libcpu/sparc/include/Makefile.am b/c/src/lib/libcpu/sparc/include/Makefile.am
index 492ec9d19d..218bcf6fa5 100644
--- a/c/src/lib/libcpu/sparc/include/Makefile.am
+++ b/c/src/lib/libcpu/sparc/include/Makefile.am
@@ -4,7 +4,7 @@
AUTOMAKE_OPTIONS = foreign 1.4
-H_FILES = erc32.h
+include_HEADERS = erc32.h
$(PROJECT_INCLUDE)/libcpu:
$(mkinstalldirs) $@
@@ -13,7 +13,7 @@ $(PROJECT_INCLUDE)/libcpu/%.h: %.h
$(INSTALL_DATA) $< $@
TMPINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu \
- $(H_FILES:%=$(PROJECT_INCLUDE)/libcpu/%)
+ $(include_HEADERS:%=$(PROJECT_INCLUDE)/libcpu/%)
all-local: $(TMPINSTALL_FILES)
diff --git a/c/src/lib/libcpu/sparc/syscall/Makefile.am b/c/src/lib/libcpu/sparc/syscall/Makefile.am
index 92c05be678..038bb9d561 100644
--- a/c/src/lib/libcpu/sparc/syscall/Makefile.am
+++ b/c/src/lib/libcpu/sparc/syscall/Makefile.am
@@ -9,7 +9,7 @@ PGM = $(ARCH)/syscall.rel
## Assembly sources
S_FILES = syscall.S
-H_FILES = syscall.h
+noinst_HEADERS = syscall.h
syscall_rel_OBJECTS = $(S_FILES:%.S=$(ARCH)/%.o)