summaryrefslogtreecommitdiffstats
path: root/c/src/lib/libbsp/a29k
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2001-05-25 16:45:24 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2001-05-25 16:45:24 +0000
commite182fd183a77004e79ea5273a26b13557da27960 (patch)
tree25bde0ef2338ca34436c80cb656a5982c037fd4e /c/src/lib/libbsp/a29k
parente32fdfa442c55daa664e7c1adb3720e2e4c61a08 (diff)
downloadrtems-e182fd183a77004e79ea5273a26b13557da27960.tar.bz2
2001-05-25 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* include/Makefile.am: Use *_HEADERS instead of *H_FILES, add bspopts.h. * include/.cvsignore: Add bspopts.h. * include/bsp.h: Add bspopts.h. * console/Makefile.am: Use *_HEADERS instead of H_FILES. * configure.in: Add bspopts.h.
Diffstat (limited to 'c/src/lib/libbsp/a29k')
-rw-r--r--c/src/lib/libbsp/a29k/portsw/ChangeLog9
-rw-r--r--c/src/lib/libbsp/a29k/portsw/configure.in1
-rw-r--r--c/src/lib/libbsp/a29k/portsw/console/Makefile.am10
-rw-r--r--c/src/lib/libbsp/a29k/portsw/include/.cvsignore5
-rw-r--r--c/src/lib/libbsp/a29k/portsw/include/Makefile.am10
-rw-r--r--c/src/lib/libbsp/a29k/portsw/include/bsp.h2
6 files changed, 28 insertions, 9 deletions
diff --git a/c/src/lib/libbsp/a29k/portsw/ChangeLog b/c/src/lib/libbsp/a29k/portsw/ChangeLog
index f5aad4c1ee..bb8c7eeef5 100644
--- a/c/src/lib/libbsp/a29k/portsw/ChangeLog
+++ b/c/src/lib/libbsp/a29k/portsw/ChangeLog
@@ -1,3 +1,12 @@
+2001-05-25 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * include/Makefile.am: Use *_HEADERS instead of *H_FILES, add
+ bspopts.h.
+ * include/.cvsignore: Add bspopts.h.
+ * include/bsp.h: Add bspopts.h.
+ * console/Makefile.am: Use *_HEADERS instead of H_FILES.
+ * configure.in: Add bspopts.h.
+
2001-05-10 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* configure.in: Use RTEMS_PROG_CC_FOR_TARGET([-ansi -fasm]).
diff --git a/c/src/lib/libbsp/a29k/portsw/configure.in b/c/src/lib/libbsp/a29k/portsw/configure.in
index 5a2a7825dc..eb7bca5e75 100644
--- a/c/src/lib/libbsp/a29k/portsw/configure.in
+++ b/c/src/lib/libbsp/a29k/portsw/configure.in
@@ -19,6 +19,7 @@ RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
RTEMS_CHECK_BSP_CACHE(RTEMS_BSP)
RTEMS_CANONICAL_HOST
+AM_CONFIG_HEADER(include/bspopts.h)
RTEMS_PROJECT_ROOT
# Explicitly list all Makefiles here
diff --git a/c/src/lib/libbsp/a29k/portsw/console/Makefile.am b/c/src/lib/libbsp/a29k/portsw/console/Makefile.am
index f6262b8596..c1cfb37857 100644
--- a/c/src/lib/libbsp/a29k/portsw/console/Makefile.am
+++ b/c/src/lib/libbsp/a29k/portsw/console/Makefile.am
@@ -9,7 +9,8 @@ PGM = $(ARCH)/console.rel
C_FILES = console.c serial.c
C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
-H_FILES = concntl.h
+include_HEADERS = concntl.h
+noinst_HEADERS = serial.h
OBJS = $(C_O_FILES)
@@ -24,11 +25,14 @@ include $(top_srcdir)/../../../../../../automake/lib.am
$(PGM): $(OBJS)
$(make-rel)
-$(PROJECT_INCLUDE)/concntl.h: concntl.h
+$(PROJECT_INCLUDE):
+ $(mkinstalldirs) $@
+
+$(PROJECT_INCLUDE)/%.h: %.h
$(INSTALL_DATA) $< $@
# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile
-TMPINSTALL_FILES += $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/concntl.h
+TMPINSTALL_FILES += $(PROJECT_INCLUDE) $(include_HEADERS:%=$(PROJECT_INCLUDE)/%)
all-local: $(ARCH) $(OBJS) $(PGM) $(TMPINSTALL_FILES)
diff --git a/c/src/lib/libbsp/a29k/portsw/include/.cvsignore b/c/src/lib/libbsp/a29k/portsw/include/.cvsignore
index 282522db03..7394c340a6 100644
--- a/c/src/lib/libbsp/a29k/portsw/include/.cvsignore
+++ b/c/src/lib/libbsp/a29k/portsw/include/.cvsignore
@@ -1,2 +1,7 @@
Makefile
Makefile.in
+bspopts.h
+bspopts.h.in
+coverhd.h
+stamp-h
+stamp-h.in
diff --git a/c/src/lib/libbsp/a29k/portsw/include/Makefile.am b/c/src/lib/libbsp/a29k/portsw/include/Makefile.am
index 534884ac59..0b59bc84e0 100644
--- a/c/src/lib/libbsp/a29k/portsw/include/Makefile.am
+++ b/c/src/lib/libbsp/a29k/portsw/include/Makefile.am
@@ -4,7 +4,7 @@
AUTOMAKE_OPTIONS = foreign 1.4
-H_FILES = bsp.h ../../../shared/include/coverhd.h
+include_HEADERS = bsp.h coverhd.h bspopts.h
$(PROJECT_INCLUDE):
$(mkinstalldirs) $@
@@ -12,14 +12,12 @@ $(PROJECT_INCLUDE):
$(PROJECT_INCLUDE)/%.h: %.h
$(INSTALL_DATA) $< $@
-$(PROJECT_INCLUDE)/coverhd.h: ../../../shared/include/coverhd.h
+coverhd.h: $(top_srcdir)/../../shared/include/coverhd.h
$(INSTALL_DATA) $< $@
+CLEANFILES += coverhd.h
-TMPINSTALL_FILES += $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/bsp.h \
- $(PROJECT_INCLUDE)/coverhd.h
+TMPINSTALL_FILES += $(PROJECT_INCLUDE) $(include_HEADERS:%=$(PROJECT_INCLUDE)/%)
all-local: $(TMPINSTALL_FILES)
-EXTRA_DIST = bsp.h
-
include $(top_srcdir)/../../../../../../automake/local.am
diff --git a/c/src/lib/libbsp/a29k/portsw/include/bsp.h b/c/src/lib/libbsp/a29k/portsw/include/bsp.h
index 67a18eff90..c32116eb81 100644
--- a/c/src/lib/libbsp/a29k/portsw/include/bsp.h
+++ b/c/src/lib/libbsp/a29k/portsw/include/bsp.h
@@ -21,6 +21,8 @@
extern "C" {
#endif
+#include <bspopts.h>
+
#include <rtems.h>
#include <console.h>
#include <clockdrv.h>