summaryrefslogtreecommitdiffstats
path: root/cpukit/libmisc
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2001-02-05 18:26:26 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2001-02-05 18:26:26 +0000
commit620e82636b5fbe1bdbc2fddd59984f2eee82707b (patch)
treeeb3ee12e05af9d4adf53172240ff48bf7ed967f1 /cpukit/libmisc
parentf3d7592e22f7b42e6461ebe43046b646c02f4367 (diff)
downloadrtems-620e82636b5fbe1bdbc2fddd59984f2eee82707b.tar.bz2
2001-02-03 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* untar/Makefile.am, monitor/Makefile.am, dummy/Makefile.am, devnull/Makefile.am, dumpbuf/Makefile.am, mw-fb/Makefile.am, stackchk/Makefile.am, rtmonuse/Makefile.am, cpuuse/Makefile.am: Apply include_*HEADERS instead of H_FILES.
Diffstat (limited to '')
-rw-r--r--cpukit/libmisc/ChangeLog7
-rw-r--r--cpukit/libmisc/cpuuse/Makefile.am8
-rw-r--r--cpukit/libmisc/devnull/Makefile.am7
-rw-r--r--cpukit/libmisc/dumpbuf/Makefile.am8
-rw-r--r--cpukit/libmisc/monitor/Makefile.am8
-rw-r--r--cpukit/libmisc/mw-fb/Makefile.am11
-rw-r--r--cpukit/libmisc/rtmonuse/Makefile.am8
-rw-r--r--cpukit/libmisc/stackchk/Makefile.am10
-rw-r--r--cpukit/libmisc/untar/Makefile.am8
9 files changed, 48 insertions, 27 deletions
diff --git a/cpukit/libmisc/ChangeLog b/cpukit/libmisc/ChangeLog
index 4abf230261..be2ec5ef39 100644
--- a/cpukit/libmisc/ChangeLog
+++ b/cpukit/libmisc/ChangeLog
@@ -1,3 +1,10 @@
+2001-02-03 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * untar/Makefile.am, monitor/Makefile.am, dummy/Makefile.am,
+ devnull/Makefile.am, dumpbuf/Makefile.am, mw-fb/Makefile.am,
+ stackchk/Makefile.am, rtmonuse/Makefile.am, cpuuse/Makefile.am:
+ Apply include_*HEADERS instead of H_FILES.
+
2001-01-05 Joel Sherrill <joel@OARcorp.com>
* devnull: New addition. Moved from libcpu/sh.
diff --git a/cpukit/libmisc/cpuuse/Makefile.am b/cpukit/libmisc/cpuuse/Makefile.am
index ed329e4563..746e4fe12d 100644
--- a/cpukit/libmisc/cpuuse/Makefile.am
+++ b/cpukit/libmisc/cpuuse/Makefile.am
@@ -4,13 +4,15 @@
AUTOMAKE_OPTIONS = foreign 1.4
+include_rtemsdir = $(includedir)/rtems
+
LIBNAME = libcpuuse-tmp
LIB = $(ARCH)/$(LIBNAME).a
C_FILES = cpuuse.c
C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
-H_FILES = cpuuse.h
+include_rtems_HEADERS = cpuuse.h
OBJS = $(C_O_FILES)
@@ -31,12 +33,12 @@ $(LIB): $(OBJS)
$(make-library)
PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems \
- $(H_FILES:%=$(PROJECT_INCLUDE)/rtems/%)
+ $(include_rtems_HEADERS:%=$(PROJECT_INCLUDE)/rtems/%)
all-local: $(ARCH) $(PREINSTALL_FILES) $(OBJS) $(LIB)
.PRECIOUS: $(LIB)
-EXTRA_DIST = README cpuuse.c cpuuse.h
+EXTRA_DIST = README cpuuse.c
include $(top_srcdir)/../../../automake/local.am
diff --git a/cpukit/libmisc/devnull/Makefile.am b/cpukit/libmisc/devnull/Makefile.am
index 9154a40725..1a158629b4 100644
--- a/cpukit/libmisc/devnull/Makefile.am
+++ b/cpukit/libmisc/devnull/Makefile.am
@@ -4,14 +4,15 @@
AUTOMAKE_OPTIONS = foreign 1.4
+include_rtemsdir = $(includedir)/rtems
+
LIBNAME = libdevnull-tmp
LIB = $(ARCH)/$(LIBNAME).a
-
C_FILES = devnull.c
C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
-H_FILES = devnull.h
+include_rtems_HEADERS = devnull.h
OBJS = $(C_O_FILES)
@@ -32,7 +33,7 @@ $(LIB): $(OBJS)
$(make-library)
PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems \
- $(H_FILES:%=$(PROJECT_INCLUDE)/rtems/%)
+ $(include_rtems_HEADERS:%=$(PROJECT_INCLUDE)/rtems/%)
all-local: $(ARCH) $(PREINSTALL_FILES) $(OBJS) $(LIB)
diff --git a/cpukit/libmisc/dumpbuf/Makefile.am b/cpukit/libmisc/dumpbuf/Makefile.am
index 9d5bafe2c8..182694b577 100644
--- a/cpukit/libmisc/dumpbuf/Makefile.am
+++ b/cpukit/libmisc/dumpbuf/Makefile.am
@@ -4,13 +4,15 @@
AUTOMAKE_OPTIONS = foreign 1.4
+include_rtemsdir = $(includedir)/rtems
+
LIBNAME = libdumpbuf-tmp
LIB = $(ARCH)/$(LIBNAME).a
C_FILES = dumpbuf.c
C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
-H_FILES = dumpbuf.h
+include_rtems_HEADERS = dumpbuf.h
OBJS = $(C_O_FILES)
@@ -31,12 +33,12 @@ $(LIB): $(OBJS)
$(make-library)
PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems \
- $(H_FILES:%=$(PROJECT_INCLUDE)/rtems/%)
+ $(include_rtems_HEADERS:%=$(PROJECT_INCLUDE)/rtems/%)
all-local: $(ARCH) $(PREINSTALL_FILES) $(OBJS) $(LIB)
.PRECIOUS: $(LIB)
-EXTRA_DIST = dumpbuf.c dumpbuf.h
+EXTRA_DIST = dumpbuf.c
include $(top_srcdir)/../../../automake/local.am
diff --git a/cpukit/libmisc/monitor/Makefile.am b/cpukit/libmisc/monitor/Makefile.am
index d41f54d492..4fe4e1cce5 100644
--- a/cpukit/libmisc/monitor/Makefile.am
+++ b/cpukit/libmisc/monitor/Makefile.am
@@ -4,6 +4,8 @@
AUTOMAKE_OPTIONS = foreign 1.4
+include_rtemsdir = $(includedir)/rtems
+
LIBNAME = libmonitor-tmp
LIB = $(ARCH)/$(LIBNAME).a
@@ -20,7 +22,7 @@ else
C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
endif
-H_FILES = monitor.h symbols.h
+include_rtems_HEADERS = monitor.h symbols.h
OBJS = $(C_O_FILES)
@@ -41,7 +43,7 @@ $(LIB): $(OBJS)
$(make-library)
PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems \
- $(H_FILES:%=$(PROJECT_INCLUDE)/rtems/%)
+ $(include_rtems_HEADERS:%=$(PROJECT_INCLUDE)/rtems/%)
all-local: $(ARCH) $(PREINSTALL_FILES) $(OBJS) $(LIB)
@@ -50,6 +52,6 @@ all-local: $(ARCH) $(PREINSTALL_FILES) $(OBJS) $(LIB)
EXTRA_DIST = README mon-command.c mon-config.c mon-dname.c mon-driver.c \
mon-extension.c mon-itask.c mon-manager.c mon-monitor.c mon-mpci.c \
mon-object.c mon-prmisc.c mon-queue.c mon-server.c mon-symbols.c \
- mon-task.c monitor.h symbols.h
+ mon-task.c
include $(top_srcdir)/../../../automake/local.am
diff --git a/cpukit/libmisc/mw-fb/Makefile.am b/cpukit/libmisc/mw-fb/Makefile.am
index a9fb421690..2098dd6c4a 100644
--- a/cpukit/libmisc/mw-fb/Makefile.am
+++ b/cpukit/libmisc/mw-fb/Makefile.am
@@ -4,16 +4,17 @@
AUTOMAKE_OPTIONS = foreign 1.4
+include_rtemsdir = $(includedir)/rtems
+
LIBNAME = libmw-fb-tmp
LIB = ${ARCH}/${LIBNAME}.a
C_FILES = mw_fb.c mw_uid.c
C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
-H_FILES = mw_fb.h mw_uid.h
-noinst_HEADERS = $(H_FILES)
+include_rtems_HEADERS = mw_fb.h mw_uid.h
-SRCS = $(C_FILES) $(H_FILES)
+SRCS = $(C_FILES)
OBJS = $(C_O_FILES)
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
@@ -21,7 +22,7 @@ include $(top_srcdir)/../../../automake/compile.am
include $(top_srcdir)/../../../automake/lib.am
PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems \
- $(H_FILES:%=$(PROJECT_INCLUDE)/rtems/%)
+ $(include_rtems_HEADERS:%=$(PROJECT_INCLUDE)/rtems/%)
$(PROJECT_INCLUDE)/rtems:
@$(mkinstalldirs) $@
@@ -37,6 +38,6 @@ ${LIB}: ${OBJS}
all: ${ARCH} $(PREINSTALL_FILES) $(LIB) $(TMPINSTALL_FILES)
-EXTRA_DIST = $(C_FILES) $(H_FILES)
+EXTRA_DIST = $(C_FILES)
include $(top_srcdir)/../../../automake/local.am
diff --git a/cpukit/libmisc/rtmonuse/Makefile.am b/cpukit/libmisc/rtmonuse/Makefile.am
index d4321546cd..3bfe6ca412 100644
--- a/cpukit/libmisc/rtmonuse/Makefile.am
+++ b/cpukit/libmisc/rtmonuse/Makefile.am
@@ -4,13 +4,15 @@
AUTOMAKE_OPTIONS = foreign 1.4
+include_rtemsdir = $(includedir)/rtems
+
LIBNAME = librtmonuse-tmp
LIB = $(ARCH)/$(LIBNAME).a
C_FILES = rtmonuse.c
C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
-H_FILES = rtmonuse.h
+include_rtems_HEADERS = rtmonuse.h
OBJS = $(C_O_FILES)
@@ -31,12 +33,12 @@ $(LIB): $(OBJS)
$(make-library)
PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems \
- $(H_FILES:%=$(PROJECT_INCLUDE)/rtems/%)
+ $(include_rtems_HEADERS:%=$(PROJECT_INCLUDE)/rtems/%)
all-local: $(ARCH) $(PREINSTALL_FILES) $(OBJS) $(LIB)
.PRECIOUS: $(LIB)
-EXTRA_DIST = rtmonuse.c rtmonuse.h
+EXTRA_DIST = rtmonuse.c
include $(top_srcdir)/../../../automake/local.am
diff --git a/cpukit/libmisc/stackchk/Makefile.am b/cpukit/libmisc/stackchk/Makefile.am
index 1050293b03..f91e757208 100644
--- a/cpukit/libmisc/stackchk/Makefile.am
+++ b/cpukit/libmisc/stackchk/Makefile.am
@@ -4,14 +4,16 @@
AUTOMAKE_OPTIONS = foreign 1.4
+include_rtemsdir = $(includedir)/rtems
+
LIBNAME = libstackchk-tmp
LIB = $(ARCH)/$(LIBNAME).a
C_FILES = check.c
C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
-H_FILES = internal.h
-INSTALLED_H_FILES = stackchk.h
+noinst_HEADERS = internal.h
+include_rtems_HEADERS = stackchk.h
OBJS = $(C_O_FILES)
@@ -32,12 +34,12 @@ $(LIB): $(OBJS)
$(make-library)
PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems \
- $(INSTALLED_H_FILES:%=$(PROJECT_INCLUDE)/rtems/%)
+ $(include_rtems_HEADERS:%=$(PROJECT_INCLUDE)/rtems/%)
all-local: $(ARCH) $(PREINSTALL_FILES) $(OBJS) $(LIB)
.PRECIOUS: $(LIB)
-EXTRA_DIST = README check.c internal.h stackchk.h
+EXTRA_DIST = README check.c
include $(top_srcdir)/../../../automake/local.am
diff --git a/cpukit/libmisc/untar/Makefile.am b/cpukit/libmisc/untar/Makefile.am
index 94e989ccae..902df76e49 100644
--- a/cpukit/libmisc/untar/Makefile.am
+++ b/cpukit/libmisc/untar/Makefile.am
@@ -4,13 +4,15 @@
AUTOMAKE_OPTIONS = foreign 1.4
+include_rtemsdir = $(includedir)/rtems
+
LIBNAME = libuntar-tmp
LIB = $(ARCH)/$(LIBNAME).a
C_FILES = untar.c
C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
-H_FILES = untar.h
+include_rtems_HEADERS = untar.h
OBJS = $(C_O_FILES)
@@ -31,12 +33,12 @@ $(LIB): $(OBJS)
$(make-library)
PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems \
- $(H_FILES:%=$(PROJECT_INCLUDE)/rtems/%)
+ $(include_rtems_HEADERS:%=$(PROJECT_INCLUDE)/rtems/%)
all-local: $(ARCH) $(PREINSTALL_FILES) $(OBJS) $(LIB)
.PRECIOUS: $(LIB)
-EXTRA_DIST = README untar.c untar.h
+EXTRA_DIST = README untar.c
include $(top_srcdir)/../../../automake/local.am